From xen-changelog-bounces@lists.xenproject.org Wed Dec 01 16:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Dec 2021 16:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.236137.409576 (Exim 4.92) (envelope-from ) id 1msSiE-00047B-Kr; Wed, 01 Dec 2021 16:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 236137.409576; Wed, 01 Dec 2021 16:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msSiE-000473-HV; Wed, 01 Dec 2021 16:44:06 +0000 Received: by outflank-mailman (input) for mailman id 236137; Wed, 01 Dec 2021 16:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msSiD-00046x-30 for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 16:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msSiC-0008SN-MW for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 16:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1msSiC-0002C5-Lf for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 16:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VIUf1XIVsG+hIBQZ9iEatzwvoK5EPn9ky1v42ZxVnGw=; b=VjmD8VrvsjmK9AF8YD5GQ44HLL i5x+qB3T0rOTAZPbrBuKXOa+jrKl6jH3yJpvPv62TsX07D3VD9ahMar5sovdwoxWZ//nY/vOHHGik BnVNhavh8Eh0VUJGeUqfzOtldbQ/pLWO+ekmTZmuKN5xV5MGjwty+MI3Ab9Y/YSJ0LyQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Update libfdt to v1.6.1 Message-Id: Date: Wed, 01 Dec 2021 16:44:04 +0000 commit ad9cf6bde5b90d4c1e5a79a2803e98d6344c27d7 Author: Vikram Garhwal AuthorDate: Thu Nov 11 23:27:20 2021 -0800 Commit: Julien Grall CommitDate: Wed Dec 1 16:40:19 2021 +0000 Update libfdt to v1.6.1 Update libfdt to v1.6.1 of libfdt taken from git://github.com/dgibson/dtc. This update is done to support device tree overlays. A few minor changes are done to make it compatible with Xen: fdt_overlay.c: overlay_fixup_phandle() Replace strtoul() with simple_strtoul() as strtoul() is not available in Xen lib and included lib.h. Change char *endptr to const char *endptr. This change is required for using simple_strtoul(). libfdt_env.h: Remaining Xen changes to libfdt_env.h carried over from existing libfdt (v1.4.0) Signed-off-by: Vikram Garhwal Reviewed-by: Luca Fancellu Tested-by: Luca Fancellu Reviewed-by: Julien Grall --- xen/common/libfdt/Makefile.libfdt | 10 +- xen/common/libfdt/fdt.c | 226 ++++++--- xen/common/libfdt/fdt_addresses.c | 101 ++++ xen/common/libfdt/fdt_check.c | 93 ++++ xen/common/libfdt/fdt_empty_tree.c | 46 +- xen/common/libfdt/fdt_overlay.c | 884 ++++++++++++++++++++++++++++++++++++ xen/common/libfdt/fdt_ro.c | 514 ++++++++++++++++----- xen/common/libfdt/fdt_rw.c | 249 +++++----- xen/common/libfdt/fdt_strerror.c | 55 +-- xen/common/libfdt/fdt_sw.c | 312 +++++++++---- xen/common/libfdt/fdt_wip.c | 88 ++-- xen/common/libfdt/libfdt_internal.h | 223 ++++++--- xen/common/libfdt/version.lds | 24 +- xen/include/xen/libfdt/fdt.h | 51 +-- xen/include/xen/libfdt/libfdt.h | 858 +++++++++++++++++++++++++++++----- xen/include/xen/libfdt/libfdt_env.h | 98 +++- 16 files changed, 3046 insertions(+), 786 deletions(-) diff --git a/xen/common/libfdt/Makefile.libfdt b/xen/common/libfdt/Makefile.libfdt index 91126c000a..b6d8fc02dd 100644 --- a/xen/common/libfdt/Makefile.libfdt +++ b/xen/common/libfdt/Makefile.libfdt @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) # Makefile.libfdt # # This is not a complete Makefile of itself. Instead, it is designed to @@ -6,5 +7,12 @@ LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h LIBFDT_VERSION = version.lds -LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c +LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \ + fdt_addresses.c fdt_overlay.c fdt_check.c LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) +LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) + +libfdt_clean: + @$(VECHO) CLEAN "(libfdt)" + rm -f $(STD_CLEANFILES:%=$(LIBFDT_dir)/%) + rm -f $(LIBFDT_dir)/$(LIBFDT_soname) diff --git a/xen/common/libfdt/fdt.c b/xen/common/libfdt/fdt.c index bbc77177d9..9fe7cf4b74 100644 --- a/xen/common/libfdt/fdt.c +++ b/xen/common/libfdt/fdt.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,40 +10,156 @@ #include "libfdt_internal.h" -int fdt_check_header(const void *fdt) +/* + * Minimal sanity check for a read-only tree. fdt_ro_probe_() checks + * that the given buffer contains what appears to be a flattened + * device tree with sane information in its header. + */ +int32_t fdt_ro_probe_(const void *fdt) { + uint32_t totalsize = fdt_totalsize(fdt); + + if (can_assume(VALID_DTB)) + return totalsize; + + /* The device tree must be at an 8-byte aligned address */ + if ((uintptr_t)fdt & 7) + return -FDT_ERR_ALIGNMENT; + if (fdt_magic(fdt) == FDT_MAGIC) { /* Complete tree */ - if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) - return -FDT_ERR_BADVERSION; - if (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION) - return -FDT_ERR_BADVERSION; + if (!can_assume(LATEST)) { + if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) + return -FDT_ERR_BADVERSION; + if (fdt_last_comp_version(fdt) > + FDT_LAST_SUPPORTED_VERSION) + return -FDT_ERR_BADVERSION; + } } else if (fdt_magic(fdt) == FDT_SW_MAGIC) { /* Unfinished sequential-write blob */ - if (fdt_size_dt_struct(fdt) == 0) + if (!can_assume(VALID_INPUT) && fdt_size_dt_struct(fdt) == 0) return -FDT_ERR_BADSTATE; } else { return -FDT_ERR_BADMAGIC; } + if (totalsize < INT32_MAX) + return totalsize; + else + return -FDT_ERR_TRUNCATED; +} + +static int check_off_(uint32_t hdrsize, uint32_t totalsize, uint32_t off) +{ + return (off >= hdrsize) && (off <= totalsize); +} + +static int check_block_(uint32_t hdrsize, uint32_t totalsize, + uint32_t base, uint32_t size) +{ + if (!check_off_(hdrsize, totalsize, base)) + return 0; /* block start out of bounds */ + if ((base + size) < base) + return 0; /* overflow */ + if (!check_off_(hdrsize, totalsize, base + size)) + return 0; /* block end out of bounds */ + return 1; +} + +size_t fdt_header_size_(uint32_t version) +{ + if (version <= 1) + return FDT_V1_SIZE; + else if (version <= 2) + return FDT_V2_SIZE; + else if (version <= 3) + return FDT_V3_SIZE; + else if (version <= 16) + return FDT_V16_SIZE; + else + return FDT_V17_SIZE; +} + +size_t fdt_header_size(const void *fdt) +{ + return can_assume(LATEST) ? FDT_V17_SIZE : + fdt_header_size_(fdt_version(fdt)); +} + +int fdt_check_header(const void *fdt) +{ + size_t hdrsize; + + /* The device tree must be at an 8-byte aligned address */ + if ((uintptr_t)fdt & 7) + return -FDT_ERR_ALIGNMENT; + + if (fdt_magic(fdt) != FDT_MAGIC) + return -FDT_ERR_BADMAGIC; + if (!can_assume(LATEST)) { + if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) + || (fdt_last_comp_version(fdt) > + FDT_LAST_SUPPORTED_VERSION)) + return -FDT_ERR_BADVERSION; + if (fdt_version(fdt) < fdt_last_comp_version(fdt)) + return -FDT_ERR_BADVERSION; + } + hdrsize = fdt_header_size(fdt); + if (!can_assume(VALID_DTB)) { + + if ((fdt_totalsize(fdt) < hdrsize) + || (fdt_totalsize(fdt) > INT_MAX)) + return -FDT_ERR_TRUNCATED; + + /* Bounds check memrsv block */ + if (!check_off_(hdrsize, fdt_totalsize(fdt), + fdt_off_mem_rsvmap(fdt))) + return -FDT_ERR_TRUNCATED; + } + + if (!can_assume(VALID_DTB)) { + /* Bounds check structure block */ + if (!can_assume(LATEST) && fdt_version(fdt) < 17) { + if (!check_off_(hdrsize, fdt_totalsize(fdt), + fdt_off_dt_struct(fdt))) + return -FDT_ERR_TRUNCATED; + } else { + if (!check_block_(hdrsize, fdt_totalsize(fdt), + fdt_off_dt_struct(fdt), + fdt_size_dt_struct(fdt))) + return -FDT_ERR_TRUNCATED; + } + + /* Bounds check strings block */ + if (!check_block_(hdrsize, fdt_totalsize(fdt), + fdt_off_dt_strings(fdt), + fdt_size_dt_strings(fdt))) + return -FDT_ERR_TRUNCATED; + } + return 0; } const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len) { - unsigned absoffset = offset + fdt_off_dt_struct(fdt); + unsigned int uoffset = offset; + unsigned int absoffset = offset + fdt_off_dt_struct(fdt); - if ((absoffset < offset) - || ((absoffset + len) < absoffset) - || (absoffset + len) > fdt_totalsize(fdt)) + if (offset < 0) return NULL; - if (fdt_version(fdt) >= 0x11) - if (((offset + len) < offset) + if (!can_assume(VALID_INPUT)) + if ((absoffset < uoffset) + || ((absoffset + len) < absoffset) + || (absoffset + len) > fdt_totalsize(fdt)) + return NULL; + + if (can_assume(LATEST) || fdt_version(fdt) >= 0x11) + if (((uoffset + len) < uoffset) || ((offset + len) > fdt_size_dt_struct(fdt))) return NULL; - return _fdt_offset_ptr(fdt, offset); + return fdt_offset_ptr_(fdt, offset); } uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) @@ -98,7 +171,7 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) *nextoffset = -FDT_ERR_TRUNCATED; tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE); - if (!tagp) + if (!can_assume(VALID_DTB) && !tagp) return FDT_END; /* premature end */ tag = fdt32_to_cpu(*tagp); offset += FDT_TAGSIZE; @@ -110,17 +183,21 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) do { p = fdt_offset_ptr(fdt, offset++, 1); } while (p && (*p != '\0')); - if (!p) + if (!can_assume(VALID_DTB) && !p) return FDT_END; /* premature end */ break; case FDT_PROP: lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp)); - if (!lenp) + if (!can_assume(VALID_DTB) && !lenp) return FDT_END; /* premature end */ /* skip-name offset, length and value */ offset += sizeof(struct fdt_property) - FDT_TAGSIZE + fdt32_to_cpu(*lenp); + if (!can_assume(LATEST) && + fdt_version(fdt) < 0x10 && fdt32_to_cpu(*lenp) >= 8 && + ((offset - fdt32_to_cpu(*lenp)) % 8) != 0) + offset += 4; break; case FDT_END: @@ -139,19 +216,25 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) return tag; } -int _fdt_check_node_offset(const void *fdt, int offset) +int fdt_check_node_offset_(const void *fdt, int offset) { - if ((offset < 0) || (offset % FDT_TAGSIZE) - || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE)) + if (!can_assume(VALID_INPUT) + && ((offset < 0) || (offset % FDT_TAGSIZE))) + return -FDT_ERR_BADOFFSET; + + if (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE) return -FDT_ERR_BADOFFSET; return offset; } -int _fdt_check_prop_offset(const void *fdt, int offset) +int fdt_check_prop_offset_(const void *fdt, int offset) { - if ((offset < 0) || (offset % FDT_TAGSIZE) - || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP)) + if (!can_assume(VALID_INPUT) + && ((offset < 0) || (offset % FDT_TAGSIZE))) + return -FDT_ERR_BADOFFSET; + + if (fdt_next_tag(fdt, offset, &offset) != FDT_PROP) return -FDT_ERR_BADOFFSET; return offset; @@ -163,7 +246,7 @@ int fdt_next_node(const void *fdt, int offset, int *depth) uint32_t tag; if (offset >= 0) - if ((nextoffset = _fdt_check_node_offset(fdt, offset)) < 0) + if ((nextoffset = fdt_check_node_offset_(fdt, offset)) < 0) return nextoffset; do { @@ -225,7 +308,7 @@ int fdt_next_subnode(const void *fdt, int offset) return offset; } -const char *_fdt_find_string(const char *strtab, int tabsize, const char *s) +const char *fdt_find_string_(const char *strtab, int tabsize, const char *s) { int len = strlen(s) + 1; const char *last = strtab + tabsize - len; @@ -239,9 +322,12 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s) int fdt_move(const void *fdt, void *buf, int bufsize) { - FDT_CHECK_HEADER(fdt); + if (!can_assume(VALID_INPUT) && bufsize < 0) + return -FDT_ERR_NOSPACE; + + FDT_RO_PROBE(fdt); - if (fdt_totalsize(fdt) > bufsize) + if (fdt_totalsize(fdt) > (unsigned int)bufsize) return -FDT_ERR_NOSPACE; memmove(buf, fdt, fdt_totalsize(fdt)); diff --git a/xen/common/libfdt/fdt_addresses.c b/xen/common/libfdt/fdt_addresses.c new file mode 100644 index 0000000000..9a82cd0ba2 --- /dev/null +++ b/xen/common/libfdt/fdt_addresses.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2014 David Gibson + * Copyright (C) 2018 embedded brains GmbH + */ +#include "libfdt_env.h" + +#include +#include + +#include "libfdt_internal.h" + +static int fdt_cells(const void *fdt, int nodeoffset, const char *name) +{ + const fdt32_t *c; + uint32_t val; + int len; + + c = fdt_getprop(fdt, nodeoffset, name, &len); + if (!c) + return len; + + if (len != sizeof(*c)) + return -FDT_ERR_BADNCELLS; + + val = fdt32_to_cpu(*c); + if (val > FDT_MAX_NCELLS) + return -FDT_ERR_BADNCELLS; + + return (int)val; +} + +int fdt_address_cells(const void *fdt, int nodeoffset) +{ + int val; + + val = fdt_cells(fdt, nodeoffset, "#address-cells"); + if (val == 0) + return -FDT_ERR_BADNCELLS; + if (val == -FDT_ERR_NOTFOUND) + return 2; + return val; +} + +int fdt_size_cells(const void *fdt, int nodeoffset) +{ + int val; + + val = fdt_cells(fdt, nodeoffset, "#size-cells"); + if (val == -FDT_ERR_NOTFOUND) + return 1; + return val; +} + +/* This function assumes that [address|size]_cells is 1 or 2 */ +int fdt_appendprop_addrrange(void *fdt, int parent, int nodeoffset, + const char *name, uint64_t addr, uint64_t size) +{ + int addr_cells, size_cells, ret; + uint8_t data[sizeof(fdt64_t) * 2], *prop; + + ret = fdt_address_cells(fdt, parent); + if (ret < 0) + return ret; + addr_cells = ret; + + ret = fdt_size_cells(fdt, parent); + if (ret < 0) + return ret; + size_cells = ret; + + /* check validity of address */ + prop = data; + if (addr_cells == 1) { + if ((addr > UINT32_MAX) || ((UINT32_MAX + 1 - addr) < size)) + return -FDT_ERR_BADVALUE; + + fdt32_st(prop, (uint32_t)addr); + } else if (addr_cells == 2) { + fdt64_st(prop, addr); + } else { + return -FDT_ERR_BADNCELLS; + } + + /* check validity of size */ + prop += addr_cells * sizeof(fdt32_t); + if (size_cells == 1) { + if (size > UINT32_MAX) + return -FDT_ERR_BADVALUE; + + fdt32_st(prop, (uint32_t)size); + } else if (size_cells == 2) { + fdt64_st(prop, size); + } else { + return -FDT_ERR_BADNCELLS; + } + + return fdt_appendprop(fdt, nodeoffset, name, data, + (addr_cells + size_cells) * sizeof(fdt32_t)); +} diff --git a/xen/common/libfdt/fdt_check.c b/xen/common/libfdt/fdt_check.c new file mode 100644 index 0000000000..fa410a86e2 --- /dev/null +++ b/xen/common/libfdt/fdt_check.c @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2006 David Gibson, IBM Corporation. + */ +#include "libfdt_env.h" + +#include +#include + +#include "libfdt_internal.h" + +int fdt_check_full(const void *fdt, size_t bufsize) +{ + int err; + int num_memrsv; + int offset, nextoffset = 0; + uint32_t tag; + unsigned int depth = 0; + const void *prop; + const char *propname; + bool expect_end = false; + + if (bufsize < FDT_V1_SIZE) + return -FDT_ERR_TRUNCATED; + if (bufsize < fdt_header_size(fdt)) + return -FDT_ERR_TRUNCATED; + err = fdt_check_header(fdt); + if (err != 0) + return err; + if (bufsize < fdt_totalsize(fdt)) + return -FDT_ERR_TRUNCATED; + + num_memrsv = fdt_num_mem_rsv(fdt); + if (num_memrsv < 0) + return num_memrsv; + + while (1) { + offset = nextoffset; + tag = fdt_next_tag(fdt, offset, &nextoffset); + + if (nextoffset < 0) + return nextoffset; + + /* If we see two root nodes, something is wrong */ + if (expect_end && tag != FDT_END) + return -FDT_ERR_BADSTRUCTURE; + + switch (tag) { + case FDT_NOP: + break; + + case FDT_END: + if (depth != 0) + return -FDT_ERR_BADSTRUCTURE; + return 0; + + case FDT_BEGIN_NODE: + depth++; + if (depth > INT_MAX) + return -FDT_ERR_BADSTRUCTURE; + + /* The root node must have an empty name */ + if (depth == 1) { + const char *name; + int len; + + name = fdt_get_name(fdt, offset, &len); + if (*name || len) + return -FDT_ERR_BADSTRUCTURE; + } + break; + + case FDT_END_NODE: + if (depth == 0) + return -FDT_ERR_BADSTRUCTURE; + depth--; + if (depth == 0) + expect_end = true; + break; + + case FDT_PROP: + prop = fdt_getprop_by_offset(fdt, offset, &propname, + &err); + if (!prop) + return err; + break; + + default: + return -FDT_ERR_INTERNAL; + } + } +} diff --git a/xen/common/libfdt/fdt_empty_tree.c b/xen/common/libfdt/fdt_empty_tree.c index d50561101f..49d54d44b8 100644 --- a/xen/common/libfdt/fdt_empty_tree.c +++ b/xen/common/libfdt/fdt_empty_tree.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2012 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -79,4 +36,3 @@ int fdt_create_empty_tree(void *buf, int bufsize) return fdt_open_into(buf, buf, bufsize); } - diff --git a/xen/common/libfdt/fdt_overlay.c b/xen/common/libfdt/fdt_overlay.c new file mode 100644 index 0000000000..7b95e2b639 --- /dev/null +++ b/xen/common/libfdt/fdt_overlay.c @@ -0,0 +1,884 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2016 Free Electrons + * Copyright (C) 2016 NextThing Co. + */ +#include "libfdt_env.h" + +#include +#include +#include + +#include "libfdt_internal.h" + +/** + * overlay_get_target_phandle - retrieves the target phandle of a fragment + * @fdto: pointer to the device tree overlay blob + * @fragment: node offset of the fragment in the overlay + * + * overlay_get_target_phandle() retrieves the target phandle of an + * overlay fragment when that fragment uses a phandle (target + * property) instead of a path (target-path property). + * + * returns: + * the phandle pointed by the target property + * 0, if the phandle was not found + * -1, if the phandle was malformed + */ +static uint32_t overlay_get_target_phandle(const void *fdto, int fragment) +{ + const fdt32_t *val; + int len; + + val = fdt_getprop(fdto, fragment, "target", &len); + if (!val) + return 0; + + if ((len != sizeof(*val)) || (fdt32_to_cpu(*val) == (uint32_t)-1)) + return (uint32_t)-1; + + return fdt32_to_cpu(*val); +} + +/** + * overlay_get_target - retrieves the offset of a fragment's target + * @fdt: Base device tree blob + * @fdto: Device tree overlay blob + * @fragment: node offset of the fragment in the overlay + * @pathp: pointer which receives the path of the target (or NULL) + * + * overlay_get_target() retrieves the target offset in the base + * device tree of a fragment, no matter how the actual targeting is + * done (through a phandle or a path) + * + * returns: + * the targeted node offset in the base device tree + * Negative error code on error + */ +static int overlay_get_target(const void *fdt, const void *fdto, + int fragment, char const **pathp) +{ + uint32_t phandle; + const char *path = NULL; + int path_len = 0, ret; + + /* Try first to do a phandle based lookup */ + phandle = overlay_get_target_phandle(fdto, fragment); + if (phandle == (uint32_t)-1) + return -FDT_ERR_BADPHANDLE; + + /* no phandle, try path */ + if (!phandle) { + /* And then a path based lookup */ + path = fdt_getprop(fdto, fragment, "target-path", &path_len); + if (path) + ret = fdt_path_offset(fdt, path); + else + ret = path_len; + } else + ret = fdt_node_offset_by_phandle(fdt, phandle); + + /* + * If we haven't found either a target or a + * target-path property in a node that contains a + * __overlay__ subnode (we wouldn't be called + * otherwise), consider it a improperly written + * overlay + */ + if (ret < 0 && path_len == -FDT_ERR_NOTFOUND) + ret = -FDT_ERR_BADOVERLAY; + + /* return on error */ + if (ret < 0) + return ret; + + /* return pointer to path (if available) */ + if (pathp) + *pathp = path ? path : NULL; + + return ret; +} + +/** + * overlay_phandle_add_offset - Increases a phandle by an offset + * @fdt: Base device tree blob + * @node: Device tree overlay blob + * @name: Name of the property to modify (phandle or linux,phandle) + * @delta: offset to apply + * + * overlay_phandle_add_offset() increments a node phandle by a given + * offset. + * + * returns: + * 0 on success. + * Negative error code on error + */ +static int overlay_phandle_add_offset(void *fdt, int node, + const char *name, uint32_t delta) +{ + const fdt32_t *val; + uint32_t adj_val; + int len; + + val = fdt_getprop(fdt, node, name, &len); + if (!val) + return len; + + if (len != sizeof(*val)) + return -FDT_ERR_BADPHANDLE; + + adj_val = fdt32_to_cpu(*val); + if ((adj_val + delta) < adj_val) + return -FDT_ERR_NOPHANDLES; + + adj_val += delta; + if (adj_val == (uint32_t)-1) + return -FDT_ERR_NOPHANDLES; + + return fdt_setprop_inplace_u32(fdt, node, name, adj_val); +} + +/** + * overlay_adjust_node_phandles - Offsets the phandles of a node + * @fdto: Device tree overlay blob + * @node: Offset of the node we want to adjust + * @delta: Offset to shift the phandles of + * + * overlay_adjust_node_phandles() adds a constant to all the phandles + * of a given node. This is mainly use as part of the overlay + * application process, when we want to update all the overlay + * phandles to not conflict with the overlays of the base device tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_adjust_node_phandles(void *fdto, int node, + uint32_t delta) +{ + int child; + int ret; + + ret = overlay_phandle_add_offset(fdto, node, "phandle", delta); + if (ret && ret != -FDT_ERR_NOTFOUND) + return ret; + + ret = overlay_phandle_add_offset(fdto, node, "linux,phandle", delta); + if (ret && ret != -FDT_ERR_NOTFOUND) + return ret; + + fdt_for_each_subnode(child, fdto, node) { + ret = overlay_adjust_node_phandles(fdto, child, delta); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_adjust_local_phandles - Adjust the phandles of a whole overlay + * @fdto: Device tree overlay blob + * @delta: Offset to shift the phandles of + * + * overlay_adjust_local_phandles() adds a constant to all the + * phandles of an overlay. This is mainly use as part of the overlay + * application process, when we want to update all the overlay + * phandles to not conflict with the overlays of the base device tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_adjust_local_phandles(void *fdto, uint32_t delta) +{ + /* + * Start adjusting the phandles from the overlay root + */ + return overlay_adjust_node_phandles(fdto, 0, delta); +} + +/** + * overlay_update_local_node_references - Adjust the overlay references + * @fdto: Device tree overlay blob + * @tree_node: Node offset of the node to operate on + * @fixup_node: Node offset of the matching local fixups node + * @delta: Offset to shift the phandles of + * + * overlay_update_local_nodes_references() update the phandles + * pointing to a node within the device tree overlay by adding a + * constant delta. + * + * This is mainly used as part of a device tree application process, + * where you want the device tree overlays phandles to not conflict + * with the ones from the base device tree before merging them. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_update_local_node_references(void *fdto, + int tree_node, + int fixup_node, + uint32_t delta) +{ + int fixup_prop; + int fixup_child; + int ret; + + fdt_for_each_property_offset(fixup_prop, fdto, fixup_node) { + const fdt32_t *fixup_val; + const char *tree_val; + const char *name; + int fixup_len; + int tree_len; + int i; + + fixup_val = fdt_getprop_by_offset(fdto, fixup_prop, + &name, &fixup_len); + if (!fixup_val) + return fixup_len; + + if (fixup_len % sizeof(uint32_t)) + return -FDT_ERR_BADOVERLAY; + fixup_len /= sizeof(uint32_t); + + tree_val = fdt_getprop(fdto, tree_node, name, &tree_len); + if (!tree_val) { + if (tree_len == -FDT_ERR_NOTFOUND) + return -FDT_ERR_BADOVERLAY; + + return tree_len; + } + + for (i = 0; i < fixup_len; i++) { + fdt32_t adj_val; + uint32_t poffset; + + poffset = fdt32_to_cpu(fixup_val[i]); + + /* + * phandles to fixup can be unaligned. + * + * Use a memcpy for the architectures that do + * not support unaligned accesses. + */ + memcpy(&adj_val, tree_val + poffset, sizeof(adj_val)); + + adj_val = cpu_to_fdt32(fdt32_to_cpu(adj_val) + delta); + + ret = fdt_setprop_inplace_namelen_partial(fdto, + tree_node, + name, + strlen(name), + poffset, + &adj_val, + sizeof(adj_val)); + if (ret == -FDT_ERR_NOSPACE) + return -FDT_ERR_BADOVERLAY; + + if (ret) + return ret; + } + } + + fdt_for_each_subnode(fixup_child, fdto, fixup_node) { + const char *fixup_child_name = fdt_get_name(fdto, fixup_child, + NULL); + int tree_child; + + tree_child = fdt_subnode_offset(fdto, tree_node, + fixup_child_name); + if (tree_child == -FDT_ERR_NOTFOUND) + return -FDT_ERR_BADOVERLAY; + if (tree_child < 0) + return tree_child; + + ret = overlay_update_local_node_references(fdto, + tree_child, + fixup_child, + delta); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_update_local_references - Adjust the overlay references + * @fdto: Device tree overlay blob + * @delta: Offset to shift the phandles of + * + * overlay_update_local_references() update all the phandles pointing + * to a node within the device tree overlay by adding a constant + * delta to not conflict with the base overlay. + * + * This is mainly used as part of a device tree application process, + * where you want the device tree overlays phandles to not conflict + * with the ones from the base device tree before merging them. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_update_local_references(void *fdto, uint32_t delta) +{ + int fixups; + + fixups = fdt_path_offset(fdto, "/__local_fixups__"); + if (fixups < 0) { + /* There's no local phandles to adjust, bail out */ + if (fixups == -FDT_ERR_NOTFOUND) + return 0; + + return fixups; + } + + /* + * Update our local references from the root of the tree + */ + return overlay_update_local_node_references(fdto, 0, fixups, + delta); +} + +/** + * overlay_fixup_one_phandle - Set an overlay phandle to the base one + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * @symbols_off: Node offset of the symbols node in the base device tree + * @path: Path to a node holding a phandle in the overlay + * @path_len: number of path characters to consider + * @name: Name of the property holding the phandle reference in the overlay + * @name_len: number of name characters to consider + * @poffset: Offset within the overlay property where the phandle is stored + * @label: Label of the node referenced by the phandle + * + * overlay_fixup_one_phandle() resolves an overlay phandle pointing to + * a node in the base device tree. + * + * This is part of the device tree overlay application process, when + * you want all the phandles in the overlay to point to the actual + * base dt nodes. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_fixup_one_phandle(void *fdt, void *fdto, + int symbols_off, + const char *path, uint32_t path_len, + const char *name, uint32_t name_len, + int poffset, const char *label) +{ + const char *symbol_path; + uint32_t phandle; + fdt32_t phandle_prop; + int symbol_off, fixup_off; + int prop_len; + + if (symbols_off < 0) + return symbols_off; + + symbol_path = fdt_getprop(fdt, symbols_off, label, + &prop_len); + if (!symbol_path) + return prop_len; + + symbol_off = fdt_path_offset(fdt, symbol_path); + if (symbol_off < 0) + return symbol_off; + + phandle = fdt_get_phandle(fdt, symbol_off); + if (!phandle) + return -FDT_ERR_NOTFOUND; + + fixup_off = fdt_path_offset_namelen(fdto, path, path_len); + if (fixup_off == -FDT_ERR_NOTFOUND) + return -FDT_ERR_BADOVERLAY; + if (fixup_off < 0) + return fixup_off; + + phandle_prop = cpu_to_fdt32(phandle); + return fdt_setprop_inplace_namelen_partial(fdto, fixup_off, + name, name_len, poffset, + &phandle_prop, + sizeof(phandle_prop)); +}; + +/** + * overlay_fixup_phandle - Set an overlay phandle to the base one + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * @symbols_off: Node offset of the symbols node in the base device tree + * @property: Property offset in the overlay holding the list of fixups + * + * overlay_fixup_phandle() resolves all the overlay phandles pointed + * to in a __fixups__ property, and updates them to match the phandles + * in use in the base device tree. + * + * This is part of the device tree overlay application process, when + * you want all the phandles in the overlay to point to the actual + * base dt nodes. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_fixup_phandle(void *fdt, void *fdto, int symbols_off, + int property) +{ + const char *value; + const char *label; + int len; + + value = fdt_getprop_by_offset(fdto, property, + &label, &len); + if (!value) { + if (len == -FDT_ERR_NOTFOUND) + return -FDT_ERR_INTERNAL; + + return len; + } + + do { + const char *path, *name, *fixup_end; + const char *fixup_str = value; + uint32_t path_len, name_len; + uint32_t fixup_len; + char *sep; + const char *endptr; + int poffset, ret; + + fixup_end = memchr(value, '\0', len); + if (!fixup_end) + return -FDT_ERR_BADOVERLAY; + fixup_len = fixup_end - fixup_str; + + len -= fixup_len + 1; + value += fixup_len + 1; + + path = fixup_str; + sep = memchr(fixup_str, ':', fixup_len); + if (!sep || *sep != ':') + return -FDT_ERR_BADOVERLAY; + + path_len = sep - path; + if (path_len == (fixup_len - 1)) + return -FDT_ERR_BADOVERLAY; + + fixup_len -= path_len + 1; + name = sep + 1; + sep = memchr(name, ':', fixup_len); + if (!sep || *sep != ':') + return -FDT_ERR_BADOVERLAY; + + name_len = sep - name; + if (!name_len) + return -FDT_ERR_BADOVERLAY; + + poffset = simple_strtoul(sep + 1, &endptr, 10); + if ((*endptr != '\0') || (endptr <= (sep + 1))) + return -FDT_ERR_BADOVERLAY; + + ret = overlay_fixup_one_phandle(fdt, fdto, symbols_off, + path, path_len, name, name_len, + poffset, label); + if (ret) + return ret; + } while (len > 0); + + return 0; +} + +/** + * overlay_fixup_phandles - Resolve the overlay phandles to the base + * device tree + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * + * overlay_fixup_phandles() resolves all the overlay phandles pointing + * to nodes in the base device tree. + * + * This is one of the steps of the device tree overlay application + * process, when you want all the phandles in the overlay to point to + * the actual base dt nodes. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_fixup_phandles(void *fdt, void *fdto) +{ + int fixups_off, symbols_off; + int property; + + /* We can have overlays without any fixups */ + fixups_off = fdt_path_offset(fdto, "/__fixups__"); + if (fixups_off == -FDT_ERR_NOTFOUND) + return 0; /* nothing to do */ + if (fixups_off < 0) + return fixups_off; + + /* And base DTs without symbols */ + symbols_off = fdt_path_offset(fdt, "/__symbols__"); + if ((symbols_off < 0 && (symbols_off != -FDT_ERR_NOTFOUND))) + return symbols_off; + + fdt_for_each_property_offset(property, fdto, fixups_off) { + int ret; + + ret = overlay_fixup_phandle(fdt, fdto, symbols_off, property); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_apply_node - Merges a node into the base device tree + * @fdt: Base Device Tree blob + * @target: Node offset in the base device tree to apply the fragment to + * @fdto: Device tree overlay blob + * @node: Node offset in the overlay holding the changes to merge + * + * overlay_apply_node() merges a node into a target base device tree + * node pointed. + * + * This is part of the final step in the device tree overlay + * application process, when all the phandles have been adjusted and + * resolved and you just have to merge overlay into the base device + * tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_apply_node(void *fdt, int target, + void *fdto, int node) +{ + int property; + int subnode; + + fdt_for_each_property_offset(property, fdto, node) { + const char *name; + const void *prop; + int prop_len; + int ret; + + prop = fdt_getprop_by_offset(fdto, property, &name, + &prop_len); + if (prop_len == -FDT_ERR_NOTFOUND) + return -FDT_ERR_INTERNAL; + if (prop_len < 0) + return prop_len; + + ret = fdt_setprop(fdt, target, name, prop, prop_len); + if (ret) + return ret; + } + + fdt_for_each_subnode(subnode, fdto, node) { + const char *name = fdt_get_name(fdto, subnode, NULL); + int nnode; + int ret; + + nnode = fdt_add_subnode(fdt, target, name); + if (nnode == -FDT_ERR_EXISTS) { + nnode = fdt_subnode_offset(fdt, target, name); + if (nnode == -FDT_ERR_NOTFOUND) + return -FDT_ERR_INTERNAL; + } + + if (nnode < 0) + return nnode; + + ret = overlay_apply_node(fdt, nnode, fdto, subnode); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_merge - Merge an overlay into its base device tree + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * + * overlay_merge() merges an overlay into its base device tree. + * + * This is the next to last step in the device tree overlay application + * process, when all the phandles have been adjusted and resolved and + * you just have to merge overlay into the base device tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_merge(void *fdt, void *fdto) +{ + int fragment; + + fdt_for_each_subnode(fragment, fdto, 0) { + int overlay; + int target; + int ret; + + /* + * Each fragments will have an __overlay__ node. If + * they don't, it's not supposed to be merged + */ + overlay = fdt_subnode_offset(fdto, fragment, "__overlay__"); + if (overlay == -FDT_ERR_NOTFOUND) + continue; + + if (overlay < 0) + return overlay; + + target = overlay_get_target(fdt, fdto, fragment, NULL); + if (target < 0) + return target; + + ret = overlay_apply_node(fdt, target, fdto, overlay); + if (ret) + return ret; + } + + return 0; +} + +static int get_path_len(const void *fdt, int nodeoffset) +{ + int len = 0, namelen; + const char *name; + + FDT_RO_PROBE(fdt); + + for (;;) { + name = fdt_get_name(fdt, nodeoffset, &namelen); + if (!name) + return namelen; + + /* root? we're done */ + if (namelen == 0) + break; + + nodeoffset = fdt_parent_offset(fdt, nodeoffset); + if (nodeoffset < 0) + return nodeoffset; + len += namelen + 1; + } + + /* in case of root pretend it's "/" */ + if (len == 0) + len++; + return len; +} + +/** + * overlay_symbol_update - Update the symbols of base tree after a merge + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * + * overlay_symbol_update() updates the symbols of the base tree with the + * symbols of the applied overlay + * + * This is the last step in the device tree overlay application + * process, allowing the reference of overlay symbols by subsequent + * overlay operations. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_symbol_update(void *fdt, void *fdto) +{ + int root_sym, ov_sym, prop, path_len, fragment, target; + int len, frag_name_len, ret, rel_path_len; + const char *s, *e; + const char *path; + const char *name; + const char *frag_name; + const char *rel_path; + const char *target_path; + char *buf; + void *p; + + ov_sym = fdt_subnode_offset(fdto, 0, "__symbols__"); + + /* if no overlay symbols exist no problem */ + if (ov_sym < 0) + return 0; + + root_sym = fdt_subnode_offset(fdt, 0, "__symbols__"); + + /* it no root symbols exist we should create them */ + if (root_sym == -FDT_ERR_NOTFOUND) + root_sym = fdt_add_subnode(fdt, 0, "__symbols__"); + + /* any error is fatal now */ + if (root_sym < 0) + return root_sym; + + /* iterate over each overlay symbol */ + fdt_for_each_property_offset(prop, fdto, ov_sym) { + path = fdt_getprop_by_offset(fdto, prop, &name, &path_len); + if (!path) + return path_len; + + /* verify it's a string property (terminated by a single \0) */ + if (path_len < 1 || memchr(path, '\0', path_len) != &path[path_len - 1]) + return -FDT_ERR_BADVALUE; + + /* keep end marker to avoid strlen() */ + e = path + path_len; + + if (*path != '/') + return -FDT_ERR_BADVALUE; + + /* get fragment name first */ + s = strchr(path + 1, '/'); + if (!s) { + /* Symbol refers to something that won't end + * up in the target tree */ + continue; + } + + frag_name = path + 1; + frag_name_len = s - path - 1; + + /* verify format; safe since "s" lies in \0 terminated prop */ + len = sizeof("/__overlay__/") - 1; + if ((e - s) > len && (memcmp(s, "/__overlay__/", len) == 0)) { + /* //__overlay__/ */ + rel_path = s + len; + rel_path_len = e - rel_path - 1; + } else if ((e - s) == len + && (memcmp(s, "/__overlay__", len - 1) == 0)) { + /* //__overlay__ */ + rel_path = ""; + rel_path_len = 0; + } else { + /* Symbol refers to something that won't end + * up in the target tree */ + continue; + } + + /* find the fragment index in which the symbol lies */ + ret = fdt_subnode_offset_namelen(fdto, 0, frag_name, + frag_name_len); + /* not found? */ + if (ret < 0) + return -FDT_ERR_BADOVERLAY; + fragment = ret; + + /* an __overlay__ subnode must exist */ + ret = fdt_subnode_offset(fdto, fragment, "__overlay__"); + if (ret < 0) + return -FDT_ERR_BADOVERLAY; + + /* get the target of the fragment */ + ret = overlay_get_target(fdt, fdto, fragment, &target_path); + if (ret < 0) + return ret; + target = ret; + + /* if we have a target path use */ + if (!target_path) { + ret = get_path_len(fdt, target); + if (ret < 0) + return ret; + len = ret; + } else { + len = strlen(target_path); + } + + ret = fdt_setprop_placeholder(fdt, root_sym, name, + len + (len > 1) + rel_path_len + 1, &p); + if (ret < 0) + return ret; + + if (!target_path) { + /* again in case setprop_placeholder changed it */ + ret = overlay_get_target(fdt, fdto, fragment, &target_path); + if (ret < 0) + return ret; + target = ret; + } + + buf = p; + if (len > 1) { /* target is not root */ + if (!target_path) { + ret = fdt_get_path(fdt, target, buf, len + 1); + if (ret < 0) + return ret; + } else + memcpy(buf, target_path, len + 1); + + } else + len--; + + buf[len] = '/'; + memcpy(buf + len + 1, rel_path, rel_path_len); + buf[len + 1 + rel_path_len] = '\0'; + } + + return 0; +} + +int fdt_overlay_apply(void *fdt, void *fdto) +{ + uint32_t delta; + int ret; + + FDT_RO_PROBE(fdt); + FDT_RO_PROBE(fdto); + + ret = fdt_find_max_phandle(fdt, &delta); + if (ret) + goto err; + + ret = overlay_adjust_local_phandles(fdto, delta); + if (ret) + goto err; + + ret = overlay_update_local_references(fdto, delta); + if (ret) + goto err; + + ret = overlay_fixup_phandles(fdt, fdto); + if (ret) + goto err; + + ret = overlay_merge(fdt, fdto); + if (ret) + goto err; + + ret = overlay_symbol_update(fdt, fdto); + if (ret) + goto err; + + /* + * The overlay has been damaged, erase its magic. + */ + fdt_set_magic(fdto, ~0); + + return 0; + +err: + /* + * The overlay might have been damaged, erase its magic. + */ + fdt_set_magic(fdto, ~0); + + /* + * The base device tree might have been damaged, erase its + * magic. + */ + fdt_set_magic(fdt, ~0); + + return ret; +} diff --git a/xen/common/libfdt/fdt_ro.c b/xen/common/libfdt/fdt_ro.c index 36f9b480d1..17584da257 100644 --- a/xen/common/libfdt/fdt_ro.c +++ b/xen/common/libfdt/fdt_ro.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,12 +10,13 @@ #include "libfdt_internal.h" -static int _fdt_nodename_eq(const void *fdt, int offset, +static int fdt_nodename_eq_(const void *fdt, int offset, const char *s, int len) { - const char *p = fdt_offset_ptr(fdt, offset + FDT_TAGSIZE, len+1); + int olen; + const char *p = fdt_get_name(fdt, offset, &olen); - if (! p) + if (!p || olen < len) /* short match */ return 0; @@ -73,37 +31,174 @@ static int _fdt_nodename_eq(const void *fdt, int offset, return 0; } +const char *fdt_get_string(const void *fdt, int stroffset, int *lenp) +{ + int32_t totalsize; + uint32_t absoffset; + size_t len; + int err; + const char *s, *n; + + if (can_assume(VALID_INPUT)) { + s = (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset; + + if (lenp) + *lenp = strlen(s); + return s; + } + totalsize = fdt_ro_probe_(fdt); + err = totalsize; + if (totalsize < 0) + goto fail; + + err = -FDT_ERR_BADOFFSET; + absoffset = stroffset + fdt_off_dt_strings(fdt); + if (absoffset >= (unsigned)totalsize) + goto fail; + len = totalsize - absoffset; + + if (fdt_magic(fdt) == FDT_MAGIC) { + if (stroffset < 0) + goto fail; + if (can_assume(LATEST) || fdt_version(fdt) >= 17) { + if ((unsigned)stroffset >= fdt_size_dt_strings(fdt)) + goto fail; + if ((fdt_size_dt_strings(fdt) - stroffset) < len) + len = fdt_size_dt_strings(fdt) - stroffset; + } + } else if (fdt_magic(fdt) == FDT_SW_MAGIC) { + unsigned int sw_stroffset = -stroffset; + + if ((stroffset >= 0) || + (sw_stroffset > fdt_size_dt_strings(fdt))) + goto fail; + if (sw_stroffset < len) + len = sw_stroffset; + } else { + err = -FDT_ERR_INTERNAL; + goto fail; + } + + s = (const char *)fdt + absoffset; + n = memchr(s, '\0', len); + if (!n) { + /* missing terminating NULL */ + err = -FDT_ERR_TRUNCATED; + goto fail; + } + + if (lenp) + *lenp = n - s; + return s; + +fail: + if (lenp) + *lenp = err; + return NULL; +} + const char *fdt_string(const void *fdt, int stroffset) { - return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset; + return fdt_get_string(fdt, stroffset, NULL); } -static int _fdt_string_eq(const void *fdt, int stroffset, +static int fdt_string_eq_(const void *fdt, int stroffset, const char *s, int len) { - const char *p = fdt_string(fdt, stroffset); + int slen; + const char *p = fdt_get_string(fdt, stroffset, &slen); + + return p && (slen == len) && (memcmp(p, s, len) == 0); +} + +int fdt_find_max_phandle(const void *fdt, uint32_t *phandle) +{ + uint32_t max = 0; + int offset = -1; + + while (true) { + uint32_t value; + + offset = fdt_next_node(fdt, offset, NULL); + if (offset < 0) { + if (offset == -FDT_ERR_NOTFOUND) + break; + + return offset; + } + + value = fdt_get_phandle(fdt, offset); + + if (value > max) + max = value; + } + + if (phandle) + *phandle = max; + + return 0; +} + +int fdt_generate_phandle(const void *fdt, uint32_t *phandle) +{ + uint32_t max; + int err; + + err = fdt_find_max_phandle(fdt, &max); + if (err < 0) + return err; + + if (max == FDT_MAX_PHANDLE) + return -FDT_ERR_NOPHANDLES; + + if (phandle) + *phandle = max + 1; + + return 0; +} - return (strlen(p) == len) && (memcmp(p, s, len) == 0); +static const struct fdt_reserve_entry *fdt_mem_rsv(const void *fdt, int n) +{ + unsigned int offset = n * sizeof(struct fdt_reserve_entry); + unsigned int absoffset = fdt_off_mem_rsvmap(fdt) + offset; + + if (!can_assume(VALID_INPUT)) { + if (absoffset < fdt_off_mem_rsvmap(fdt)) + return NULL; + if (absoffset > fdt_totalsize(fdt) - + sizeof(struct fdt_reserve_entry)) + return NULL; + } + return fdt_mem_rsv_(fdt, n); } int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size) { - FDT_CHECK_HEADER(fdt); - *address = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->address); - *size = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->size); + const struct fdt_reserve_entry *re; + + FDT_RO_PROBE(fdt); + re = fdt_mem_rsv(fdt, n); + if (!can_assume(VALID_INPUT) && !re) + return -FDT_ERR_BADOFFSET; + + *address = fdt64_ld_(&re->address); + *size = fdt64_ld_(&re->size); return 0; } int fdt_num_mem_rsv(const void *fdt) { - int i = 0; + int i; + const struct fdt_reserve_entry *re; - while (fdt64_to_cpu(_fdt_mem_rsv(fdt, i)->size) != 0) - i++; - return i; + for (i = 0; (re = fdt_mem_rsv(fdt, i)) != NULL; i++) { + if (fdt64_ld_(&re->size) == 0) + return i; + } + return -FDT_ERR_TRUNCATED; } -static int _nextprop(const void *fdt, int offset) +static int nextprop_(const void *fdt, int offset) { uint32_t tag; int nextoffset; @@ -132,13 +227,13 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset, { int depth; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); for (depth = 0; (offset >= 0) && (depth >= 0); offset = fdt_next_node(fdt, offset, &depth)) if ((depth == 1) - && _fdt_nodename_eq(fdt, offset, name, namelen)) + && fdt_nodename_eq_(fdt, offset, name, namelen)) return offset; if (depth < 0) @@ -152,17 +247,17 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, return fdt_subnode_offset_namelen(fdt, parentoffset, name, strlen(name)); } -int fdt_path_offset(const void *fdt, const char *path) +int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen) { - const char *end = path + strlen(path); + const char *end = path + namelen; const char *p = path; int offset = 0; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* see if we have an alias */ if (*path != '/') { - const char *q = strchr(path, '/'); + const char *q = memchr(path, '/', end - p); if (!q) q = end; @@ -175,14 +270,15 @@ int fdt_path_offset(const void *fdt, const char *path) p = q; } - while (*p) { + while (p < end) { const char *q; - while (*p == '/') + while (*p == '/') { p++; - if (! *p) - return offset; - q = strchr(p, '/'); + if (p == end) + return offset; + } + q = memchr(p, '/', end - p); if (! q) q = end; @@ -196,19 +292,42 @@ int fdt_path_offset(const void *fdt, const char *path) return offset; } +int fdt_path_offset(const void *fdt, const char *path) +{ + return fdt_path_offset_namelen(fdt, path, strlen(path)); +} + const char *fdt_get_name(const void *fdt, int nodeoffset, int *len) { - const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset); + const struct fdt_node_header *nh = fdt_offset_ptr_(fdt, nodeoffset); + const char *nameptr; int err; - if (((err = fdt_check_header(fdt)) != 0) - || ((err = _fdt_check_node_offset(fdt, nodeoffset)) < 0)) + if (((err = fdt_ro_probe_(fdt)) < 0) + || ((err = fdt_check_node_offset_(fdt, nodeoffset)) < 0)) + goto fail; + + nameptr = nh->name; + + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10) { + /* + * For old FDT versions, match the naming conventions of V16: + * give only the leaf name (after all /). The actual tree + * contents are loosely checked. + */ + const char *leaf; + leaf = strrchr(nameptr, '/'); + if (leaf == NULL) { + err = -FDT_ERR_BADSTRUCTURE; goto fail; + } + nameptr = leaf+1; + } if (len) - *len = strlen(nh->name); + *len = strlen(nameptr); - return nh->name; + return nameptr; fail: if (len) @@ -220,58 +339,81 @@ int fdt_first_property_offset(const void *fdt, int nodeoffset) { int offset; - if ((offset = _fdt_check_node_offset(fdt, nodeoffset)) < 0) + if ((offset = fdt_check_node_offset_(fdt, nodeoffset)) < 0) return offset; - return _nextprop(fdt, offset); + return nextprop_(fdt, offset); } int fdt_next_property_offset(const void *fdt, int offset) { - if ((offset = _fdt_check_prop_offset(fdt, offset)) < 0) + if ((offset = fdt_check_prop_offset_(fdt, offset)) < 0) return offset; - return _nextprop(fdt, offset); + return nextprop_(fdt, offset); } -const struct fdt_property *fdt_get_property_by_offset(const void *fdt, - int offset, - int *lenp) +static const struct fdt_property *fdt_get_property_by_offset_(const void *fdt, + int offset, + int *lenp) { int err; const struct fdt_property *prop; - if ((err = _fdt_check_prop_offset(fdt, offset)) < 0) { + if (!can_assume(VALID_INPUT) && + (err = fdt_check_prop_offset_(fdt, offset)) < 0) { if (lenp) *lenp = err; return NULL; } - prop = _fdt_offset_ptr(fdt, offset); + prop = fdt_offset_ptr_(fdt, offset); if (lenp) - *lenp = fdt32_to_cpu(prop->len); + *lenp = fdt32_ld_(&prop->len); return prop; } -const struct fdt_property *fdt_get_property_namelen(const void *fdt, - int offset, - const char *name, - int namelen, int *lenp) +const struct fdt_property *fdt_get_property_by_offset(const void *fdt, + int offset, + int *lenp) +{ + /* Prior to version 16, properties may need realignment + * and this API does not work. fdt_getprop_*() will, however. */ + + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10) { + if (lenp) + *lenp = -FDT_ERR_BADVERSION; + return NULL; + } + + return fdt_get_property_by_offset_(fdt, offset, lenp); +} + +static const struct fdt_property *fdt_get_property_namelen_(const void *fdt, + int offset, + const char *name, + int namelen, + int *lenp, + int *poffset) { for (offset = fdt_first_property_offset(fdt, offset); (offset >= 0); (offset = fdt_next_property_offset(fdt, offset))) { const struct fdt_property *prop; - if (!(prop = fdt_get_property_by_offset(fdt, offset, lenp))) { + prop = fdt_get_property_by_offset_(fdt, offset, lenp); + if (!can_assume(LIBFDT_FLAWLESS) && !prop) { offset = -FDT_ERR_INTERNAL; break; } - if (_fdt_string_eq(fdt, fdt32_to_cpu(prop->nameoff), - name, namelen)) + if (fdt_string_eq_(fdt, fdt32_ld_(&prop->nameoff), + name, namelen)) { + if (poffset) + *poffset = offset; return prop; + } } if (lenp) @@ -279,6 +421,25 @@ const struct fdt_property *fdt_get_property_namelen(const void *fdt, return NULL; } + +const struct fdt_property *fdt_get_property_namelen(const void *fdt, + int offset, + const char *name, + int namelen, int *lenp) +{ + /* Prior to version 16, properties may need realignment + * and this API does not work. fdt_getprop_*() will, however. */ + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10) { + if (lenp) + *lenp = -FDT_ERR_BADVERSION; + return NULL; + } + + return fdt_get_property_namelen_(fdt, offset, name, namelen, lenp, + NULL); +} + + const struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset, const char *name, int *lenp) @@ -290,12 +451,18 @@ const struct fdt_property *fdt_get_property(const void *fdt, const void *fdt_getprop_namelen(const void *fdt, int nodeoffset, const char *name, int namelen, int *lenp) { + int poffset; const struct fdt_property *prop; - prop = fdt_get_property_namelen(fdt, nodeoffset, name, namelen, lenp); - if (! prop) + prop = fdt_get_property_namelen_(fdt, nodeoffset, name, namelen, lenp, + &poffset); + if (!prop) return NULL; + /* Handle realignment */ + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10 && + (poffset + sizeof(*prop)) % 8 && fdt32_ld_(&prop->len) >= 8) + return prop->data + 4; return prop->data; } @@ -304,11 +471,31 @@ const void *fdt_getprop_by_offset(const void *fdt, int offset, { const struct fdt_property *prop; - prop = fdt_get_property_by_offset(fdt, offset, lenp); + prop = fdt_get_property_by_offset_(fdt, offset, lenp); if (!prop) return NULL; - if (namep) - *namep = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); + if (namep) { + const char *name; + int namelen; + + if (!can_assume(VALID_INPUT)) { + name = fdt_get_string(fdt, fdt32_ld_(&prop->nameoff), + &namelen); + if (!name) { + if (lenp) + *lenp = namelen; + return NULL; + } + *namep = name; + } else { + *namep = fdt_string(fdt, fdt32_ld_(&prop->nameoff)); + } + } + + /* Handle realignment */ + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10 && + (offset + sizeof(*prop)) % 8 && fdt32_ld_(&prop->len) >= 8) + return prop->data + 4; return prop->data; } @@ -332,7 +519,7 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset) return 0; } - return fdt32_to_cpu(*php); + return fdt32_ld_(php); } const char *fdt_get_alias_namelen(const void *fdt, @@ -358,7 +545,7 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen) int offset, depth, namelen; const char *name; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); if (buflen < 2) return -FDT_ERR_NOSPACE; @@ -410,7 +597,7 @@ int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset, int offset, depth; int supernodeoffset = -FDT_ERR_INTERNAL; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); if (supernodedepth < 0) return -FDT_ERR_NOTFOUND; @@ -432,10 +619,12 @@ int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset, } } - if ((offset == -FDT_ERR_NOTFOUND) || (offset >= 0)) - return -FDT_ERR_BADOFFSET; - else if (offset == -FDT_ERR_BADOFFSET) - return -FDT_ERR_BADSTRUCTURE; + if (!can_assume(VALID_INPUT)) { + if ((offset == -FDT_ERR_NOTFOUND) || (offset >= 0)) + return -FDT_ERR_BADOFFSET; + else if (offset == -FDT_ERR_BADOFFSET) + return -FDT_ERR_BADSTRUCTURE; + } return offset; /* error from fdt_next_node() */ } @@ -447,7 +636,8 @@ int fdt_node_depth(const void *fdt, int nodeoffset) err = fdt_supernode_atdepth_offset(fdt, nodeoffset, 0, &nodedepth); if (err) - return (err < 0) ? err : -FDT_ERR_INTERNAL; + return (can_assume(LIBFDT_FLAWLESS) || err < 0) ? err : + -FDT_ERR_INTERNAL; return nodedepth; } @@ -469,7 +659,7 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset, const void *val; int len; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* FIXME: The algorithm here is pretty horrible: we scan each * property of a node in fdt_getprop(), then if that didn't @@ -492,10 +682,10 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle) { int offset; - if ((phandle == 0) || (phandle == -1)) + if ((phandle == 0) || (phandle == ~0U)) return -FDT_ERR_BADPHANDLE; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* FIXME: The algorithm here is pretty horrible: we * potentially scan each property of a node in @@ -530,6 +720,106 @@ int fdt_stringlist_contains(const char *strlist, int listlen, const char *str) return 0; } +int fdt_stringlist_count(const void *fdt, int nodeoffset, const char *property) +{ + const char *list, *end; + int length, count = 0; + + list = fdt_getprop(fdt, nodeoffset, property, &length); + if (!list) + return length; + + end = list + length; + + while (list < end) { + length = strnlen(list, end - list) + 1; + + /* Abort if the last string isn't properly NUL-terminated. */ + if (list + length > end) + return -FDT_ERR_BADVALUE; + + list += length; + count++; + } + + return count; +} + +int fdt_stringlist_search(const void *fdt, int nodeoffset, const char *property, + const char *string) +{ + int length, len, idx = 0; + const char *list, *end; + + list = fdt_getprop(fdt, nodeoffset, property, &length); + if (!list) + return length; + + len = strlen(string) + 1; + end = list + length; + + while (list < end) { + length = strnlen(list, end - list) + 1; + + /* Abort if the last string isn't properly NUL-terminated. */ + if (list + length > end) + return -FDT_ERR_BADVALUE; + + if (length == len && memcmp(list, string, length) == 0) + return idx; + + list += length; + idx++; + } + + return -FDT_ERR_NOTFOUND; +} + +const char *fdt_stringlist_get(const void *fdt, int nodeoffset, + const char *property, int idx, + int *lenp) +{ + const char *list, *end; + int length; + + list = fdt_getprop(fdt, nodeoffset, property, &length); + if (!list) { + if (lenp) + *lenp = length; + + return NULL; + } + + end = list + length; + + while (list < end) { + length = strnlen(list, end - list) + 1; + + /* Abort if the last string isn't properly NUL-terminated. */ + if (list + length > end) { + if (lenp) + *lenp = -FDT_ERR_BADVALUE; + + return NULL; + } + + if (idx == 0) { + if (lenp) + *lenp = length - 1; + + return list; + } + + list += length; + idx--; + } + + if (lenp) + *lenp = -FDT_ERR_NOTFOUND; + + return NULL; +} + int fdt_node_check_compatible(const void *fdt, int nodeoffset, const char *compatible) { @@ -539,10 +829,8 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, prop = fdt_getprop(fdt, nodeoffset, "compatible", &len); if (!prop) return len; - if (fdt_stringlist_contains(prop, len, compatible)) - return 0; - else - return 1; + + return !fdt_stringlist_contains(prop, len, compatible); } int fdt_node_offset_by_compatible(const void *fdt, int startoffset, @@ -550,7 +838,7 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset, { int offset, err; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* FIXME: The algorithm here is pretty horrible: we scan each * property of a node in fdt_node_check_compatible(), then if diff --git a/xen/common/libfdt/fdt_rw.c b/xen/common/libfdt/fdt_rw.c index 8b8cd25cc2..3621d3651d 100644 --- a/xen/common/libfdt/fdt_rw.c +++ b/xen/common/libfdt/fdt_rw.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,8 +10,8 @@ #include "libfdt_internal.h" -static int _fdt_blocks_misordered(const void *fdt, - int mem_rsv_size, int struct_size) +static int fdt_blocks_misordered_(const void *fdt, + int mem_rsv_size, int struct_size) { return (fdt_off_mem_rsvmap(fdt) < FDT_ALIGN(sizeof(struct fdt_header), 8)) || (fdt_off_dt_struct(fdt) < @@ -65,40 +22,44 @@ static int _fdt_blocks_misordered(const void *fdt, (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt))); } -static int _fdt_rw_check_header(void *fdt) +static int fdt_rw_probe_(void *fdt) { - FDT_CHECK_HEADER(fdt); + if (can_assume(VALID_DTB)) + return 0; + FDT_RO_PROBE(fdt); - if (fdt_version(fdt) < 17) + if (!can_assume(LATEST) && fdt_version(fdt) < 17) return -FDT_ERR_BADVERSION; - if (_fdt_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry), + if (fdt_blocks_misordered_(fdt, sizeof(struct fdt_reserve_entry), fdt_size_dt_struct(fdt))) return -FDT_ERR_BADLAYOUT; - if (fdt_version(fdt) > 17) + if (!can_assume(LATEST) && fdt_version(fdt) > 17) fdt_set_version(fdt, 17); return 0; } -#define FDT_RW_CHECK_HEADER(fdt) \ +#define FDT_RW_PROBE(fdt) \ { \ - int err; \ - if ((err = _fdt_rw_check_header(fdt)) != 0) \ - return err; \ + int err_; \ + if ((err_ = fdt_rw_probe_(fdt)) != 0) \ + return err_; \ } -static inline unsigned int _fdt_data_size(void *fdt) +static inline unsigned int fdt_data_size_(void *fdt) { return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt); } -static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen) +static int fdt_splice_(void *fdt, void *splicepoint, int oldlen, int newlen) { char *p = splicepoint; - unsigned int dsize = _fdt_data_size(fdt); + unsigned int dsize = fdt_data_size_(fdt); size_t soff = p - (char *)fdt; - if (oldlen < 0 || soff + oldlen < soff || soff + oldlen > dsize) + if ((oldlen < 0) || (soff + oldlen < soff) || (soff + oldlen > dsize)) + return -FDT_ERR_BADOFFSET; + if ((p < (char *)fdt) || (dsize + newlen < (unsigned)oldlen)) return -FDT_ERR_BADOFFSET; if (dsize - oldlen + newlen > fdt_totalsize(fdt)) return -FDT_ERR_NOSPACE; @@ -106,12 +67,12 @@ static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen) return 0; } -static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p, +static int fdt_splice_mem_rsv_(void *fdt, struct fdt_reserve_entry *p, int oldn, int newn) { int delta = (newn - oldn) * sizeof(*p); int err; - err = _fdt_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p)); + err = fdt_splice_(fdt, p, oldn * sizeof(*p), newn * sizeof(*p)); if (err) return err; fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta); @@ -119,13 +80,13 @@ static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p, return 0; } -static int _fdt_splice_struct(void *fdt, void *p, +static int fdt_splice_struct_(void *fdt, void *p, int oldlen, int newlen) { int delta = newlen - oldlen; int err; - if ((err = _fdt_splice(fdt, p, oldlen, newlen))) + if ((err = fdt_splice_(fdt, p, oldlen, newlen))) return err; fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta); @@ -133,20 +94,37 @@ static int _fdt_splice_struct(void *fdt, void *p, return 0; } -static int _fdt_splice_string(void *fdt, int newlen) +/* Must only be used to roll back in case of error */ +static void fdt_del_last_string_(void *fdt, const char *s) +{ + int newlen = strlen(s) + 1; + + fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) - newlen); +} + +static int fdt_splice_string_(void *fdt, int newlen) { void *p = (char *)fdt + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt); int err; - if ((err = _fdt_splice(fdt, p, 0, newlen))) + if ((err = fdt_splice_(fdt, p, 0, newlen))) return err; fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen); return 0; } -static int _fdt_find_add_string(void *fdt, const char *s) +/** + * fdt_find_add_string_() - Find or allocate a string + * + * @fdt: pointer to the device tree to check/adjust + * @s: string to find/add + * @allocated: Set to 0 if the string was found, 1 if not found and so + * allocated. Ignored if can_assume(NO_ROLLBACK) + * @return offset of string in the string table (whether found or added) + */ +static int fdt_find_add_string_(void *fdt, const char *s, int *allocated) { char *strtab = (char *)fdt + fdt_off_dt_strings(fdt); const char *p; @@ -154,16 +132,22 @@ static int _fdt_find_add_string(void *fdt, const char *s) int len = strlen(s) + 1; int err; - p = _fdt_find_string(strtab, fdt_size_dt_strings(fdt), s); + if (!can_assume(NO_ROLLBACK)) + *allocated = 0; + + p = fdt_find_string_(strtab, fdt_size_dt_strings(fdt), s); if (p) /* found it */ return (p - strtab); new = strtab + fdt_size_dt_strings(fdt); - err = _fdt_splice_string(fdt, len); + err = fdt_splice_string_(fdt, len); if (err) return err; + if (!can_assume(NO_ROLLBACK)) + *allocated = 1; + memcpy(new, s, len); return (new - strtab); } @@ -173,10 +157,10 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size) struct fdt_reserve_entry *re; int err; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); - re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt)); - err = _fdt_splice_mem_rsv(fdt, re, 0, 1); + re = fdt_mem_rsv_w_(fdt, fdt_num_mem_rsv(fdt)); + err = fdt_splice_mem_rsv_(fdt, re, 0, 1); if (err) return err; @@ -187,31 +171,27 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size) int fdt_del_mem_rsv(void *fdt, int n) { - struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n); - int err; + struct fdt_reserve_entry *re = fdt_mem_rsv_w_(fdt, n); - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); if (n >= fdt_num_mem_rsv(fdt)) return -FDT_ERR_NOTFOUND; - err = _fdt_splice_mem_rsv(fdt, re, 1, 0); - if (err) - return err; - return 0; + return fdt_splice_mem_rsv_(fdt, re, 1, 0); } -static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name, +static int fdt_resize_property_(void *fdt, int nodeoffset, const char *name, int len, struct fdt_property **prop) { int oldlen; int err; *prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); - if (! (*prop)) + if (!*prop) return oldlen; - if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen), + if ((err = fdt_splice_struct_(fdt, (*prop)->data, FDT_TAGALIGN(oldlen), FDT_TAGALIGN(len)))) return err; @@ -219,27 +199,32 @@ static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name, return 0; } -static int _fdt_add_property(void *fdt, int nodeoffset, const char *name, +static int fdt_add_property_(void *fdt, int nodeoffset, const char *name, int len, struct fdt_property **prop) { int proplen; int nextoffset; int namestroff; int err; + int allocated; - if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) < 0) + if ((nextoffset = fdt_check_node_offset_(fdt, nodeoffset)) < 0) return nextoffset; - namestroff = _fdt_find_add_string(fdt, name); + namestroff = fdt_find_add_string_(fdt, name, &allocated); if (namestroff < 0) return namestroff; - *prop = _fdt_offset_ptr_w(fdt, nextoffset); + *prop = fdt_offset_ptr_w_(fdt, nextoffset); proplen = sizeof(**prop) + FDT_TAGALIGN(len); - err = _fdt_splice_struct(fdt, *prop, 0, proplen); - if (err) + err = fdt_splice_struct_(fdt, *prop, 0, proplen); + if (err) { + /* Delete the string if we failed to add it */ + if (!can_assume(NO_ROLLBACK) && allocated) + fdt_del_last_string_(fdt, name); return err; + } (*prop)->tag = cpu_to_fdt32(FDT_PROP); (*prop)->nameoff = cpu_to_fdt32(namestroff); @@ -253,7 +238,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) int oldlen, newlen; int err; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen); if (!namep) @@ -261,7 +246,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) newlen = strlen(name); - err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1), + err = fdt_splice_struct_(fdt, namep, FDT_TAGALIGN(oldlen+1), FDT_TAGALIGN(newlen+1)); if (err) return err; @@ -270,21 +255,36 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) return 0; } -int fdt_setprop(void *fdt, int nodeoffset, const char *name, - const void *val, int len) +int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name, + int len, void **prop_data) { struct fdt_property *prop; int err; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); - err = _fdt_resize_property(fdt, nodeoffset, name, len, &prop); + err = fdt_resize_property_(fdt, nodeoffset, name, len, &prop); if (err == -FDT_ERR_NOTFOUND) - err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + err = fdt_add_property_(fdt, nodeoffset, name, len, &prop); + if (err) + return err; + + *prop_data = prop->data; + return 0; +} + +int fdt_setprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len) +{ + void *prop_data; + int err; + + err = fdt_setprop_placeholder(fdt, nodeoffset, name, len, &prop_data); if (err) return err; - memcpy(prop->data, val, len); + if (len) + memcpy(prop_data, val, len); return 0; } @@ -294,12 +294,12 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name, struct fdt_property *prop; int err, oldlen, newlen; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); if (prop) { newlen = len + oldlen; - err = _fdt_splice_struct(fdt, prop->data, + err = fdt_splice_struct_(fdt, prop->data, FDT_TAGALIGN(oldlen), FDT_TAGALIGN(newlen)); if (err) @@ -307,7 +307,7 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name, prop->len = cpu_to_fdt32(newlen); memcpy(prop->data + oldlen, val, len); } else { - err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + err = fdt_add_property_(fdt, nodeoffset, name, len, &prop); if (err) return err; memcpy(prop->data, val, len); @@ -320,14 +320,14 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name) struct fdt_property *prop; int len, proplen; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); prop = fdt_get_property_w(fdt, nodeoffset, name, &len); - if (! prop) + if (!prop) return len; proplen = sizeof(*prop) + FDT_TAGALIGN(len); - return _fdt_splice_struct(fdt, prop, proplen, 0); + return fdt_splice_struct_(fdt, prop, proplen, 0); } int fdt_add_subnode_namelen(void *fdt, int parentoffset, @@ -340,7 +340,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, uint32_t tag; fdt32_t *endtag; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen); if (offset >= 0) @@ -349,16 +349,19 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, return offset; /* Try to place the new node after the parent's properties */ - fdt_next_tag(fdt, parentoffset, &nextoffset); /* skip the BEGIN_NODE */ + tag = fdt_next_tag(fdt, parentoffset, &nextoffset); + /* the fdt_subnode_offset_namelen() should ensure this never hits */ + if (!can_assume(LIBFDT_FLAWLESS) && (tag != FDT_BEGIN_NODE)) + return -FDT_ERR_INTERNAL; do { offset = nextoffset; tag = fdt_next_tag(fdt, offset, &nextoffset); } while ((tag == FDT_PROP) || (tag == FDT_NOP)); - nh = _fdt_offset_ptr_w(fdt, offset); + nh = fdt_offset_ptr_w_(fdt, offset); nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE; - err = _fdt_splice_struct(fdt, nh, 0, nodelen); + err = fdt_splice_struct_(fdt, nh, 0, nodelen); if (err) return err; @@ -380,18 +383,20 @@ int fdt_del_node(void *fdt, int nodeoffset) { int endoffset; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); - endoffset = _fdt_node_end_offset(fdt, nodeoffset); + endoffset = fdt_node_end_offset_(fdt, nodeoffset); if (endoffset < 0) return endoffset; - return _fdt_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset), + return fdt_splice_struct_(fdt, fdt_offset_ptr_w_(fdt, nodeoffset), endoffset - nodeoffset, 0); } -static void _fdt_packblocks(const char *old, char *new, - int mem_rsv_size, int struct_size) +static void fdt_packblocks_(const char *old, char *new, + int mem_rsv_size, + int struct_size, + int strings_size) { int mem_rsv_off, struct_off, strings_off; @@ -406,8 +411,7 @@ static void _fdt_packblocks(const char *old, char *new, fdt_set_off_dt_struct(new, struct_off); fdt_set_size_dt_struct(new, struct_size); - memmove(new + strings_off, old + fdt_off_dt_strings(old), - fdt_size_dt_strings(old)); + memmove(new + strings_off, old + fdt_off_dt_strings(old), strings_size); fdt_set_off_dt_strings(new, strings_off); fdt_set_size_dt_strings(new, fdt_size_dt_strings(old)); } @@ -421,22 +425,25 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) const char *fdtend = fdtstart + fdt_totalsize(fdt); char *tmp; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); mem_rsv_size = (fdt_num_mem_rsv(fdt)+1) * sizeof(struct fdt_reserve_entry); - if (fdt_version(fdt) >= 17) { + if (can_assume(LATEST) || fdt_version(fdt) >= 17) { struct_size = fdt_size_dt_struct(fdt); - } else { + } else if (fdt_version(fdt) == 16) { struct_size = 0; while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END) ; if (struct_size < 0) return struct_size; + } else { + return -FDT_ERR_BADVERSION; } - if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) { + if (can_assume(LIBFDT_ORDER) || + !fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) { /* no further work necessary */ err = fdt_move(fdt, buf, bufsize); if (err) @@ -464,7 +471,8 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) return -FDT_ERR_NOSPACE; } - _fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size); + fdt_packblocks_(fdt, tmp, mem_rsv_size, struct_size, + fdt_size_dt_strings(fdt)); memmove(buf, tmp, newsize); fdt_set_magic(buf, FDT_MAGIC); @@ -480,12 +488,13 @@ int fdt_pack(void *fdt) { int mem_rsv_size; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); mem_rsv_size = (fdt_num_mem_rsv(fdt)+1) * sizeof(struct fdt_reserve_entry); - _fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt)); - fdt_set_totalsize(fdt, _fdt_data_size(fdt)); + fdt_packblocks_(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt), + fdt_size_dt_strings(fdt)); + fdt_set_totalsize(fdt, fdt_data_size_(fdt)); return 0; } diff --git a/xen/common/libfdt/fdt_strerror.c b/xen/common/libfdt/fdt_strerror.c index 8d0289cb38..b4356931b0 100644 --- a/xen/common/libfdt/fdt_strerror.c +++ b/xen/common/libfdt/fdt_strerror.c @@ -1,49 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -67,6 +25,7 @@ static struct fdt_errtabent fdt_errtable[] = { FDT_ERRTABENT(FDT_ERR_BADOFFSET), FDT_ERRTABENT(FDT_ERR_BADPATH), + FDT_ERRTABENT(FDT_ERR_BADPHANDLE), FDT_ERRTABENT(FDT_ERR_BADSTATE), FDT_ERRTABENT(FDT_ERR_TRUNCATED), @@ -74,8 +33,14 @@ static struct fdt_errtabent fdt_errtable[] = { FDT_ERRTABENT(FDT_ERR_BADVERSION), FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE), FDT_ERRTABENT(FDT_ERR_BADLAYOUT), + FDT_ERRTABENT(FDT_ERR_INTERNAL), + FDT_ERRTABENT(FDT_ERR_BADNCELLS), + FDT_ERRTABENT(FDT_ERR_BADVALUE), + FDT_ERRTABENT(FDT_ERR_BADOVERLAY), + FDT_ERRTABENT(FDT_ERR_NOPHANDLES), + FDT_ERRTABENT(FDT_ERR_BADFLAGS), }; -#define FDT_ERRTABSIZE (sizeof(fdt_errtable) / sizeof(fdt_errtable[0])) +#define FDT_ERRTABSIZE ((int)(sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))) const char *fdt_strerror(int errval) { @@ -83,7 +48,7 @@ const char *fdt_strerror(int errval) return ""; else if (errval == 0) return ""; - else if (errval > -FDT_ERRTABSIZE) { + else if (-errval < FDT_ERRTABSIZE) { const char *s = fdt_errtable[-errval].str; if (s) diff --git a/xen/common/libfdt/fdt_sw.c b/xen/common/libfdt/fdt_sw.c index c7d93d3bba..4c569ee7eb 100644 --- a/xen/common/libfdt/fdt_sw.c +++ b/xen/common/libfdt/fdt_sw.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,25 +10,91 @@ #include "libfdt_internal.h" -static int _fdt_sw_check_header(void *fdt) +static int fdt_sw_probe_(void *fdt) From xen-changelog-bounces@lists.xenproject.org Wed Dec 01 16:44:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Dec 2021 16:44:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.236138.409580 (Exim 4.92) (envelope-from ) id 1msSiN-00049G-ON; Wed, 01 Dec 2021 16:44:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 236138.409580; Wed, 01 Dec 2021 16:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msSiN-000497-LK; Wed, 01 Dec 2021 16:44:15 +0000 Received: by outflank-mailman (input) for mailman id 236138; Wed, 01 Dec 2021 16:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msSiM-00048y-Qf for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 16:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msSiM-0008SS-Pq for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 16:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1msSiM-0002Ch-Os for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 16:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tbvlJrX+apj5FXqCYvFzkoiBujJDCVDFL3nXJiZlXCc=; b=sJfi5MB0JRMQRnXq0xiKYxyulq 7c7T95vP5rdTlNfdVwKqtTpFsV2zzghyC7bsEsT1XSIIODNPH3L2ZDRq6lTVK1ZDcvBRF7E0876mU cH63xYsE7Pe2wmm9MI7RGW5XnRvqkwNYEhz1Y4gS2FhUBF5ya52aLwC4HxhOzWYM5IW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/efi: Improve performance requesting filesystem handle Message-Id: Date: Wed, 01 Dec 2021 16:44:14 +0000 commit 9012687f05adf96440316ce338514db574ebfde0 Author: Luca Fancellu AuthorDate: Tue Nov 16 15:06:24 2021 +0000 Commit: Julien Grall CommitDate: Wed Dec 1 16:40:19 2021 +0000 arm/efi: Improve performance requesting filesystem handle Currently, the code used to handle and possibly load from the filesystem modules defined in the DT is allocating and closing the filesystem handle for each module to be loaded. To improve the performance, the filesystem handle pointer is passed through the call stack, requested when it's needed only once and closed if it was allocated. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/arch/arm/efi/efi-boot.h | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 458cfbbed4..c4ed412845 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -45,14 +45,17 @@ void __flush_dcache_area(const void *vaddr, unsigned long size); static int get_module_file_index(const char *name, unsigned int name_len); static void PrintMessage(const CHAR16 *s); static int allocate_module_file(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, const char *name, unsigned int name_len); static int handle_module_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int module_node_offset, int reg_addr_cells, int reg_size_cells, bool is_domu_module); static int handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int domain_node); static int efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image); @@ -648,10 +651,10 @@ static void __init PrintMessage(const CHAR16 *s) * index of the file in the modules array or a negative number on error. */ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, const char *name, unsigned int name_len) { - EFI_FILE_HANDLE dir_handle; module_name *file_name; CHAR16 *fname; union string module_name; @@ -686,12 +689,11 @@ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, file_name->name_len = name_len; /* Get the file system interface. */ - dir_handle = get_parent_handle(loaded_image, &fname); + if ( !*dir_handle ) + *dir_handle = get_parent_handle(loaded_image, &fname); /* Load the binary in memory */ - read_file(dir_handle, s2w(&module_name), &module_binary, NULL); - - dir_handle->Close(dir_handle); + read_file(*dir_handle, s2w(&module_name), &module_binary, NULL); /* Save address and size */ file_name->addr = module_binary.addr; @@ -712,6 +714,7 @@ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, * Returns 1 if module is multiboot,module, 0 if not, < 0 on error */ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int module_node_offset, int reg_addr_cells, int reg_size_cells, @@ -744,8 +747,8 @@ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, file_idx = get_module_file_index(uefi_name_prop, uefi_name_len); if ( file_idx < 0 ) { - file_idx = allocate_module_file(loaded_image, uefi_name_prop, - uefi_name_len); + file_idx = allocate_module_file(loaded_image, dir_handle, + uefi_name_prop, uefi_name_len); if ( file_idx < 0 ) return file_idx; } @@ -812,6 +815,7 @@ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, * Returns number of multiboot,module found or negative number on error. */ static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int domain_node) { int module_node, addr_cells, size_cells, len; @@ -842,8 +846,8 @@ static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, module_node > 0; module_node = fdt_next_subnode(fdt, module_node) ) { - int ret = handle_module_node(loaded_image, module_node, addr_cells, - size_cells, true); + int ret = handle_module_node(loaded_image, dir_handle, module_node, + addr_cells, size_cells, true); if ( ret < 0 ) return ret; @@ -862,6 +866,7 @@ static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) { int chosen, node, addr_len, size_len; unsigned int i = 0, modules_found = 0; + EFI_FILE_HANDLE dir_handle = NULL; /* Check for the chosen node in the current DTB */ chosen = setup_chosen_node(fdt, &addr_len, &size_len); @@ -881,20 +886,24 @@ static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) if ( !fdt_node_check_compatible(fdt, node, "xen,domain") ) { /* Found a node with compatible xen,domain; handle this node. */ - ret = handle_dom0less_domain_node(loaded_image, node); + ret = handle_dom0less_domain_node(loaded_image, &dir_handle, node); if ( ret < 0 ) return ERROR_DT_MODULE_DOMU; } else { - ret = handle_module_node(loaded_image, node, addr_len, size_len, - false); + ret = handle_module_node(loaded_image, &dir_handle, node, addr_len, + size_len, false); if ( ret < 0 ) return ERROR_DT_MODULE_DOM0; } modules_found += ret; } + /* dir_handle can be allocated in allocate_module_file, free it if exists */ + if ( dir_handle ) + dir_handle->Close(dir_handle); + /* Free boot modules file names if any */ for ( ; i < modules_idx; i++ ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 01 18:11:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Dec 2021 18:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.236166.409639 (Exim 4.92) (envelope-from ) id 1msU4Q-0007Db-3A; Wed, 01 Dec 2021 18:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 236166.409639; Wed, 01 Dec 2021 18:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4Q-0007DT-0I; Wed, 01 Dec 2021 18:11:06 +0000 Received: by outflank-mailman (input) for mailman id 236166; Wed, 01 Dec 2021 18:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4O-0007Cr-SW for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4O-0001Z1-Rg for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1msU4O-00047E-QX for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DLWf2CxpBet/z+ToxZ9mLQYDxqMU1IwquYW7BPNOzug=; b=Vjwu+TB2N0t+fbqEspR1cewhq5 0wjLoe9/anyJP2lsu13FdLZZ9Jt4PQBt/RQvrs6sH6WqvqmMLor9d2BlV2/9bPz6Z/vKVkHIw/8/v 5VBakb7qA7O4P9d1x6mdHxogi9Gu3Uj9FsV8EDSzIkLIK0bM4Md07ifDVSwOC7GKaT/U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG: add missing entries for work during the 4.16 release cycle Message-Id: Date: Wed, 01 Dec 2021 18:11:04 +0000 commit e058b2d4e5e2ad7ad03941d36ef9243291b35671 Author: Roger Pau Monne AuthorDate: Wed Nov 24 12:24:03 2021 +0100 Commit: Ian Jackson CommitDate: Wed Dec 1 18:06:16 2021 +0000 CHANGELOG: add missing entries for work during the 4.16 release cycle Document some of the relevant changes during the 4.16 release cycle. Signed-off-by: Roger Pau Monné Release-Acked-by: Ian Jackson (cherry picked from commit e2544a28beacd854f295095d102a8773743ac917) --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad1a8c2bc2..1fe52da7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - qemu-traditional based device models (both, qemu-traditional and ioemu-stubdom) will no longer be built per default. In order to be able to use those, configure needs to be called with "--enable-qemu-traditional" as parameter. + - Fixes for credit2 scheduler stability in corner case conditions. + - Ongoing improvements in the hypervisor build system. + - vtpmmgr miscellaneous fixes in preparation for TPM 2.0 support. + - 32bit PV guests only supported in shim mode. + - Improved PVH dom0 debug key handling. + - Fix booting on some Intel systems without a PIT (i8254). + - Cleanup of the xenstore library interface. + - Fix truncation of return value from xencall2 by introducing a new helper + that returns a long instead. + - Fix system register accesses on Arm to use the proper 32/64bit access size. + - Various fixes for Arm OP-TEE mediator. + - Switch to domheap for Xen page tables. + +### Added + - 32bit Arm builds to the gitlab-ci automated tests. + - x86 full system tests to the gitlab-ci automated tests. + - Arm limited vPMU support for guests. + - Static physical memory allocation for dom0less on arm64. + - dom0less EFI support on arm64. + - GICD_ICPENDR register handling in vGIC emulation to support Zephyr OS. + - CPU feature leveling on arm64 platform with heterogeneous cores. + - Report unpopulated memory regions safe to use for external mappings, Arm and + device tree only. + - Support of generic DT IOMMU bindings for Arm SMMU v2. + - Limit grant table version on a per-domain basis. ## [4.15.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - 2021-04-08 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 01 18:11:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Dec 2021 18:11:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.236169.409644 (Exim 4.92) (envelope-from ) id 1msU4a-0007O5-4k; Wed, 01 Dec 2021 18:11:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 236169.409644; Wed, 01 Dec 2021 18:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4a-0007Nx-1u; Wed, 01 Dec 2021 18:11:16 +0000 Received: by outflank-mailman (input) for mailman id 236169; Wed, 01 Dec 2021 18:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4Y-0007Ng-Vd for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4Y-0001Z6-Uv for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1msU4Y-00048G-Tq for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TTn2uPR1ZpCL5O0C2aXsjPLR4gN3G8eNHV80SSNMCQY=; b=gcXrQMxgwMcYkosBDkcOQC489z FYj/uV777UK5tQEmodawNB6XJp7n9mrBx1AA/Px3d9xRkmxyV4gfN1tgBdIS7bcwNkVgI1InQqSWF BffHt7qxRmBMgAbZe0TDhRgQafIP8EfddvJVASMOzfC/0K0WsOi9TlRrHf9D+C9KFw+Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG.md: Set 4.16 version and date Message-Id: Date: Wed, 01 Dec 2021 18:11:14 +0000 commit eef266eb770128db0d5258009b744f0e0c31c9bd Author: Ian Jackson AuthorDate: Tue Nov 30 11:40:21 2021 +0000 Commit: Ian Jackson CommitDate: Wed Dec 1 18:06:21 2021 +0000 CHANGELOG.md: Set 4.16 version and date Signed-off-by: Ian Jackson (cherry picked from commit 36aa64095d0419d52d2466405ac13b9858463f48) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe52da7db..731db3590e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) -## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD +## [4.16.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - 2021-12-02 ### Removed - XENSTORED_ROOTDIR environment variable from configuartion files and -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 01 18:11:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Dec 2021 18:11:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.236171.409647 (Exim 4.92) (envelope-from ) id 1msU4l-0007Rc-67; Wed, 01 Dec 2021 18:11:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 236171.409647; Wed, 01 Dec 2021 18:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4l-0007RV-3J; Wed, 01 Dec 2021 18:11:27 +0000 Received: by outflank-mailman (input) for mailman id 236171; Wed, 01 Dec 2021 18:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4j-0007R3-2O for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msU4j-0001ZN-1a for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1msU4j-000494-0o for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 18:11:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3fJMXIL30nGQKwBkYXDL73Z4ECOtSsjbS54cKdstp7U=; b=KtYBq2a8kfK3qtcmaNGk1Pbznn aEFvGD31c6IgYc8v3ZSw9qAKWg3t0Gn9ALc3tRdsuYxlrj9et9TYafdfJsr7LLT5FY/W4jz5a0nS6 s5NzOxBWKLuZ5x6Zyhz/3oty6x25Oa6UvBgPbIsm046nmKztXu62Dbl7lB25MCrzlmFI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] CHANGELOG.md: Start new "unstable" section Message-Id: Date: Wed, 01 Dec 2021 18:11:25 +0000 commit 6c1c97e24f830a921a23e3b9694e20493c9986ee Author: Ian Jackson AuthorDate: Wed Dec 1 18:07:40 2021 +0000 Commit: Ian Jackson CommitDate: Wed Dec 1 18:07:40 2021 +0000 CHANGELOG.md: Start new "unstable" section I have just forward-ported the CHANGELOG.md updates from the stable-4.16 branch. But we need a new section for work in this release cycle. Signed-off-by: Ian Jackson --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 731db3590e..6c0cd88cdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD + ## [4.16.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - 2021-12-02 ### Removed -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 01 21:44:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 01 Dec 2021 21:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.236237.409772 (Exim 4.92) (envelope-from ) id 1msXOX-0000vQ-Go; Wed, 01 Dec 2021 21:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 236237.409772; Wed, 01 Dec 2021 21:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msXOX-0000vI-Do; Wed, 01 Dec 2021 21:44:05 +0000 Received: by outflank-mailman (input) for mailman id 236237; Wed, 01 Dec 2021 21:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msXOW-0000vC-Dx for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 21:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1msXOW-0005Cw-CI for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 21:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1msXOW-0001P4-BJ for xen-changelog@lists.xenproject.org; Wed, 01 Dec 2021 21:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=K+7M5l0NawSaknG96CYQPIrF3H4opVg3Q9uGL/N2IKQ=; b=VLy00j4YtJP4V7ubHnV/vDjSpV 4SjWcyNJ7nFXek7N0uzdy5ES2fEGsKQG4ZQmHs2N8wwW9jr4cT6iAI5zEYgyCTJ0vfiLkf8yNPVE8 PsdsEkThBZx6zbDShMQCDDRLuQmmo0+oCvI/Fwl2VXZW/XBCYPh9LzIG+GWOZcGsXeOQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] bitops: Fix incorrect value in comment Message-Id: Date: Wed, 01 Dec 2021 21:44:04 +0000 commit eb41074692094dff1413efb44fa4928a9140aa41 Author: Ayan Kumar Halder AuthorDate: Tue Nov 30 18:12:38 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Dec 1 21:35:23 2021 +0000 bitops: Fix incorrect value in comment GENMASK(30, 21) should be 0x7fe00000. Fixed this in the comment in bitops.h. Signed-off-by: Ayan Kumar Halder Acked-by: Andrew Cooper [Tweak text, to put an end to any further bikeshedding] Signed-off-by: Andrew Cooper --- xen/include/xen/bitops.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index a64595f68e..33619a0873 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -4,8 +4,7 @@ /* * Create a contiguous bitmask starting at bit position @l and ending at - * position @h. For example - * GENMASK(30, 21) gives us the 32bit vector 0x01fe00000. + * position @h. For example GENMASK(30, 21) gives us 0x7fe00000ul. */ #define GENMASK(h, l) \ (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 02 21:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Dec 2021 21:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237020.411039 (Exim 4.92) (envelope-from ) id 1mstM9-0007L4-P1; Thu, 02 Dec 2021 21:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237020.411039; Thu, 02 Dec 2021 21:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstM9-0007Kv-La; Thu, 02 Dec 2021 21:11:05 +0000 Received: by outflank-mailman (input) for mailman id 237020; Thu, 02 Dec 2021 21:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstM8-0007Kp-Ks for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstM8-0001j1-J9 for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mstM8-0003IA-IA for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=baFhd/BhvCEq9118iNGYRAFZDTidsrqBKEpEandsrIY=; b=5SvE87Ykz6zX4FId30no8UcqPF 9LxtyNCoiOS2H5dhhOztEvrwIkunBpHuqaXL+i6TfIpyYIfPhEYFgjH8Xe2A/S5yIaUhF/TeTNdeP enn0iRhl8wBj0Z5TeKuvuq5hKKMwddgjnDrBqloojZMHZH9M2F1g+ILfwl8osvxq06eE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Drop incorrect mapping at l2_xenmap[0] Message-Id: Date: Thu, 02 Dec 2021 21:11:04 +0000 commit a15b143a5f1c20dc6893bc3e50873e308ef61d87 Author: Andrew Cooper AuthorDate: Mon Nov 29 16:09:08 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Drop incorrect mapping at l2_xenmap[0] It has been 4 years since the default load address changed from 1M to 2M, and _stext ceased residing in l2_xenmap[0]. We should not be inserting an unused mapping. To ensure we don't create mappings accidentally, loop from 0 and obey _PAGE_PRESENT on all entries. Fixes: 7ed93f3a0dff ("x86: change default load address from 1 MiB to 2 MiB") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index da47cdea14..6f24104842 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1279,16 +1279,12 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* The only data mappings to be relocated are in the Xen area. */ pl2e = __va(__pa(l2_xenmap)); - /* - * Undo the temporary-hooking of the l1_directmap. __2M_text_start - * is contained in this PTE. - */ + BUG_ON(using_2M_mapping() && l2_table_offset((unsigned long)_erodata) == l2_table_offset((unsigned long)_stext)); - *pl2e++ = l2e_from_pfn(xen_phys_start >> PAGE_SHIFT, - PAGE_HYPERVISOR_RX | _PAGE_PSE); - for ( i = 1; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) + + for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { unsigned int flags; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 02 21:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Dec 2021 21:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237021.411042 (Exim 4.92) (envelope-from ) id 1mstMJ-0007N4-Q9; Thu, 02 Dec 2021 21:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237021.411042; Thu, 02 Dec 2021 21:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMJ-0007Mw-N9; Thu, 02 Dec 2021 21:11:15 +0000 Received: by outflank-mailman (input) for mailman id 237021; Thu, 02 Dec 2021 21:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMI-0007Mn-NK for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMI-0001jO-MZ for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mstMI-0003In-La for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LvBVEzYs7cfEqFpD21enD8bP/B6Gv/Mh0wCMPb6qYUQ=; b=wcqmHcihFHzyXICndQ8sicmfea 5N0KYS0A7UfrgIh4qUyTlisc9OFDmSUh+N5jR+KM3Cn1V9Cf2qwf4/4ERCTsk8dVS2qP0uY5ioDm3 JbH0cALsW9TUTwAF/qI7IYo6879gBG9HOoSz4fGDfxJbMcJArAGCvnWTUZLzwuOz8aX8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Better describe the pagetable relocation loops Message-Id: Date: Thu, 02 Dec 2021 21:11:14 +0000 commit 3099ff3ce15481b4f1536470cb87ac0ebf82b7bb Author: Andrew Cooper AuthorDate: Mon Nov 29 19:19:43 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Better describe the pagetable relocation loops The first loop relocates all reachable non-leaf entries in idle_pg_table[], which includes l2_xenmap[511]'s reference to l1_fixmap_x[]. The second loop relocates only leaf mappings in l2_xenmap[], so update the skip condition to be opposite to the first loop. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6f24104842..495b4b7d51 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1245,7 +1245,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) barrier(); move_memory(e, XEN_IMG_OFFSET, _end - _start, 1); - /* Walk initial pagetables, relocating page directory entries. */ + /* Walk idle_pg_table, relocating non-leaf entries. */ pl4e = __va(__pa(idle_pg_table)); for ( i = 0 ; i < L4_PAGETABLE_ENTRIES; i++, pl4e++ ) { @@ -1277,18 +1277,18 @@ void __init noreturn __start_xen(unsigned long mbi_p) } } - /* The only data mappings to be relocated are in the Xen area. */ - pl2e = __va(__pa(l2_xenmap)); - BUG_ON(using_2M_mapping() && l2_table_offset((unsigned long)_erodata) == l2_table_offset((unsigned long)_stext)); + /* Walk l2_xenmap[], relocating 2M superpage leaves. */ + pl2e = __va(__pa(l2_xenmap)); for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { unsigned int flags; if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) || + !(l2e_get_flags(*pl2e) & _PAGE_PSE) || (l2e_get_pfn(*pl2e) >= pte_update_limit) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 02 21:11:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Dec 2021 21:11:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237022.411046 (Exim 4.92) (envelope-from ) id 1mstMT-0007Pl-Ry; Thu, 02 Dec 2021 21:11:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237022.411046; Thu, 02 Dec 2021 21:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMT-0007Pd-Ok; Thu, 02 Dec 2021 21:11:25 +0000 Received: by outflank-mailman (input) for mailman id 237022; Thu, 02 Dec 2021 21:11:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMS-0007PX-Qc for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMS-0001jg-Pp for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mstMS-0003JO-Oy for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IOKIxSHt010zExrFRQ19GdH4nCMQX8f5IZUASKxihTE=; b=Fpz3bMLvanXX7waDrqYWWKn1y4 CfOAw8lONmmaVhiiuwoiPzDCALX3bJGxBKdCRbi8XrjQR7csd24DxW4W2XxnctN1V7eU3572bucYN 2p4uuIveMisJg0FU4rzQpgJmiBStVW6n0xij4NnHp5h9t8WPK44W/PyXT/QMxgyIqaAs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Fix data placement around __high_start() Message-Id: Date: Thu, 02 Dec 2021 21:11:24 +0000 commit ffa5d037c78fe175f31373deec0759ff8cc8d66c Author: Andrew Cooper AuthorDate: Mon Nov 29 19:52:05 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Fix data placement around __high_start() multiboot_ptr should be in __initdata - it is only used on the BSP path. Furthermore, the .align 8 then .long means that stack_start is misaligned. Move both into setup.c, which lets the compiler handle the details correctly, as well as providing proper debug information for them. Declare stack_start in setup.h and avoid extern-ing it locally in smpboot.c. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/boot/x86_64.S | 8 -------- xen/arch/x86/setup.c | 6 ++++++ xen/arch/x86/smpboot.c | 3 +-- xen/include/asm-x86/setup.h | 2 ++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index d61048c583..27f52e7a77 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -67,14 +67,6 @@ ENTRY(__high_start) call __start_xen BUG /* __start_xen() shouldn't return. */ - .data - .align 8 -multiboot_ptr: - .long 0 - -GLOBAL(stack_start) - .quad cpu0_stack + STACK_SIZE - CPUINFO_sizeof - .section .data.page_aligned, "aw", @progbits .align PAGE_SIZE, 0 /* diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 495b4b7d51..6613e56a21 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -141,6 +141,12 @@ unsigned long __read_mostly xen_virt_end; char __section(".bss.stack_aligned") __aligned(STACK_SIZE) cpu0_stack[STACK_SIZE]; +/* Used by the BSP/AP paths to find the higher half stack mapping to use. */ +void *stack_start = cpu0_stack + STACK_SIZE - sizeof(struct cpu_info); + +/* Used by the boot asm to stash the relocated multiboot info pointer. */ +unsigned int __initdata multiboot_ptr; + struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; unsigned long __read_mostly mmu_cr4_features = XEN_MINIMAL_CR4; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 329cfdb6c9..08c0f2d9df 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -419,8 +420,6 @@ void start_secondary(void *unused) startup_cpu_idle_loop(); } -extern void *stack_start; - static int wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) { unsigned long send_status = 0, accept_status = 0; diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 24be46115d..eb9d7b433c 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -12,6 +12,8 @@ extern char __2M_rwdata_start[], __2M_rwdata_end[]; extern unsigned long xenheap_initial_phys_start; extern uint64_t boot_tsc_stamp; +extern void *stack_start; + void early_cpu_init(void); void early_time_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 02 21:11:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Dec 2021 21:11:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237023.411050 (Exim 4.92) (envelope-from ) id 1mstMd-0007SY-TP; Thu, 02 Dec 2021 21:11:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237023.411050; Thu, 02 Dec 2021 21:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMd-0007SQ-QL; Thu, 02 Dec 2021 21:11:35 +0000 Received: by outflank-mailman (input) for mailman id 237023; Thu, 02 Dec 2021 21:11:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMc-0007S8-Tx for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMc-0001jw-TF for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mstMc-0003Jt-ST for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YRquKR0NCJ4u0gPCLtt/YX70PKXrGsMfdBSEcwVgvaY=; b=lf/reCyhAC5LwzORhvjoQXDC/z hi+AWNF6SBUY5ChSmuokPK7EKiHMkN+h4H6z3w09j42g7MI7Nr5bBGePpcaSkK2xHKYSG5msiauCv pWkzKPYxtzuWfHDNoisOXz6CRlz6yG3BKnUZEVI8tc1iv5f80PgEFer4RqnkGRjJ+NtQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Drop xen_virt_end Message-Id: Date: Thu, 02 Dec 2021 21:11:34 +0000 commit c182e89d0b341d2efc930c2e1211d3e866c0effb Author: Andrew Cooper AuthorDate: Mon Nov 29 19:01:50 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Drop xen_virt_end The calculation in __start_xen() for xen_virt_end is an opencoding of ROUNDUP(_end, 2M). This is __2M_rwdata_end as provided by the linker script. This corrects the bound calculations in arch_livepatch_init() and update_xen_mappings() to not enforce 2M alignment when Xen is not compiled with CONFIG_XEN_ALIGN_2M. Furthermore, since 52975142d154 ("x86/boot: Create the l2_xenmap[] mappings dynamically"), there have not been extraneous mappings to delete, meaning that the call to destroy_xen_mappings() has been a no-op. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/livepatch.c | 3 ++- xen/arch/x86/mm.c | 3 ++- xen/arch/x86/setup.c | 6 ------ xen/include/asm-x86/x86_64/page.h | 2 -- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/livepatch.c b/xen/arch/x86/livepatch.c index 49f0d902e5..d056b1ed8b 100644 --- a/xen/arch/x86/livepatch.c +++ b/xen/arch/x86/livepatch.c @@ -17,6 +17,7 @@ #include #include #include +#include static bool has_active_waitqueue(const struct vm_event_domain *ved) { @@ -343,7 +344,7 @@ void __init arch_livepatch_init(void) { void *start, *end; - start = (void *)xen_virt_end; + start = (void *)__2M_rwdata_end; end = (void *)(XEN_VIRT_END - FIXADDR_X_SIZE - NR_CPUS * PAGE_SIZE); BUG_ON(end <= start); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4d799032dc..4a9ac8d5e6 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -787,7 +787,8 @@ static int update_xen_mappings(unsigned long mfn, unsigned int cacheattr) { int err = 0; bool alias = mfn >= PFN_DOWN(xen_phys_start) && - mfn < PFN_UP(xen_phys_start + xen_virt_end - XEN_VIRT_START); + mfn < PFN_UP(xen_phys_start + (unsigned long)__2M_rwdata_end - + XEN_VIRT_START); unsigned long xen_va = XEN_VIRT_START + ((mfn - PFN_DOWN(xen_phys_start)) << PAGE_SHIFT); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6613e56a21..0e0e706404 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -136,8 +136,6 @@ cpumask_t __read_mostly cpu_present_map; unsigned long __read_mostly xen_phys_start; -unsigned long __read_mostly xen_virt_end; - char __section(".bss.stack_aligned") __aligned(STACK_SIZE) cpu0_stack[STACK_SIZE]; @@ -1573,10 +1571,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) } #endif - xen_virt_end = ((unsigned long)_end + (1UL << L2_PAGETABLE_SHIFT) - 1) & - ~((1UL << L2_PAGETABLE_SHIFT) - 1); - destroy_xen_mappings(xen_virt_end, XEN_VIRT_START + BOOTSTRAP_MAP_BASE); - /* * If not using 2M mappings to gain suitable pagetable permissions * directly from the relocation above, remap the code/data diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index f9faf7f383..cb1db107c4 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -23,8 +23,6 @@ static inline unsigned long canonicalise_addr(unsigned long addr) #include -extern unsigned long xen_virt_end; - /* * Note: These are solely for the use by page_{get,set}_owner(), and * therefore don't need to handle the XEN_VIRT_{START,END} range. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 02 21:11:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Dec 2021 21:11:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237024.411054 (Exim 4.92) (envelope-from ) id 1mstMn-0007W4-VD; Thu, 02 Dec 2021 21:11:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237024.411054; Thu, 02 Dec 2021 21:11:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMn-0007Vw-S9; Thu, 02 Dec 2021 21:11:45 +0000 Received: by outflank-mailman (input) for mailman id 237024; Thu, 02 Dec 2021 21:11:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMn-0007Vj-0l for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMm-0001k9-WB for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mstMm-0003KM-VT for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nDj90/vP0R+yXxS20ZcBN5MIK2QOb0pzg66kO6xT8Oc=; b=evwEAp+nTpYPpELCFkXHcV+Fjn w7zafD7BNJHpsSxQYjGnPUWH6SqALsrJSk68pDIeY+y6Vkv/0P/W2LbnPlv+AGEwUvuyPoJ3wlhoa +szyvqw7811r0svTVBZN/MT8PDQBkmqiinCRmBSUqOUQC92qOl/hjQoRvKeNmG9WPX/s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Adjust .text/.rodata/etc permissions in one place Message-Id: Date: Thu, 02 Dec 2021 21:11:44 +0000 commit 8de86b5cd4353bf2cc415e4563f973f071b4e8a3 Author: Andrew Cooper AuthorDate: Mon Nov 29 20:04:11 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Adjust .text/.rodata/etc permissions in one place At the moment, we have two locations selecting restricted permissions, not very far apart on boot, dependent on opposite answers from using_2M_mapping(). The later location however can shatter superpages if needed, while the former cannot. Collect together all the permission adjustments at the slightly later point in boot, as we likely need to shatter a superpage to support __ro_after_init. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 74 ++++++++++++---------------------------------------- 1 file changed, 16 insertions(+), 58 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0e0e706404..f5c15e45d6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1281,55 +1281,16 @@ void __init noreturn __start_xen(unsigned long mbi_p) } } - BUG_ON(using_2M_mapping() && - l2_table_offset((unsigned long)_erodata) == - l2_table_offset((unsigned long)_stext)); - /* Walk l2_xenmap[], relocating 2M superpage leaves. */ pl2e = __va(__pa(l2_xenmap)); for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { - unsigned int flags; - if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) || !(l2e_get_flags(*pl2e) & _PAGE_PSE) || (l2e_get_pfn(*pl2e) >= pte_update_limit) ) continue; - if ( !using_2M_mapping() ) - { - *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + - xen_phys_start); - continue; - } - - if ( i < l2_table_offset((unsigned long)&__2M_text_end) ) - { - flags = PAGE_HYPERVISOR_RX | _PAGE_PSE; - } - else if ( i >= l2_table_offset((unsigned long)&__2M_rodata_start) && - i < l2_table_offset((unsigned long)&__2M_rodata_end) ) - { - flags = PAGE_HYPERVISOR_RO | _PAGE_PSE; - } - else if ( i >= l2_table_offset((unsigned long)&__2M_init_start) && - i < l2_table_offset((unsigned long)&__2M_init_end) ) - { - flags = PAGE_HYPERVISOR_RWX | _PAGE_PSE; - } - else if ( (i >= l2_table_offset((unsigned long)&__2M_rwdata_start) && - i < l2_table_offset((unsigned long)&__2M_rwdata_end)) ) - { - flags = PAGE_HYPERVISOR_RW | _PAGE_PSE; - } - else - { - *pl2e = l2e_empty(); - continue; - } - - *pl2e = l2e_from_paddr( - l2e_get_paddr(*pl2e) + xen_phys_start, flags); + *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + xen_phys_start); } /* Re-sync the stack and then switch to relocated pagetables. */ @@ -1572,31 +1533,28 @@ void __init noreturn __start_xen(unsigned long mbi_p) #endif /* - * If not using 2M mappings to gain suitable pagetable permissions - * directly from the relocation above, remap the code/data - * sections with decreased permissions. + * All Xen mappings are currently RWX 2M superpages. Restrict to: + * text - RX + * rodata - RO + * init - keep RWX, discarded entirely later + * data/bss - RW */ - if ( !using_2M_mapping() ) - { - /* Mark .text as RX (avoiding the first 2M superpage). */ - modify_xen_mappings(XEN_VIRT_START + MB(2), - (unsigned long)&__2M_text_end, - PAGE_HYPERVISOR_RX); + modify_xen_mappings((unsigned long)&_start, + (unsigned long)&__2M_text_end, + PAGE_HYPERVISOR_RX); - /* Mark .rodata as RO. */ - modify_xen_mappings((unsigned long)&__2M_rodata_start, - (unsigned long)&__2M_rodata_end, - PAGE_HYPERVISOR_RO); + modify_xen_mappings((unsigned long)&__2M_rodata_start, + (unsigned long)&__2M_rodata_end, + PAGE_HYPERVISOR_RO); - /* Mark .data and .bss as RW. */ - modify_xen_mappings((unsigned long)&__2M_rwdata_start, - (unsigned long)&__2M_rwdata_end, - PAGE_HYPERVISOR_RW); + modify_xen_mappings((unsigned long)&__2M_rwdata_start, + (unsigned long)&__2M_rwdata_end, + PAGE_HYPERVISOR_RW); + if ( !using_2M_mapping() ) /* Drop the remaining mappings in the shattered superpage. */ destroy_xen_mappings((unsigned long)&__2M_rwdata_end, ROUNDUP((unsigned long)&__2M_rwdata_end, MB(2))); - } nr_pages = 0; for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 02 21:11:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 02 Dec 2021 21:11:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237025.411058 (Exim 4.92) (envelope-from ) id 1mstMy-0007Yr-0w; Thu, 02 Dec 2021 21:11:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237025.411058; Thu, 02 Dec 2021 21:11:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMx-0007Yj-Ti; Thu, 02 Dec 2021 21:11:55 +0000 Received: by outflank-mailman (input) for mailman id 237025; Thu, 02 Dec 2021 21:11:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMx-0007YZ-3t for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mstMx-0001kM-37 for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mstMx-0003L0-2E for xen-changelog@lists.xenproject.org; Thu, 02 Dec 2021 21:11:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/iY47K+entze7wmb8EV/uxcutKtyhDyT/S0o9jEjlXQ=; b=xkofYe5HNb0pe8/fQ1xk16vK8Q Z750oyh1P0DnSKwfOqRXxsjbAthpiFE4I0mXnMeUmZK1a6VQtIWV2tv2jIhsYI7wPUlg5o1PO8NeO rmkN1837nw5hMYNINMH5AjCBj+M/WiS4J6MmbWNxtxXXV9qkX8jAmHuBHA9qZm1TXNIQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/boot: Support __ro_after_init Message-Id: Date: Thu, 02 Dec 2021 21:11:55 +0000 commit 05657c6d1821dfc4e9a618767a942b3555406046 Author: Andrew Cooper AuthorDate: Mon Nov 29 20:11:01 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Support __ro_after_init For security hardening reasons, it advantageous to make setup-once data immutable after boot. Borrow __ro_after_init from Linux. On x86, place .data.ro_after_init at the start of .rodata, excluding it from the early permission restrictions. Re-apply RO restrictions to the whole of .rodata in init_done(), attempting to reform the superpage if possible. For architectures which don't implement __ro_after_init explicitly, variables merges into .data. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 12 +++++++++++- xen/arch/x86/xen.lds.S | 6 ++++++ xen/include/asm-x86/setup.h | 1 + xen/include/xen/cache.h | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f5c15e45d6..723bd49c76 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -663,6 +663,11 @@ static void noreturn init_done(void) init_xenheap_pages(__pa(start), __pa(end)); printk("Freed %lukB init memory\n", (end - start) >> 10); + /* Mark .rodata/ro_after_init as RO. Maybe reform the superpage. */ + modify_xen_mappings((unsigned long)&__2M_rodata_start, + (unsigned long)&__2M_rodata_end, + PAGE_HYPERVISOR_RO); + startup_cpu_idle_loop(); } @@ -1535,6 +1540,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* * All Xen mappings are currently RWX 2M superpages. Restrict to: * text - RX + * ro_after_init - RW for now, RO later * rodata - RO * init - keep RWX, discarded entirely later * data/bss - RW @@ -1543,7 +1549,11 @@ void __init noreturn __start_xen(unsigned long mbi_p) (unsigned long)&__2M_text_end, PAGE_HYPERVISOR_RX); - modify_xen_mappings((unsigned long)&__2M_rodata_start, + modify_xen_mappings((unsigned long)&__ro_after_init_start, + (unsigned long)&__ro_after_init_end, + PAGE_HYPERVISOR_RW); + + modify_xen_mappings((unsigned long)&__ro_after_init_end, (unsigned long)&__2M_rodata_end, PAGE_HYPERVISOR_RO); diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 87e344d4dd..4db5b404e0 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -97,6 +97,12 @@ SECTIONS __2M_rodata_start = .; /* Start of 2M superpages, mapped RO. */ DECL_SECTION(.rodata) { _srodata = .; + + __ro_after_init_start = .; + *(.data.ro_after_init) + . = ALIGN(PAGE_SIZE); + __ro_after_init_end = .; + /* Bug frames table */ __start_bug_frames = .; *(.bug_frames.0) diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index eb9d7b433c..7dc03b6b8d 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -5,6 +5,7 @@ #include extern const char __2M_text_start[], __2M_text_end[]; +extern const char __ro_after_init_start[], __ro_after_init_end[]; extern const char __2M_rodata_start[], __2M_rodata_end[]; extern char __2M_init_start[], __2M_init_end[]; extern char __2M_rwdata_start[], __2M_rwdata_end[]; diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index 6ee174efa4..f52a0aedf7 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,4 +15,6 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif +#define __ro_after_init __section(".data.ro_after_init") + #endif /* __LINUX_CACHE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237290.411530 (Exim 4.92) (envelope-from ) id 1mt5sI-0001uf-0Q; Fri, 03 Dec 2021 10:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237290.411530; Fri, 03 Dec 2021 10:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sH-0001uV-SI; Fri, 03 Dec 2021 10:33:05 +0000 Received: by outflank-mailman (input) for mailman id 237290; Fri, 03 Dec 2021 10:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sH-0001t1-2Q for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sH-0001z6-1X for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5sH-0006sC-0V for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uiV7E6BiRN5MWu25dKtXjCpdDsmBjC+aTbi5XuaR38E=; b=0xsv/L1j/GXsnu8zpubQ0aBgel ZocEHuun9nyS4u4OVj4WZaRrxVA8Mntr9kg07KX1j4RJekbUZVgOPPlZTnFlwNsJ9PJLOrcF0Iw3e GuM7mimBKj9csnXJRZFBMLpZA5Ubhxy3s0QK4omtxtASUQAweG6ac0ck/KlmwxfJ9HiI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PV: properly set shadow allocation for Dom0 Message-Id: Date: Fri, 03 Dec 2021 10:33:05 +0000 commit c037dfb909406de6febaaa2c2e05743186e1e07e Author: Jan Beulich AuthorDate: Fri Dec 3 11:14:24 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:14:24 2021 +0100 x86/PV: properly set shadow allocation for Dom0 Leaving shadow setup just to the L1TF tasklet means running Dom0 on a minimally acceptable shadow memory pool, rather than what normally would be used (also, for example, for PVH). Populate the pool before triggering the tasklet (or in preparation for L1TF checking logic to trigger it), on a best effort basis (again like done for PVH). Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/pv/dom0_build.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index de09ef5cae..6221630fc2 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1298,7 +1298,7 @@ int shadow_set_allocation(struct domain *d, unsigned int pages, bool *preempted) { struct page_info *sp; - ASSERT(paging_locked_by_me(d)); + ASSERT(paging_locked_by_me(d) || system_state < SYS_STATE_active); if ( pages > 0 ) { diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index cb68da75c1..e501979a86 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Allow ring-3 access in long mode as guest cannot use ring 1 ... */ #define BASE_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_USER) @@ -928,8 +929,22 @@ int __init dom0_construct_pv(struct domain *d, if ( d->domain_id == hardware_domid ) iommu_hwdom_init(d); - /* Activate shadow mode, if requested. Reuse the pv_l1tf tasklet. */ #ifdef CONFIG_SHADOW_PAGING + /* Fill the shadow pool if necessary. */ + if ( opt_dom0_shadow || opt_pv_l1tf_hwdom ) + { + bool preempted; + + nr_pt_pages = dom0_paging_pages(d, nr_pages); + + do { + preempted = false; + shadow_set_allocation(d, nr_pt_pages, &preempted); + process_pending_softirqs(); + } while ( preempted ); + } + + /* Activate shadow mode, if requested. Reuse the pv_l1tf tasklet. */ if ( opt_dom0_shadow ) { printk("Switching dom0 to using shadow paging\n"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237293.411534 (Exim 4.92) (envelope-from ) id 1mt5sS-00023n-0e; Fri, 03 Dec 2021 10:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237293.411534; Fri, 03 Dec 2021 10:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sR-00023g-Ty; Fri, 03 Dec 2021 10:33:15 +0000 Received: by outflank-mailman (input) for mailman id 237293; Fri, 03 Dec 2021 10:33:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sR-00023W-5r for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sR-0001zX-5B for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5sR-0006tB-3z for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=a7HSScvAKFY7LLfh4MM85sWBcJJnuhbm3NNbe39UZcw=; b=2M4XTyPwHmi27BliyYGTl9CPHX exSrNfzXewIaF64KwToHSsVerzMdlICXzH0XJss/0LqqSTFcXYPfn3p8fhsvT3+jydpl0hvJ0oP+0 jS2VMfq1i4Q2Q8ghfUS2brVF2SAVT0j7ZTrER6VhWovYVldJYDDs0Jld3y2pkpi9c1BQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: also dump stacks from show_execution_state() Message-Id: Date: Fri, 03 Dec 2021 10:33:15 +0000 commit adb715db698bc8ec3b88c24eb88b21e9da5b6c07 Author: Jan Beulich AuthorDate: Fri Dec 3 11:15:57 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:15:57 2021 +0100 x86/HVM: also dump stacks from show_execution_state() Wire up show_hvm_stack() also on this path. Move the show_guest_stack() invocation out of show_stack(), rendering dead the is-HVM check there. While separating guest and host paths, also move the show_code() invocation - the function bails immediately when guest_mode() returns "true". Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 35 +++++++++++++++++++++++++---------- xen/include/asm-x86/processor.h | 1 - 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 6d7d88c3c4..2ddcd95dce 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -306,10 +306,6 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) unsigned long mask = STACK_SIZE; void *stack_page = NULL; - /* Avoid HVM as we don't know what the stack looks like. */ - if ( is_hvm_vcpu(v) ) - return; - if ( is_pv_32bit_vcpu(v) ) { compat_show_guest_stack(v, regs, debug_stack_lines); @@ -618,14 +614,11 @@ static void show_trace(const struct cpu_user_regs *regs) printk("\n"); } -void show_stack(const struct cpu_user_regs *regs) +static void show_stack(const struct cpu_user_regs *regs) { unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), *stack_bottom, addr; int i; - if ( guest_mode(regs) ) - return show_guest_stack(current, regs); - printk("Xen stack trace from "__OP"sp=%p:\n ", stack); stack_bottom = _p(get_stack_dump_bottom(regs->rsp)); @@ -694,8 +687,30 @@ void show_execution_state(const struct cpu_user_regs *regs) unsigned long flags = console_lock_recursive_irqsave(); show_registers(regs); - show_code(regs); - show_stack(regs); + + if ( guest_mode(regs) ) + { + struct vcpu *curr = current; + + if ( is_hvm_vcpu(curr) ) + { + /* + * Stop interleaving prevention: The necessary P2M lookups + * involve locking, which has to occur with IRQs enabled. + */ + console_unlock_recursive_irqrestore(flags); + + show_hvm_stack(curr, regs); + return; + } + + show_guest_stack(curr, regs); + } + else + { + show_code(regs); + show_stack(regs); + } console_unlock_recursive_irqrestore(flags); } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index bc4dc69253..400b4fac5e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -493,7 +493,6 @@ static always_inline void rep_nop(void) #define cpu_relax() rep_nop() void show_code(const struct cpu_user_regs *regs); -void show_stack(const struct cpu_user_regs *regs); void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs); void show_registers(const struct cpu_user_regs *regs); void show_execution_state(const struct cpu_user_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:33:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:33:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237294.411538 (Exim 4.92) (envelope-from ) id 1mt5sd-000291-2U; Fri, 03 Dec 2021 10:33:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237294.411538; Fri, 03 Dec 2021 10:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sc-00028u-Vb; Fri, 03 Dec 2021 10:33:26 +0000 Received: by outflank-mailman (input) for mailman id 237294; Fri, 03 Dec 2021 10:33:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sb-00028X-9Q for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sb-0001zl-8n for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5sb-0006u2-7g for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=m5ZXi1cpqy0NfzLMJh4CtvgJ98cEhApmR5if7M509p8=; b=PbfGrW2pUbxMwDlDxilJws/PJ0 eaUXFwBd8GcJbfECSEOOy7rozfjbSbnVX/s1h0DDbTB3NvQnPfbGgcMAm9h05phYXk4e9NNpvYCGt wVIQm8+9/NYdVIeaem7jmQW+DR78nRdfLFrhILH91HnD2YQ2WIw60GdHHBozkeVk95Hk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: skip offline vCPU-s when dumping VMCBs/VMCSes Message-Id: Date: Fri, 03 Dec 2021 10:33:25 +0000 commit 3c42cc803c2163daa199021852224b9ca476e9c5 Author: Jan Beulich AuthorDate: Fri Dec 3 11:17:50 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:17:50 2021 +0100 x86/HVM: skip offline vCPU-s when dumping VMCBs/VMCSes There's not really any register state associated with vCPU-s that haven't been initialized yet, so avoid spamming the log with largely useless information while still leaving an indication of the fact. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/svm/vmcb.c | 5 +++++ xen/arch/x86/hvm/vmx/vmcs.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 565e997155..efa085032b 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -242,6 +242,11 @@ static void vmcb_dump(unsigned char ch) printk("\n>>> Domain %d <<<\n", d->domain_id); for_each_vcpu ( d, v ) { + if ( !v->is_initialised ) + { + printk("\tVCPU %u: not initialized\n", v->vcpu_id); + continue; + } printk("\tVCPU %d\n", v->vcpu_id); svm_vmcb_dump("key_handler", v->arch.hvm.svm.vmcb); } diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index f9f9bc18cd..7ab15e07a0 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -2133,6 +2133,11 @@ static void vmcs_dump(unsigned char ch) printk("\n>>> Domain %d <<<\n", d->domain_id); for_each_vcpu ( d, v ) { + if ( !v->is_initialised ) + { + printk("\tVCPU %u: not initialized\n", v->vcpu_id); + continue; + } printk("\tVCPU %d\n", v->vcpu_id); vmcs_dump_vcpu(v); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:33:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:33:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237295.411542 (Exim 4.92) (envelope-from ) id 1mt5sn-0002CK-3z; Fri, 03 Dec 2021 10:33:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237295.411542; Fri, 03 Dec 2021 10:33:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sn-0002CC-14; Fri, 03 Dec 2021 10:33:37 +0000 Received: by outflank-mailman (input) for mailman id 237295; Fri, 03 Dec 2021 10:33:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sl-0002Bp-Cm for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sl-0001zw-C3 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5sl-0006ug-B0 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yYQpRSn/Sn2K41vxT2vbL6AgTZ/UvKxcvLvhGe+pncY=; b=emKgKPJ1XJci1BP5dYrTiFYoCd OBWnbnkeUVoGwreiGuARewh4aG7AWcaG1nZfpDc1Df8zyPDb2JsAsBWfu3C0Jv5GlyVRY1e8frUWd R5EtPfs98me65jarKuybolmNcoaFpNQkZN95zTASenZBPCH6TJ0UfX5yF/Mh4qGLrxqA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: limit number of hypercall parameters to 5 Message-Id: Date: Fri, 03 Dec 2021 10:33:35 +0000 commit 2f531c122e957d56d214b4ba04856e6172772309 Author: Juergen Gross AuthorDate: Fri Dec 3 11:18:38 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:18:38 2021 +0100 x86: limit number of hypercall parameters to 5 Today there is no hypercall with more than 5 parameters, while the ABI allows up to 6 parameters. Especially for the X86 32-bit case using 6 parameters would require to run without frame pointer, which isn't very fortunate. Note that for Arm the limit is 5 parameters already. So limit the maximum number of parameters to 5 for x86, too. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hypercall.c | 28 ++++++++++------------------ xen/arch/x86/pv/hypercall.c | 22 ++++++++-------------- xen/common/trace.c | 2 +- xen/include/asm-x86/hypercall.h | 2 +- 4 files changed, 20 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 63bed52e40..1f04ffb272 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -239,10 +239,9 @@ int hvm_hypercall(struct cpu_user_regs *regs) unsigned long rdx = regs->rdx; unsigned long r10 = regs->r10; unsigned long r8 = regs->r8; - unsigned long r9 = regs->r9; - HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%lx, %lx, %lx, %lx, %lx, %lx)", - eax, rdi, rsi, rdx, r10, r8, r9); + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%lx, %lx, %lx, %lx, %lx)", + eax, rdi, rsi, rdx, r10, r8); #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -252,13 +251,11 @@ int hvm_hypercall(struct cpu_user_regs *regs) case 1: rsi = 0xdeadbeefdeadf00dUL; fallthrough; case 2: rdx = 0xdeadbeefdeadf00dUL; fallthrough; case 3: r10 = 0xdeadbeefdeadf00dUL; fallthrough; - case 4: r8 = 0xdeadbeefdeadf00dUL; fallthrough; - case 5: r9 = 0xdeadbeefdeadf00dUL; + case 4: r8 = 0xdeadbeefdeadf00dUL; } #endif - regs->rax = hvm_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8, - r9); + regs->rax = hvm_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8); #ifndef NDEBUG if ( !curr->hcall_preempted ) @@ -266,7 +263,6 @@ int hvm_hypercall(struct cpu_user_regs *regs) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].native ) { - case 6: regs->r9 = 0xdeadbeefdeadf00dUL; fallthrough; case 5: regs->r8 = 0xdeadbeefdeadf00dUL; fallthrough; case 4: regs->r10 = 0xdeadbeefdeadf00dUL; fallthrough; case 3: regs->rdx = 0xdeadbeefdeadf00dUL; fallthrough; @@ -283,10 +279,9 @@ int hvm_hypercall(struct cpu_user_regs *regs) unsigned int edx = regs->edx; unsigned int esi = regs->esi; unsigned int edi = regs->edi; - unsigned int ebp = regs->ebp; - HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%x, %x, %x, %x, %x, %x)", eax, - ebx, ecx, edx, esi, edi, ebp); + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%x, %x, %x, %x, %x)", eax, + ebx, ecx, edx, esi, edi); #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -296,14 +291,12 @@ int hvm_hypercall(struct cpu_user_regs *regs) case 1: ecx = 0xdeadf00d; fallthrough; case 2: edx = 0xdeadf00d; fallthrough; case 3: esi = 0xdeadf00d; fallthrough; - case 4: edi = 0xdeadf00d; fallthrough; - case 5: ebp = 0xdeadf00d; + case 4: edi = 0xdeadf00d; } #endif curr->hcall_compat = true; - regs->rax = hvm_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi, - ebp); + regs->rax = hvm_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi); curr->hcall_compat = false; #ifndef NDEBUG @@ -312,7 +305,6 @@ int hvm_hypercall(struct cpu_user_regs *regs) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].compat ) { - case 6: regs->rbp = 0xdeadf00d; fallthrough; case 5: regs->rdi = 0xdeadf00d; fallthrough; case 4: regs->rsi = 0xdeadf00d; fallthrough; case 3: regs->rdx = 0xdeadf00d; fallthrough; @@ -349,7 +341,7 @@ enum mc_disposition hvm_do_multicall_call(struct mc_state *state) func = array_access_nospec(hvm_hypercall_table, call->op).native; if ( func ) call->result = func(call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } @@ -361,7 +353,7 @@ enum mc_disposition hvm_do_multicall_call(struct mc_state *state) func = array_access_nospec(hvm_hypercall_table, call->op).compat; if ( func ) call->result = func(call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 3579ba905c..16a77e3a35 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -145,7 +145,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) unsigned long rdx = regs->rdx; unsigned long r10 = regs->r10; unsigned long r8 = regs->r8; - unsigned long r9 = regs->r9; #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -155,18 +154,17 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) case 1: rsi = 0xdeadbeefdeadf00dUL; fallthrough; case 2: rdx = 0xdeadbeefdeadf00dUL; fallthrough; case 3: r10 = 0xdeadbeefdeadf00dUL; fallthrough; - case 4: r8 = 0xdeadbeefdeadf00dUL; fallthrough; - case 5: r9 = 0xdeadbeefdeadf00dUL; + case 4: r8 = 0xdeadbeefdeadf00dUL; } #endif if ( unlikely(tb_init_done) ) { - unsigned long args[6] = { rdi, rsi, rdx, r10, r8, r9 }; + unsigned long args[5] = { rdi, rsi, rdx, r10, r8 }; __trace_hypercall(TRC_PV_HYPERCALL_V2, eax, args); } - regs->rax = pv_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8, r9); + regs->rax = pv_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8); #ifndef NDEBUG if ( !curr->hcall_preempted ) @@ -174,7 +172,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].native ) { - case 6: regs->r9 = 0xdeadbeefdeadf00dUL; fallthrough; case 5: regs->r8 = 0xdeadbeefdeadf00dUL; fallthrough; case 4: regs->r10 = 0xdeadbeefdeadf00dUL; fallthrough; case 3: regs->rdx = 0xdeadbeefdeadf00dUL; fallthrough; @@ -192,7 +189,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) unsigned int edx = regs->edx; unsigned int esi = regs->esi; unsigned int edi = regs->edi; - unsigned int ebp = regs->ebp; #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -202,20 +198,19 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) case 1: ecx = 0xdeadf00d; fallthrough; case 2: edx = 0xdeadf00d; fallthrough; case 3: esi = 0xdeadf00d; fallthrough; - case 4: edi = 0xdeadf00d; fallthrough; - case 5: ebp = 0xdeadf00d; + case 4: edi = 0xdeadf00d; } #endif if ( unlikely(tb_init_done) ) { - unsigned long args[6] = { ebx, ecx, edx, esi, edi, ebp }; + unsigned long args[5] = { ebx, ecx, edx, esi, edi }; __trace_hypercall(TRC_PV_HYPERCALL_V2, eax, args); } curr->hcall_compat = true; - regs->eax = pv_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi, ebp); + regs->eax = pv_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi); curr->hcall_compat = false; #ifndef NDEBUG @@ -224,7 +219,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].compat ) { - case 6: regs->ebp = 0xdeadf00d; fallthrough; case 5: regs->edi = 0xdeadf00d; fallthrough; case 4: regs->esi = 0xdeadf00d; fallthrough; case 3: regs->edx = 0xdeadf00d; fallthrough; @@ -262,7 +256,7 @@ enum mc_disposition pv_do_multicall_call(struct mc_state *state) pv_hypercall_table[op].compat ) call->result = pv_hypercall_table[op].compat( call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } @@ -276,7 +270,7 @@ enum mc_disposition pv_do_multicall_call(struct mc_state *state) pv_hypercall_table[op].native ) call->result = pv_hypercall_table[op].native( call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } diff --git a/xen/common/trace.c b/xen/common/trace.c index a2a389a1c7..61fecc2b2b 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -822,7 +822,7 @@ void __trace_hypercall(uint32_t event, unsigned long op, { struct { uint32_t op; - uint32_t args[6]; + uint32_t args[5]; } d; uint32_t *a = d.args; diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h index 0ae3b8b043..5d394d4923 100644 --- a/xen/include/asm-x86/hypercall.h +++ b/xen/include/asm-x86/hypercall.h @@ -13,7 +13,7 @@ typedef unsigned long hypercall_fn_t( unsigned long, unsigned long, unsigned long, - unsigned long, unsigned long, unsigned long); + unsigned long, unsigned long); typedef struct { hypercall_fn_t *native; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:33:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:33:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237297.411545 (Exim 4.92) (envelope-from ) id 1mt5sx-0002Gp-5X; Fri, 03 Dec 2021 10:33:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237297.411545; Fri, 03 Dec 2021 10:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sx-0002Gj-2d; Fri, 03 Dec 2021 10:33:47 +0000 Received: by outflank-mailman (input) for mailman id 237297; Fri, 03 Dec 2021 10:33:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sv-0002GH-GA for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5sv-000206-FR for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5sv-0006vP-EJ for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2aXU4F9LZ9mpbsjf7u5ngrWfr6JQJ4aE7Kn1TYigIMw=; b=dd/k7u4fRC2FkgowTliF9HKB7I 3oxKnYtKe0c+2KTUGpns4GvtVVxyjq7OooVOUfrX5Y0MzsvBrNbGSB/lupRLBOWWx+He/1Nu5mRov y4ckB/Z9rt0vLwlhuVFcNEiRqgukArC5WsM0IcBnMxTTYzwFmpKDDqhKyx9xTI2RJ3r8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Revert "domctl: improve locking during domain destruction" Message-Id: Date: Fri, 03 Dec 2021 10:33:45 +0000 commit d0887cc6b16e72829ac7e117bd65697463aabfe7 Author: Roger Pau Monné AuthorDate: Fri Dec 3 11:19:16 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:19:16 2021 +0100 Revert "domctl: improve locking during domain destruction" This reverts commit 228ab9992ffb1d8f9d2475f2581e68b2913acb88. Performance analysis has shown that dropping the domctl lock during domain destruction greatly increases the contention in the heap_lock, thus making parallel destruction of domains slower. The following lockperf data shows the difference between the current code and the reverted one: lock: 3342357(2.268295505s), block: 3263853(18.556650797s) lock: 2788704(0.362311723s), block: 222681( 0.091152276s) Those figures are from Dmitry Isaikin, and are gathered after destroying 5 2GB HVM guests in parallel: https://lists.xenproject.org/archives/html/xen-devel/2021-09/msg01515.html Given the current point in the release, revert the commit and reinstate holding the domctl lock during domain destruction. Further work should be done in order to re-add more fine grained locking to the domain destruction path once a proper solution to avoid the heap_lock contention is found. Reported-by: Hongyan Xia Reported-by: Dmitry Isaikin Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Acked-by: Julien Grall --- xen/common/domain.c | 12 ++---------- xen/common/domctl.c | 5 +---- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 56d47dd664..093bb4403f 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -917,21 +917,13 @@ int domain_kill(struct domain *d) if ( d == current->domain ) return -EINVAL; - /* Protected by d->domain_lock. */ + /* Protected by domctl_lock. */ switch ( d->is_dying ) { case DOMDYING_alive: - domain_unlock(d); domain_pause(d); - domain_lock(d); - /* - * With the domain lock dropped, d->is_dying may have changed. Call - * ourselves recursively if so, which is safe as then we won't come - * back here. - */ - if ( d->is_dying != DOMDYING_alive ) - return domain_kill(d); d->is_dying = DOMDYING_dying; + spin_barrier(&d->domain_lock); argo_destroy(d); vnuma_destroy(d->vnuma); domain_set_outstanding_pages(d, 0); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 271862ae58..879a2adcbe 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -497,14 +497,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_destroydomain: - domctl_lock_release(); - domain_lock(d); ret = domain_kill(d); - domain_unlock(d); if ( ret == -ERESTART ) ret = hypercall_create_continuation( __HYPERVISOR_domctl, "h", u_domctl); - goto domctl_out_unlock_domonly; + break; case XEN_DOMCTL_setnodeaffinity: { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:33:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:33:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237298.411550 (Exim 4.92) (envelope-from ) id 1mt5t7-0002Kg-8X; Fri, 03 Dec 2021 10:33:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237298.411550; Fri, 03 Dec 2021 10:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5t7-0002KY-5P; Fri, 03 Dec 2021 10:33:57 +0000 Received: by outflank-mailman (input) for mailman id 237298; Fri, 03 Dec 2021 10:33:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5t5-0002KK-JK for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5t5-00020G-IZ for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5t5-0006wD-Hb for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:33:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PstQmVg2uZvLdwnPFcg7HknJkiTNUFNHQ5dMqTvD2cM=; b=Y4zBmTyiOZRnyPbwsLwWPR9WNJ iebFQXAnp50leSR1/Lv4cTMBL+jZuFFXyC1FDhfZIpomNxxceBPlWVrdRcJev3u/w+tflzdfX4Bf/ stFv7cBqnzLS/wgbZoxHDP/f4iYgKAXRV0OV6lDVNQKkP3G8NF0qWYYkuEHPHOcCmYXU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: remove Josh from ARINC 653 maintainers Message-Id: Date: Fri, 03 Dec 2021 10:33:55 +0000 commit 5ecc5c30ef16bfed5e13e775adb8f59649d26e1a Author: Stewart Hildebrand AuthorDate: Fri Dec 3 11:19:49 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:19:49 2021 +0100 MAINTAINERS: remove Josh from ARINC 653 maintainers Josh works at another company now Signed-off-by: Stewart Hildebrand --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f67f70aed3..136f51ad5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,7 +221,6 @@ F: xen/include/xen/argo.h F: xen/common/argo.c ARINC653 SCHEDULER -M: Josh Whitehead M: Stewart Hildebrand S: Supported L: xen-devel@dornerworks.com -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:34:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:34:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237299.411554 (Exim 4.92) (envelope-from ) id 1mt5tH-0002Nl-AE; Fri, 03 Dec 2021 10:34:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237299.411554; Fri, 03 Dec 2021 10:34:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tH-0002Nd-6u; Fri, 03 Dec 2021 10:34:07 +0000 Received: by outflank-mailman (input) for mailman id 237299; Fri, 03 Dec 2021 10:34:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tF-0002NS-Mc for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tF-00020r-Lu for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5tF-0006x9-L1 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XSdmyGZk05KUyiRdNI2r7TvdC2A9Ek0IC75e+DQ2gSg=; b=l4+9VfzEeIwWOUn+5v/VrbeMxz c6XW4pUg+ZHm55fQ+sgaDl6J+LjcM8hxl7fCQFRUxh59svyHFZTFg2830FJ0hIWMutUkjgfRL340B BgvYbm27wVZ9U3+M/tysDktD3i//CVyWc3K5/LAXxliekpjNC7rZIOS9+/p1e9YCPUp8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vPMU: convert vendor hook invocations to altcall Message-Id: Date: Fri, 03 Dec 2021 10:34:05 +0000 commit d95cf9d6057cf3c65192fbc0bf6d334602ecb34b Author: Jan Beulich AuthorDate: Fri Dec 3 11:20:24 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:20:24 2021 +0100 x86/vPMU: convert vendor hook invocations to altcall At least some vPMU functions will be invoked (and hence can further be speculated into) even in the vPMU-disabled case. Convert vpmu_ops to the standard single-instance model being a prerequisite to engaging the alternative_call() machinery, and convert all respective calls. Note that this requires vpmu_init() to become a pre-SMP initcall. This change then also helps performance. To replace a few vpmu->arch_vpmu_ops NULL checks, introduce a new VPMU_INITIALIZED state, such that in the absence of any other suitable vmpu_is_set() checks this state can be checked for. While adding the inclusion of xen/err.h, also prune other xen/*.h inclusions. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/vpmu.c | 71 +++++++++++++++++++++---------------------- xen/arch/x86/cpu/vpmu_amd.c | 21 ++++++------- xen/arch/x86/cpu/vpmu_intel.c | 16 +++++----- xen/include/asm-x86/vpmu.h | 28 ++++++++--------- 4 files changed, 66 insertions(+), 70 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 16e91a3694..eacf12c480 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -17,12 +17,12 @@ * * Author: Haitao Shan */ -#include -#include -#include -#include #include +#include #include +#include +#include +#include #include #include #include @@ -49,6 +49,7 @@ CHECK_pmu_params; static unsigned int __read_mostly opt_vpmu_enabled; unsigned int __read_mostly vpmu_mode = XENPMU_MODE_OFF; unsigned int __read_mostly vpmu_features = 0; +static struct arch_vpmu_ops __read_mostly vpmu_ops; static DEFINE_SPINLOCK(vpmu_lock); static unsigned vpmu_count; @@ -120,7 +121,6 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, { struct vcpu *curr = current; struct vpmu_struct *vpmu; - const struct arch_vpmu_ops *ops; int ret = 0; /* @@ -133,14 +133,13 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, goto nop; vpmu = vcpu_vpmu(curr); - ops = vpmu->arch_vpmu_ops; - if ( !ops ) + if ( !vpmu_is_set(vpmu, VPMU_INITIALIZED) ) goto nop; - if ( is_write && ops->do_wrmsr ) - ret = ops->do_wrmsr(msr, *msr_content, supported); - else if ( !is_write && ops->do_rdmsr ) - ret = ops->do_rdmsr(msr, msr_content); + if ( is_write && vpmu_ops.do_wrmsr ) + ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content, supported); + else if ( !is_write && vpmu_ops.do_rdmsr ) + ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); else goto nop; @@ -153,7 +152,7 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, vpmu_is_set(vpmu, VPMU_CACHED) ) { vpmu_set(vpmu, VPMU_CONTEXT_SAVE); - ops->arch_vpmu_save(curr, 0); + alternative_vcall(vpmu_ops.arch_vpmu_save, curr, 0); vpmu_reset(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); } @@ -202,7 +201,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) sampling = sampled; vpmu = vcpu_vpmu(sampling); - if ( !vpmu->arch_vpmu_ops ) + if ( !vpmu_is_set(vpmu, VPMU_INITIALIZED) ) return; /* PV(H) guest */ @@ -220,7 +219,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) /* PV guest will be reading PMU MSRs from xenpmu_data */ vpmu_set(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); - vpmu->arch_vpmu_ops->arch_vpmu_save(sampling, 1); + alternative_vcall(vpmu_ops.arch_vpmu_save, sampling, 1); vpmu_reset(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); if ( is_hvm_vcpu(sampled) ) @@ -321,7 +320,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) /* We don't support (yet) HVM dom0 */ ASSERT(sampling == sampled); - if ( !vpmu->arch_vpmu_ops->do_interrupt(regs) || + if ( !alternative_call(vpmu_ops.do_interrupt, regs) || !is_vlapic_lvtpc_enabled(vlapic) ) return; @@ -349,8 +348,7 @@ static void vpmu_save_force(void *arg) vpmu_set(vpmu, VPMU_CONTEXT_SAVE); - if ( vpmu->arch_vpmu_ops ) - (void)vpmu->arch_vpmu_ops->arch_vpmu_save(v, 0); + alternative_vcall(vpmu_ops.arch_vpmu_save, v, 0); vpmu_reset(vpmu, VPMU_CONTEXT_SAVE); @@ -368,9 +366,8 @@ void vpmu_save(struct vcpu *v) vpmu->last_pcpu = pcpu; per_cpu(last_vcpu, pcpu) = v; - if ( vpmu->arch_vpmu_ops ) - if ( vpmu->arch_vpmu_ops->arch_vpmu_save(v, 0) ) - vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); + if ( alternative_call(vpmu_ops.arch_vpmu_save, v, 0) ) + vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); apic_write(APIC_LVTPC, PMU_APIC_VECTOR | APIC_LVT_MASKED); } @@ -426,13 +423,13 @@ int vpmu_load(struct vcpu *v, bool_t from_guest) vpmu_is_set(vpmu, VPMU_CACHED)) ) return 0; - if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_load ) + if ( vpmu_ops.arch_vpmu_load ) { int ret; apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); /* Arch code needs to set VPMU_CONTEXT_LOADED */ - ret = vpmu->arch_vpmu_ops->arch_vpmu_load(v, from_guest); + ret = alternative_call(vpmu_ops.arch_vpmu_load, v, from_guest); if ( ret ) { apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); @@ -572,7 +569,7 @@ static void vpmu_arch_destroy(struct vcpu *v) on_selected_cpus(cpumask_of(vpmu->last_pcpu), vpmu_clear_last, v, 1); - if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) + if ( vpmu_ops.arch_vpmu_destroy ) { /* * Unload VPMU first if VPMU_CONTEXT_LOADED being set. @@ -582,7 +579,7 @@ static void vpmu_arch_destroy(struct vcpu *v) on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), vpmu_save_force, v, 1); - vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); + alternative_vcall(vpmu_ops.arch_vpmu_destroy, v); } vpmu_reset(vpmu, VPMU_CONTEXT_ALLOCATED); @@ -689,10 +686,9 @@ static void pvpmu_finish(struct domain *d, xen_pmu_params_t *params) /* Dump some vpmu information to console. Used in keyhandler dump_domains(). */ void vpmu_dump(struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); - - if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_dump ) - vpmu->arch_vpmu_ops->arch_vpmu_dump(v); + if ( vpmu_is_set(vcpu_vpmu(v), VPMU_INITIALIZED) && + vpmu_ops.arch_vpmu_dump ) + alternative_vcall(vpmu_ops.arch_vpmu_dump, v); } long do_xenpmu_op(unsigned int op, XEN_GUEST_HANDLE_PARAM(xen_pmu_params_t) arg) @@ -870,6 +866,7 @@ static struct notifier_block cpu_nfb = { static int __init vpmu_init(void) { int vendor = current_cpu_data.x86_vendor; + const struct arch_vpmu_ops *ops = NULL; if ( !opt_vpmu_enabled ) return 0; @@ -886,36 +883,36 @@ static int __init vpmu_init(void) switch ( vendor ) { case X86_VENDOR_AMD: - if ( amd_vpmu_init() ) - vpmu_mode = XENPMU_MODE_OFF; + ops = amd_vpmu_init(); break; case X86_VENDOR_HYGON: - if ( hygon_vpmu_init() ) - vpmu_mode = XENPMU_MODE_OFF; + ops = hygon_vpmu_init(); break; case X86_VENDOR_INTEL: - if ( core2_vpmu_init() ) - vpmu_mode = XENPMU_MODE_OFF; + ops = core2_vpmu_init(); break; default: printk(XENLOG_WARNING "VPMU: Unknown CPU vendor: %d. " "Turning VPMU off.\n", vendor); - vpmu_mode = XENPMU_MODE_OFF; break; } - if ( vpmu_mode != XENPMU_MODE_OFF ) + if ( !IS_ERR_OR_NULL(ops) ) { + vpmu_ops = *ops; register_cpu_notifier(&cpu_nfb); printk(XENLOG_INFO "VPMU: version " __stringify(XENPMU_VER_MAJ) "." __stringify(XENPMU_VER_MIN) "\n"); } else + { + vpmu_mode = XENPMU_MODE_OFF; opt_vpmu_enabled = 0; + } return 0; } -__initcall(vpmu_init); +presmp_initcall(vpmu_init); diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 38972089ab..629a55f411 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -21,9 +21,9 @@ * */ -#include +#include #include -#include +#include #include #include #include @@ -483,7 +483,7 @@ static void amd_vpmu_dump(const struct vcpu *v) } } -static const struct arch_vpmu_ops amd_vpmu_ops = { +static const struct arch_vpmu_ops __initconstrel amd_vpmu_ops = { .do_wrmsr = amd_vpmu_do_wrmsr, .do_rdmsr = amd_vpmu_do_rdmsr, .do_interrupt = amd_vpmu_do_interrupt, @@ -529,13 +529,12 @@ int svm_vpmu_initialise(struct vcpu *v) offsetof(struct xen_pmu_amd_ctxt, regs)); } - vpmu->arch_vpmu_ops = &amd_vpmu_ops; + vpmu_set(vpmu, VPMU_INITIALIZED | VPMU_CONTEXT_ALLOCATED); - vpmu_set(vpmu, VPMU_CONTEXT_ALLOCATED); return 0; } -static int __init common_init(void) +static const struct arch_vpmu_ops *__init common_init(void) { unsigned int i; @@ -543,7 +542,7 @@ static int __init common_init(void) { printk(XENLOG_WARNING "VPMU: Unsupported CPU family %#x\n", current_cpu_data.x86); - return -EINVAL; + return ERR_PTR(-EINVAL); } if ( sizeof(struct xen_pmu_data) + @@ -553,7 +552,7 @@ static int __init common_init(void) "VPMU: Register bank does not fit into VPMU shared page\n"); counters = ctrls = NULL; num_counters = 0; - return -ENOSPC; + return ERR_PTR(-ENOSPC); } for ( i = 0; i < num_counters; i++ ) @@ -562,10 +561,10 @@ static int __init common_init(void) ctrl_rsvd[i] &= CTRL_RSVD_MASK; } - return 0; + return &amd_vpmu_ops; } -int __init amd_vpmu_init(void) +const struct arch_vpmu_ops *__init amd_vpmu_init(void) { switch ( current_cpu_data.x86 ) { @@ -592,7 +591,7 @@ int __init amd_vpmu_init(void) return common_init(); } -int __init hygon_vpmu_init(void) +const struct arch_vpmu_ops *__init hygon_vpmu_init(void) { switch ( current_cpu_data.x86 ) { diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index f59cae5438..75d6689984 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -18,9 +18,9 @@ * Author: Haitao Shan */ +#include #include #include -#include #include #include #include @@ -819,7 +819,7 @@ static void core2_vpmu_destroy(struct vcpu *v) vpmu_clear(vpmu); } -static const struct arch_vpmu_ops core2_vpmu_ops = { +static const struct arch_vpmu_ops __initconstrel core2_vpmu_ops = { .do_wrmsr = core2_vpmu_do_wrmsr, .do_rdmsr = core2_vpmu_do_rdmsr, .do_interrupt = core2_vpmu_do_interrupt, @@ -893,12 +893,12 @@ int vmx_vpmu_initialise(struct vcpu *v) if ( is_pv_vcpu(v) && !core2_vpmu_alloc_resource(v) ) return -EIO; - vpmu->arch_vpmu_ops = &core2_vpmu_ops; + vpmu_set(vpmu, VPMU_INITIALIZED); return 0; } -int __init core2_vpmu_init(void) +const struct arch_vpmu_ops *__init core2_vpmu_init(void) { unsigned int version = 0; unsigned int i; @@ -921,13 +921,13 @@ int __init core2_vpmu_init(void) default: printk(XENLOG_WARNING "VPMU: PMU version %u is not supported\n", version); - return -EINVAL; + return ERR_PTR(-EINVAL); } if ( current_cpu_data.x86 != 6 ) { printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); - return -EINVAL; + return ERR_PTR(-EINVAL); } arch_pmc_cnt = core2_get_arch_pmc_count(); @@ -972,9 +972,9 @@ int __init core2_vpmu_init(void) printk(XENLOG_WARNING "VPMU: Register bank does not fit into VPMU share page\n"); arch_pmc_cnt = fixed_pmc_cnt = 0; - return -ENOSPC; + return ERR_PTR(-ENOSPC); } - return 0; + return &core2_vpmu_ops; } diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h index 4b0a6ba3da..aca143c151 100644 --- a/xen/include/asm-x86/vpmu.h +++ b/xen/include/asm-x86/vpmu.h @@ -49,10 +49,10 @@ struct arch_vpmu_ops { void (*arch_vpmu_dump)(const struct vcpu *); }; -int core2_vpmu_init(void); +const struct arch_vpmu_ops *core2_vpmu_init(void); int vmx_vpmu_initialise(struct vcpu *); -int amd_vpmu_init(void); -int hygon_vpmu_init(void); +const struct arch_vpmu_ops *amd_vpmu_init(void); +const struct arch_vpmu_ops *hygon_vpmu_init(void); int svm_vpmu_initialise(struct vcpu *); struct vpmu_struct { @@ -61,25 +61,25 @@ struct vpmu_struct { u32 hw_lapic_lvtpc; void *context; /* May be shared with PV guest */ void *priv_context; /* hypervisor-only */ - const struct arch_vpmu_ops *arch_vpmu_ops; struct xen_pmu_data *xenpmu_data; spinlock_t vpmu_lock; }; /* VPMU states */ -#define VPMU_CONTEXT_ALLOCATED 0x1 -#define VPMU_CONTEXT_LOADED 0x2 -#define VPMU_RUNNING 0x4 -#define VPMU_CONTEXT_SAVE 0x8 /* Force context save */ -#define VPMU_FROZEN 0x10 /* Stop counters while VCPU is not running */ -#define VPMU_PASSIVE_DOMAIN_ALLOCATED 0x20 +#define VPMU_INITIALIZED 0x0001 +#define VPMU_CONTEXT_ALLOCATED 0x0002 +#define VPMU_CONTEXT_LOADED 0x0004 +#define VPMU_RUNNING 0x0008 +#define VPMU_CONTEXT_SAVE 0x0010 /* Force context save */ +#define VPMU_FROZEN 0x0020 /* Stop counters while VCPU is not running */ +#define VPMU_PASSIVE_DOMAIN_ALLOCATED 0x0040 /* PV(H) guests: VPMU registers are accessed by guest from shared page */ -#define VPMU_CACHED 0x40 -#define VPMU_AVAILABLE 0x80 +#define VPMU_CACHED 0x0080 +#define VPMU_AVAILABLE 0x0100 /* Intel-specific VPMU features */ -#define VPMU_CPU_HAS_DS 0x100 /* Has Debug Store */ -#define VPMU_CPU_HAS_BTS 0x200 /* Has Branch Trace Store */ +#define VPMU_CPU_HAS_DS 0x1000 /* Has Debug Store */ +#define VPMU_CPU_HAS_BTS 0x2000 /* Has Branch Trace Store */ static inline void vpmu_set(struct vpmu_struct *vpmu, const u32 mask) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:34:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:34:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237300.411559 (Exim 4.92) (envelope-from ) id 1mt5tR-0002R7-CI; Fri, 03 Dec 2021 10:34:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237300.411559; Fri, 03 Dec 2021 10:34:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tR-0002Qz-8Y; Fri, 03 Dec 2021 10:34:17 +0000 Received: by outflank-mailman (input) for mailman id 237300; Fri, 03 Dec 2021 10:34:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tP-0002Qj-Pw for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tP-00021H-PJ for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5tP-0006xu-OI for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oZ0aijlm88/CARRMoEXBdrm0F+dO3GWhD5S1CNklXvQ=; b=Mt6YBW4Uud3xLZXDAqciFfLYaM XO8x9iGyFf381UEGs/d7iIZ5HBUUmCKxSdZ5SuJQQvCO4FvddL5y5d/FkhpL9OJCVIDKRIWcew4pZ e5AzMWdaKWP+ySEdcDzH5E0oDG9M5UIfjzRE9fyKtcd4UZHJGSU7wXXpdGjgUBXDzh34=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vPMU: invoke _vpmu_initialise() through a hook as well Message-Id: Date: Fri, 03 Dec 2021 10:34:15 +0000 commit 8c20aca6751bf40f2d385f79d702813eb6a3cb27 Author: Jan Beulich AuthorDate: Fri Dec 3 11:21:14 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:21:14 2021 +0100 x86/vPMU: invoke _vpmu_initialise() through a hook as well I see little point in having an open-coded switch() statement to achieve the same; like other vendor-specific operations the function can be supplied in the respective ops structure instances. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/vpmu.c | 25 ++++++++++--------------- xen/arch/x86/cpu/vpmu_amd.c | 28 +++++++++++++--------------- xen/arch/x86/cpu/vpmu_intel.c | 28 ++++++++++++---------------- xen/include/asm-x86/vpmu.h | 3 +-- 4 files changed, 36 insertions(+), 48 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index eacf12c480..64a8f45c16 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -455,21 +455,11 @@ static int vpmu_arch_initialise(struct vcpu *v) ASSERT(!(vpmu->flags & ~VPMU_AVAILABLE) && !vpmu->context); - if ( !vpmu_available(v) ) + if ( !vpmu_available(v) || vpmu_mode == XENPMU_MODE_OFF ) return 0; - switch ( vendor ) + if ( !vpmu_ops.initialise ) { - case X86_VENDOR_AMD: - case X86_VENDOR_HYGON: - ret = svm_vpmu_initialise(v); - break; - - case X86_VENDOR_INTEL: - ret = vmx_vpmu_initialise(v); - break; - - default: if ( vpmu_mode != XENPMU_MODE_OFF ) { printk(XENLOG_G_WARNING "VPMU: Unknown CPU vendor %d. " @@ -480,12 +470,17 @@ static int vpmu_arch_initialise(struct vcpu *v) return -EINVAL; } - vpmu->hw_lapic_lvtpc = PMU_APIC_VECTOR | APIC_LVT_MASKED; - + ret = alternative_call(vpmu_ops.initialise, v); if ( ret ) + { printk(XENLOG_G_WARNING "VPMU: Initialization failed for %pv\n", v); + return ret; + } - return ret; + vpmu->hw_lapic_lvtpc = PMU_APIC_VECTOR | APIC_LVT_MASKED; + vpmu_set(vpmu, VPMU_INITIALIZED); + + return 0; } static void get_vpmu(struct vcpu *v) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 629a55f411..5bb4227662 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -483,24 +483,11 @@ static void amd_vpmu_dump(const struct vcpu *v) } } -static const struct arch_vpmu_ops __initconstrel amd_vpmu_ops = { - .do_wrmsr = amd_vpmu_do_wrmsr, - .do_rdmsr = amd_vpmu_do_rdmsr, - .do_interrupt = amd_vpmu_do_interrupt, - .arch_vpmu_destroy = amd_vpmu_destroy, - .arch_vpmu_save = amd_vpmu_save, - .arch_vpmu_load = amd_vpmu_load, - .arch_vpmu_dump = amd_vpmu_dump -}; - -int svm_vpmu_initialise(struct vcpu *v) +static int svm_vpmu_initialise(struct vcpu *v) { struct xen_pmu_amd_ctxt *ctxt; struct vpmu_struct *vpmu = vcpu_vpmu(v); - if ( vpmu_mode == XENPMU_MODE_OFF ) - return 0; - if ( !counters ) return -EINVAL; @@ -529,11 +516,22 @@ int svm_vpmu_initialise(struct vcpu *v) offsetof(struct xen_pmu_amd_ctxt, regs)); } - vpmu_set(vpmu, VPMU_INITIALIZED | VPMU_CONTEXT_ALLOCATED); + vpmu_set(vpmu, VPMU_CONTEXT_ALLOCATED); return 0; } +static const struct arch_vpmu_ops __initconstrel amd_vpmu_ops = { + .initialise = svm_vpmu_initialise, + .do_wrmsr = amd_vpmu_do_wrmsr, + .do_rdmsr = amd_vpmu_do_rdmsr, + .do_interrupt = amd_vpmu_do_interrupt, + .arch_vpmu_destroy = amd_vpmu_destroy, + .arch_vpmu_save = amd_vpmu_save, + .arch_vpmu_load = amd_vpmu_load, + .arch_vpmu_dump = amd_vpmu_dump, +}; + static const struct arch_vpmu_ops *__init common_init(void) { unsigned int i; diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 75d6689984..c44e81c756 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -819,25 +819,12 @@ static void core2_vpmu_destroy(struct vcpu *v) vpmu_clear(vpmu); } -static const struct arch_vpmu_ops __initconstrel core2_vpmu_ops = { - .do_wrmsr = core2_vpmu_do_wrmsr, - .do_rdmsr = core2_vpmu_do_rdmsr, - .do_interrupt = core2_vpmu_do_interrupt, - .arch_vpmu_destroy = core2_vpmu_destroy, - .arch_vpmu_save = core2_vpmu_save, - .arch_vpmu_load = core2_vpmu_load, - .arch_vpmu_dump = core2_vpmu_dump -}; - -int vmx_vpmu_initialise(struct vcpu *v) +static int vmx_vpmu_initialise(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); u64 msr_content; static bool_t ds_warned; - if ( vpmu_mode == XENPMU_MODE_OFF ) - return 0; - if ( v->domain->arch.cpuid->basic.pmu_version <= 1 || v->domain->arch.cpuid->basic.pmu_version >= 6 ) return -EINVAL; @@ -893,11 +880,20 @@ int vmx_vpmu_initialise(struct vcpu *v) if ( is_pv_vcpu(v) && !core2_vpmu_alloc_resource(v) ) return -EIO; - vpmu_set(vpmu, VPMU_INITIALIZED); - return 0; } +static const struct arch_vpmu_ops __initconstrel core2_vpmu_ops = { + .initialise = vmx_vpmu_initialise, + .do_wrmsr = core2_vpmu_do_wrmsr, + .do_rdmsr = core2_vpmu_do_rdmsr, + .do_interrupt = core2_vpmu_do_interrupt, + .arch_vpmu_destroy = core2_vpmu_destroy, + .arch_vpmu_save = core2_vpmu_save, + .arch_vpmu_load = core2_vpmu_load, + .arch_vpmu_dump = core2_vpmu_dump, +}; + const struct arch_vpmu_ops *__init core2_vpmu_init(void) { unsigned int version = 0; diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h index aca143c151..8cfa2cf599 100644 --- a/xen/include/asm-x86/vpmu.h +++ b/xen/include/asm-x86/vpmu.h @@ -39,6 +39,7 @@ /* Arch specific operations shared by all vpmus */ struct arch_vpmu_ops { + int (*initialise)(struct vcpu *v); int (*do_wrmsr)(unsigned int msr, uint64_t msr_content, uint64_t supported); int (*do_rdmsr)(unsigned int msr, uint64_t *msr_content); @@ -50,10 +51,8 @@ struct arch_vpmu_ops { }; const struct arch_vpmu_ops *core2_vpmu_init(void); -int vmx_vpmu_initialise(struct vcpu *); const struct arch_vpmu_ops *amd_vpmu_init(void); const struct arch_vpmu_ops *hygon_vpmu_init(void); -int svm_vpmu_initialise(struct vcpu *); struct vpmu_struct { u32 flags; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:34:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:34:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237301.411562 (Exim 4.92) (envelope-from ) id 1mt5tb-0002Tz-DH; Fri, 03 Dec 2021 10:34:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237301.411562; Fri, 03 Dec 2021 10:34:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tb-0002Tr-AC; Fri, 03 Dec 2021 10:34:27 +0000 Received: by outflank-mailman (input) for mailman id 237301; Fri, 03 Dec 2021 10:34:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tZ-0002TT-T3 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt5tZ-00021L-SO for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt5tZ-0006z3-RS for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:34:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iytiOzX1MeIpDq5s1FWQUBjHoIY0KSwX6ymfYCy9Oxs=; b=lOzhoxVwKWsYgQfvBrC6NpHB/m RR931uSCb0hewEl3obkCZX2sLvVXU5uMhsicXP5uiiMfRvtrr5jNNHj3bIPXUn305epwj7lBuZDdR ml4exiZf0r2ahrqbsJo3pKKZphHpf8mPVofqEoe1cW3A79eLRSkUs+1IAn+Hu6tVVEAs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vPMU: move vpmu_ops to .init.data Message-Id: Date: Fri, 03 Dec 2021 10:34:25 +0000 commit 75a16d4c5f16c611687a4460dfae23909588f3fa Author: Jan Beulich AuthorDate: Fri Dec 3 11:22:03 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:22:03 2021 +0100 x86/vPMU: move vpmu_ops to .init.data Both vendors' code populates all hooks, so there's no need to have any NULL checks before invoking the hook functions. With that the only remaining uses of the object are in alternative_{,v}call(), i.e. none after alternatives patching. In vpmu_arch_initialise() the check gets replaced by an opt_vpmu_enabled one, as I couldn't convince myself that the pre-existing checks would be sufficient to cover all possible cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/vpmu.c | 54 ++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 64a8f45c16..7fd69a2a58 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -49,7 +49,7 @@ CHECK_pmu_params; static unsigned int __read_mostly opt_vpmu_enabled; unsigned int __read_mostly vpmu_mode = XENPMU_MODE_OFF; unsigned int __read_mostly vpmu_features = 0; -static struct arch_vpmu_ops __read_mostly vpmu_ops; +static struct arch_vpmu_ops __initdata vpmu_ops; static DEFINE_SPINLOCK(vpmu_lock); static unsigned vpmu_count; @@ -136,12 +136,10 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, if ( !vpmu_is_set(vpmu, VPMU_INITIALIZED) ) goto nop; - if ( is_write && vpmu_ops.do_wrmsr ) + if ( is_write ) ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content, supported); - else if ( !is_write && vpmu_ops.do_rdmsr ) - ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); else - goto nop; + ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); /* * We may have received a PMU interrupt while handling MSR access @@ -375,7 +373,7 @@ void vpmu_save(struct vcpu *v) int vpmu_load(struct vcpu *v, bool_t from_guest) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - int pcpu = smp_processor_id(); + int pcpu = smp_processor_id(), ret; struct vcpu *prev = NULL; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) @@ -423,21 +421,13 @@ int vpmu_load(struct vcpu *v, bool_t from_guest) vpmu_is_set(vpmu, VPMU_CACHED)) ) return 0; - if ( vpmu_ops.arch_vpmu_load ) - { - int ret; - - apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); - /* Arch code needs to set VPMU_CONTEXT_LOADED */ - ret = alternative_call(vpmu_ops.arch_vpmu_load, v, from_guest); - if ( ret ) - { - apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); - return ret; - } - } + apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); + /* Arch code needs to set VPMU_CONTEXT_LOADED */ + ret = alternative_call(vpmu_ops.arch_vpmu_load, v, from_guest); + if ( ret ) + apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); - return 0; + return ret; } static int vpmu_arch_initialise(struct vcpu *v) @@ -458,7 +448,7 @@ static int vpmu_arch_initialise(struct vcpu *v) if ( !vpmu_available(v) || vpmu_mode == XENPMU_MODE_OFF ) return 0; - if ( !vpmu_ops.initialise ) + if ( !opt_vpmu_enabled ) { if ( vpmu_mode != XENPMU_MODE_OFF ) { @@ -564,18 +554,15 @@ static void vpmu_arch_destroy(struct vcpu *v) on_selected_cpus(cpumask_of(vpmu->last_pcpu), vpmu_clear_last, v, 1); - if ( vpmu_ops.arch_vpmu_destroy ) - { - /* - * Unload VPMU first if VPMU_CONTEXT_LOADED being set. - * This will stop counters. - */ - if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) - on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), - vpmu_save_force, v, 1); + /* + * Unload VPMU first if VPMU_CONTEXT_LOADED being set. + * This will stop counters. + */ + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) + on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), + vpmu_save_force, v, 1); - alternative_vcall(vpmu_ops.arch_vpmu_destroy, v); - } + alternative_vcall(vpmu_ops.arch_vpmu_destroy, v); vpmu_reset(vpmu, VPMU_CONTEXT_ALLOCATED); } @@ -681,8 +668,7 @@ static void pvpmu_finish(struct domain *d, xen_pmu_params_t *params) /* Dump some vpmu information to console. Used in keyhandler dump_domains(). */ void vpmu_dump(struct vcpu *v) { - if ( vpmu_is_set(vcpu_vpmu(v), VPMU_INITIALIZED) && - vpmu_ops.arch_vpmu_dump ) + if ( vpmu_is_set(vcpu_vpmu(v), VPMU_INITIALIZED) ) alternative_vcall(vpmu_ops.arch_vpmu_dump, v); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:44:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237312.411580 (Exim 4.92) (envelope-from ) id 1mt62w-0004GL-JD; Fri, 03 Dec 2021 10:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237312.411580; Fri, 03 Dec 2021 10:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt62w-0004GD-GB; Fri, 03 Dec 2021 10:44:06 +0000 Received: by outflank-mailman (input) for mailman id 237312; Fri, 03 Dec 2021 10:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt62v-0004G7-Gh for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt62v-0002BL-Fv for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt62v-0007tW-En for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PlkdBrWg77dw67V3dBT60MBGSvOQXJu/o0SZ1v5bi/w=; b=ojfPkb/RKg05RtWWCSK5YS5Fz/ Riq/o5j7y5JQSBzZB2ADv/vHS0hN3inghP9GP550Z155vukqlQ+PbGjSUyRuMP5u4XErZVp+NDqzG oqHsOdRypYhPlky9eAnz/maKl79QjVLSl7uv4Z1e2aw6/TK5rrYZBk/ssQD0nF/iG1uE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: tidy domid map handling Message-Id: Date: Fri, 03 Dec 2021 10:44:05 +0000 commit bbcea43d830bdc85bf5a6c1b6b8041bd2b607454 Author: Jan Beulich AuthorDate: Fri Dec 3 11:33:43 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:33:43 2021 +0100 VT-d: tidy domid map handling - Correct struct field type. - Use unsigned int when that suffices. - Eliminate a (badly typed) local variable from context_set_domain_id(). - Don't use -EFAULT inappropriately. - Move set_bit() such that it won't be done redundantly. - Constification. - Reduce scope of some variables. - Coding style. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 52 ++++++++++++++++--------------------- xen/drivers/passthrough/vtd/iommu.h | 2 +- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index b33697e36b..2ddee7357b 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -62,10 +62,10 @@ static struct tasklet vtd_fault_tasklet; static int setup_hwdom_device(u8 devfn, struct pci_dev *); static void setup_hwdom_rmrr(struct domain *d); -static int domain_iommu_domid(struct domain *d, - struct vtd_iommu *iommu) +static int domain_iommu_domid(const struct domain *d, + const struct vtd_iommu *iommu) { - unsigned long nr_dom, i; + unsigned int nr_dom, i; nr_dom = cap_ndoms(iommu->cap); i = find_first_bit(iommu->domid_bitmap, nr_dom); @@ -74,7 +74,7 @@ static int domain_iommu_domid(struct domain *d, if ( iommu->domid_map[i] == d->domain_id ) return i; - i = find_next_bit(iommu->domid_bitmap, nr_dom, i+1); + i = find_next_bit(iommu->domid_bitmap, nr_dom, i + 1); } if ( !d->is_dying ) @@ -88,61 +88,52 @@ static int domain_iommu_domid(struct domain *d, #define DID_FIELD_WIDTH 16 #define DID_HIGH_OFFSET 8 static int context_set_domain_id(struct context_entry *context, - struct domain *d, + const struct domain *d, struct vtd_iommu *iommu) { - unsigned long nr_dom, i; - int found = 0; + unsigned int nr_dom, i; ASSERT(spin_is_locked(&iommu->lock)); nr_dom = cap_ndoms(iommu->cap); i = find_first_bit(iommu->domid_bitmap, nr_dom); - while ( i < nr_dom ) - { - if ( iommu->domid_map[i] == d->domain_id ) - { - found = 1; - break; - } - i = find_next_bit(iommu->domid_bitmap, nr_dom, i+1); - } + while ( i < nr_dom && iommu->domid_map[i] != d->domain_id ) + i = find_next_bit(iommu->domid_bitmap, nr_dom, i + 1); - if ( found == 0 ) + if ( i >= nr_dom ) { i = find_first_zero_bit(iommu->domid_bitmap, nr_dom); if ( i >= nr_dom ) { dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: no free domain ids\n"); - return -EFAULT; + return -EBUSY; } iommu->domid_map[i] = d->domain_id; + set_bit(i, iommu->domid_bitmap); } - set_bit(i, iommu->domid_bitmap); context->hi |= (i & ((1 << DID_FIELD_WIDTH) - 1)) << DID_HIGH_OFFSET; return 0; } -static int context_get_domain_id(struct context_entry *context, - struct vtd_iommu *iommu) +static int context_get_domain_id(const struct context_entry *context, + const struct vtd_iommu *iommu) { - unsigned long dom_index, nr_dom; int domid = -1; - if (iommu && context) + if ( iommu && context ) { - nr_dom = cap_ndoms(iommu->cap); - - dom_index = context_domain_id(*context); + unsigned int nr_dom = cap_ndoms(iommu->cap); + unsigned int dom_index = context_domain_id(*context); if ( dom_index < nr_dom && iommu->domid_map ) domid = iommu->domid_map[dom_index]; else dprintk(XENLOG_DEBUG VTDPREFIX, - "dom_index %lu exceeds nr_dom %lu or iommu has no domid_map\n", + "dom_index %u exceeds nr_dom %u or iommu has no domid_map\n", dom_index, nr_dom); } + return domid; } @@ -1303,7 +1294,7 @@ int __init iommu_alloc(struct acpi_drhd_unit *drhd) if ( !iommu->domid_bitmap ) return -ENOMEM; - iommu->domid_map = xzalloc_array(u16, nr_dom); + iommu->domid_map = xzalloc_array(domid_t, nr_dom); if ( !iommu->domid_map ) return -ENOMEM; @@ -1478,11 +1469,12 @@ int domain_context_mapping_one( spin_unlock(&hd->arch.mapping_lock); } - if ( context_set_domain_id(context, domain, iommu) ) + rc = context_set_domain_id(context, domain, iommu); + if ( rc ) { spin_unlock(&iommu->lock); unmap_vtd_domain_page(context_entries); - return -EFAULT; + return rc; } context_set_address_width(*context, level_to_agaw(iommu->nr_pt_levels)); diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index b993f0cf08..07501dda4e 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -500,7 +500,7 @@ struct vtd_iommu { struct list_head ats_devices; unsigned long *domid_bitmap; /* domain id bitmap */ - u16 *domid_map; /* domain id mapping array */ + domid_t *domid_map; /* domain id mapping array */ uint32_t version; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237313.411584 (Exim 4.92) (envelope-from ) id 1mt636-0004Im-Kb; Fri, 03 Dec 2021 10:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237313.411584; Fri, 03 Dec 2021 10:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt636-0004Ie-Hi; Fri, 03 Dec 2021 10:44:16 +0000 Received: by outflank-mailman (input) for mailman id 237313; Fri, 03 Dec 2021 10:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt635-0004IQ-K9 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt635-0002Bm-JV for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt635-0007ua-IO for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nhzDz3GPbriUsoKWvbUnEBDTciu8WeNS2ndEZafCIh8=; b=iGcvNKdRpQW+0J8Fcj5HFK2Xhj 2SiSoQfO3JqzVKsct31p4NAvUl/2m7FLfMXQM8wfqPHjsEaqc24rTN8AuJyCi45oRNL10L9v8CCDH xiNBk93mvtgZKwpjQ9S860Au2McXWMgr+tdvmgJM3chmJnp+8Bl6gjSiEO+vX5DIaK2k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] VT-d: introduce helper to convert DID to domid_t Message-Id: Date: Fri, 03 Dec 2021 10:44:15 +0000 commit d159edac73cf887fc899326edddd00133c1d206c Author: Jan Beulich AuthorDate: Fri Dec 3 11:34:24 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:34:24 2021 +0100 VT-d: introduce helper to convert DID to domid_t This is in preparation of adding another "translation" method. Take the combination of the extra validation both previously open-coded have been doing: Bounds check and bitmap check. But don't propagate the previous pointless check of whether ->domid_map[] was actually allocated, as failure there would lead to overall failure of IOMMU initialization anyway. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/extern.h | 2 ++ xen/drivers/passthrough/vtd/iommu.c | 21 +++++++++++++++------ xen/drivers/passthrough/vtd/qinval.c | 5 +---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 6fb00a25c3..f97883a780 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -45,6 +45,8 @@ void disable_intremap(struct vtd_iommu *iommu); int iommu_alloc(struct acpi_drhd_unit *drhd); void iommu_free(struct acpi_drhd_unit *drhd); +domid_t did_to_domain_id(const struct vtd_iommu *iommu, unsigned int did); + int iommu_flush_iec_global(struct vtd_iommu *iommu); int iommu_flush_iec_index(struct vtd_iommu *iommu, u8 im, u16 iidx); void clear_fault_bits(struct vtd_iommu *iommu); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2ddee7357b..b329b5d14f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -123,15 +123,16 @@ static int context_get_domain_id(const struct context_entry *context, if ( iommu && context ) { - unsigned int nr_dom = cap_ndoms(iommu->cap); unsigned int dom_index = context_domain_id(*context); - if ( dom_index < nr_dom && iommu->domid_map ) - domid = iommu->domid_map[dom_index]; - else + domid = did_to_domain_id(iommu, dom_index); + if ( domid == DOMID_INVALID ) + { dprintk(XENLOG_DEBUG VTDPREFIX, - "dom_index %u exceeds nr_dom %u or iommu has no domid_map\n", - dom_index, nr_dom); + "no domid for did %u (nr_dom %u)\n", + dom_index, cap_ndoms(iommu->cap)); + domid = -1; + } } return domid; @@ -193,6 +194,14 @@ static void check_cleanup_domid_map(struct domain *d, } } +domid_t did_to_domain_id(const struct vtd_iommu *iommu, unsigned int did) +{ + if ( did >= cap_ndoms(iommu->cap) || !test_bit(did, iommu->domid_bitmap) ) + return DOMID_INVALID; + + return iommu->domid_map[did]; +} + static void sync_cache(const void *addr, unsigned int size) { static unsigned long clflush_size = 0; diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index b16153e298..9f291f47e5 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -229,10 +229,7 @@ static int __must_check dev_invalidate_sync(struct vtd_iommu *iommu, rc = queue_invalidate_wait(iommu, 0, 1, 1, 1); if ( rc == -ETIMEDOUT ) { - struct domain *d = NULL; - - if ( test_bit(did, iommu->domid_bitmap) ) - d = rcu_lock_domain_by_id(iommu->domid_map[did]); + struct domain *d = rcu_lock_domain_by_id(did_to_domain_id(iommu, did)); /* * In case the domain has been freed or the IOMMU domid bitmap is -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:44:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:44:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237314.411588 (Exim 4.92) (envelope-from ) id 1mt63G-0004Lc-MF; Fri, 03 Dec 2021 10:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237314.411588; Fri, 03 Dec 2021 10:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63G-0004LV-JH; Fri, 03 Dec 2021 10:44:26 +0000 Received: by outflank-mailman (input) for mailman id 237314; Fri, 03 Dec 2021 10:44:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63F-0004LJ-Na for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63F-0002Bw-Mr for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt63F-0007vT-Lr for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ezLswdRb5kgIPeUWm9WnL2aKgyo8p/6vaVBspSuvP8w=; b=0n9+vXI1xx48Y/WBpBHZt7LCKt qmxKliR20eCKZ2Yr7qyXP80mLQXvw7AmxKs0SuZxowYUKPkvwWrcmDw38Br9oWx+pf+irBKQ0Tj99 DQaaedSCdDZIcjqjgTaJLaHVCM6BVbWxfhibb4bFPDLDmxOVZ2mThtPlcxfsF01wfa+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/x2APIC: defer probe until after IOMMU ACPI table parsing Message-Id: Date: Fri, 03 Dec 2021 10:44:25 +0000 commit 3950f2485bbc983c5c9f66ef9637395e975a2bec Author: Jan Beulich AuthorDate: Fri Dec 3 11:36:10 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:36:10 2021 +0100 x86/x2APIC: defer probe until after IOMMU ACPI table parsing While commit 46c4061cd2bf ("x86/IOMMU: mark IOMMU / intremap not in use when ACPI tables are missing") deals with apic_x2apic_probe() as called from x2apic_bsp_setup(), the check_x2apic_preenabled() path is similarly affected: The call needs to occur after acpi_iommu_init(), such that iommu_intremap getting disabled there can be properly taken into account by apic_x2apic_probe(). Note that, for the time being (further cleanup patches following), reversing the order of the calls to generic_apic_probe() and acpi_boot_init() is not an option: - acpi_process_madt() calls clustered_apic_check() and hence relies on genapic to have got filled before, - generic_bigsmp_probe() (called from acpi_process_madt()) needs to occur after generic_apic_probe(), - acpi_parse_madt() (called from acpi_process_madt()) calls acpi_madt_oem_check(), which wants to be after generic_apic_probe(). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 2 -- xen/arch/x86/setup.c | 19 +++++++++++++++++-- xen/drivers/passthrough/x86/iommu.c | 11 +++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 24702d041c..cc4bbc0284 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -742,8 +742,6 @@ int __init acpi_boot_init(void) acpi_mmcfg_init(); - acpi_iommu_init(); - erst_init(); acpi_hest_init(); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 723bd49c76..f40a9fe5d3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1664,15 +1664,30 @@ void __init noreturn __start_xen(unsigned long mbi_p) dmi_scan_machine(); - generic_apic_probe(); - mmio_ro_ranges = rangeset_new(NULL, "r/o mmio ranges", RANGESETF_prettyprint_hex); xsm_multiboot_init(module_map, mbi); + /* + * IOMMU-related ACPI table parsing may require some of the system domains + * to be usable, e.g. for pci_hide_device()'s use of dom_xen. + */ setup_system_domains(); + /* + * IOMMU-related ACPI table parsing has to happen before APIC probing, for + * check_x2apic_preenabled() to be able to observe respective findings, in + * particular iommu_intremap having got turned off. + */ + acpi_iommu_init(); + + /* + * APIC probing needs to happen before general ACPI table parsing, as e.g. + * generic_bigsmp_probe() may occur only afterwards. + */ + generic_apic_probe(); + acpi_boot_init(); if ( smp_found_config ) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index b2284ae001..f11280f4b2 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -43,14 +43,17 @@ bool __read_mostly iommu_intpost; void __init acpi_iommu_init(void) { - int ret; + int ret = -ENODEV; if ( !iommu_enable && !iommu_intremap ) return; - ret = acpi_dmar_init(); - if ( ret == -ENODEV ) - ret = acpi_ivrs_init(); + if ( !acpi_disabled ) + { + ret = acpi_dmar_init(); + if ( ret == -ENODEV ) + ret = acpi_ivrs_init(); + } if ( ret ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:44:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237316.411603 (Exim 4.92) (envelope-from ) id 1mt63Q-0004eC-VM; Fri, 03 Dec 2021 10:44:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237316.411603; Fri, 03 Dec 2021 10:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63Q-0004e2-S7; Fri, 03 Dec 2021 10:44:36 +0000 Received: by outflank-mailman (input) for mailman id 237316; Fri, 03 Dec 2021 10:44:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63P-0004PJ-Qb for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63P-0002C6-Pj for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt63P-0007wP-Or for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=g4+AZ1wGWkP1pd9uRmGxtyFhcdkZMe+3hw2UAi8ASOM=; b=XS0Xk9mVgp+ua/+p7WtaAowUxC 1BjfuAguXANcaE1p0NiepuBFJW4jB06gRLVuAk6EmILyHKBkC+RNl2uBKxAKrNfaZxf+hTP4zYoZ0 DujzCx2oMTgC07oT+mO3+IcNZu/tcclmJwkbHMSo5Lb0aIAML36+ghLHjhdj/Dbe6oN4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/alternatives: adjust alternative_vcall0() Message-Id: Date: Fri, 03 Dec 2021 10:44:35 +0000 commit 1f1179c619f6b82d3f193a9da7a24c359f79fb67 Author: Jan Beulich AuthorDate: Fri Dec 3 11:36:46 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:36:46 2021 +0100 x86/alternatives: adjust alternative_vcall0() I'm puzzled about two inconsistencies with other alternative_vcall() here: There's a check missing that the supplied function pointer is actually pointing to a function taking no args. And there's a pointless pair of parentheses. Correct both. Fixes: 67d01cdb5518 ("x86: infrastructure to allow converting certain indirect calls to direct ones") Signed-off-by: Jan Beulich Reviewed-by: Wei Chen --- xen/include/asm-x86/alternative.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h index 8bc59b02af..a7a82c2c03 100644 --- a/xen/include/asm-x86/alternative.h +++ b/xen/include/asm-x86/alternative.h @@ -218,7 +218,8 @@ extern void alternative_branches(void); #define alternative_vcall0(func) ({ \ ALT_CALL_NO_ARG1; \ - ((void)alternative_callN(0, int, func)); \ + (void)sizeof(func()); \ + (void)alternative_callN(0, int, func); \ }) #define alternative_call0(func) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 10:44:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 10:44:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237317.411607 (Exim 4.92) (envelope-from ) id 1mt63b-0004m6-0o; Fri, 03 Dec 2021 10:44:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237317.411607; Fri, 03 Dec 2021 10:44:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63a-0004lw-Tg; Fri, 03 Dec 2021 10:44:46 +0000 Received: by outflank-mailman (input) for mailman id 237317; Fri, 03 Dec 2021 10:44:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63Z-0004l0-TC for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt63Z-0002CK-SY for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt63Z-0007x8-Rr for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 10:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mlBjRmXzjJmQoHudiu0u+4+qrEROoH/W+Hjw50JzDbw=; b=ZURVrkbibhITMZwYaPrxyAYiXy ZCmBSVGnxqNewZ5vIhWg/F2sqHdGyCRqviwnjaTiWkLbD6AORHbnymId2G1/A14RM/jVnU+ehZAQy dFvRJAfQgVKsV7cx7xSd9gv1mjr2H6ZoQjRiVE+cT+9NfbYd5RJkDxHrqOPeluT1QwRk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/Viridian: fold duplicate vpset retrieval code Message-Id: Date: Fri, 03 Dec 2021 10:44:45 +0000 commit 6a6ab829b6defb4165a65225fbbb9c1703845676 Author: Jan Beulich AuthorDate: Fri Dec 3 11:37:45 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:37:45 2021 +0100 x86/Viridian: fold duplicate vpset retrieval code hvcall_{flush,ipi}_ex() use more almost identical code than what was isolated into hv_vpset_to_vpmask(). Move that code there as well, to have just one instance of it. This way all of HV_GENERIC_SET_SPARSE_4K processing now happens in a single place. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/viridian.c | 73 +++++++++++++----------------------- 1 file changed, 26 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index 9e1363207f..8986b8e03c 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -621,10 +621,14 @@ static unsigned int hv_vpset_nr_banks(struct hv_vpset *vpset) return hweight64(vpset->valid_bank_mask); } -static int hv_vpset_to_vpmask(const struct hv_vpset *set, +static int hv_vpset_to_vpmask(const struct hv_vpset *in, paddr_t bank_gpa, struct hypercall_vpmask *vpmask) { #define NR_VPS_PER_BANK (HV_VPSET_BANK_SIZE * 8) + union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); + struct hv_vpset *set = &vpset->set; + + *set = *in; switch ( set->format ) { @@ -636,6 +640,18 @@ static int hv_vpset_to_vpmask(const struct hv_vpset *set, { uint64_t bank_mask; unsigned int vp, bank = 0; + size_t size = sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); + + if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > + sizeof(*vpset) ) + { + ASSERT_UNREACHABLE(); + return -EINVAL; + } + + if ( hvm_copy_from_guest_phys(&set->bank_contents, bank_gpa, + size) != HVMTRANS_okay ) + return -EINVAL; vpmask_empty(vpmask); for ( vp = 0, bank_mask = set->valid_bank_mask; @@ -760,31 +776,13 @@ static int hvcall_flush_ex(const union hypercall_input *input, vcpu_bitmap = NULL; else { - union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); - struct hv_vpset *set = &vpset->set; - int rc; - - *set = input_params.set; - if ( set->format == HV_GENERIC_SET_SPARSE_4K ) - { - unsigned long offset = offsetof(typeof(input_params), + unsigned int bank_offset = offsetof(typeof(input_params), set.bank_contents); - size_t size = sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); - - if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > - sizeof(*vpset) ) - { - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( hvm_copy_from_guest_phys(&set->bank_contents[0], - input_params_gpa + offset, - size) != HVMTRANS_okay) - return -EINVAL; - } + int rc; - rc = hv_vpset_to_vpmask(set, vpmask); + rc = hv_vpset_to_vpmask(&input_params.set, + input_params_gpa + bank_offset, + vpmask); if ( rc ) return rc; @@ -883,8 +881,8 @@ static int hvcall_ipi_ex(const union hypercall_input *input, uint8_t reserved_zero[3]; struct hv_vpset set; } input_params; - union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); - struct hv_vpset *set = &vpset->set; + unsigned int bank_offset = offsetof(typeof(input_params), + set.bank_contents); int rc; /* These hypercalls should never use the fast-call convention. */ @@ -905,27 +903,8 @@ static int hvcall_ipi_ex(const union hypercall_input *input, if ( input_params.vector < 0x10 || input_params.vector > 0xff ) return -EINVAL; - *set = input_params.set; - if ( set->format == HV_GENERIC_SET_SPARSE_4K ) - { - unsigned long offset = offsetof(typeof(input_params), - set.bank_contents); - size_t size = sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); - - if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > - sizeof(*vpset) ) - { - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( hvm_copy_from_guest_phys(&set->bank_contents, - input_params_gpa + offset, - size) != HVMTRANS_okay) - return -EINVAL; - } - - rc = hv_vpset_to_vpmask(set, vpmask); + rc = hv_vpset_to_vpmask(&input_params.set, input_params_gpa + bank_offset, + vpmask); if ( rc ) return rc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 12:22:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 12:22:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237541.411978 (Exim 4.92) (envelope-from ) id 1mt7Zm-0001ct-7u; Fri, 03 Dec 2021 12:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237541.411978; Fri, 03 Dec 2021 12:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt7Zm-0001cl-52; Fri, 03 Dec 2021 12:22:06 +0000 Received: by outflank-mailman (input) for mailman id 237541; Fri, 03 Dec 2021 12:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt7Zk-0001cf-SL for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 12:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt7Zk-0003y6-Os for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 12:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt7Zk-00070p-Nr for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 12:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+gIVCmJlzwsxm0DmpaXhvMR9wJViGCBPmJvanfGyCbQ=; b=qx4U89qJ8X/G+M40n6R5BMFqmr 42SnCdKenMnsZBfXNJBUH5KfjmtYV/58y4cFAoP+wYUd8f4UzxNHmGhynk+BuvdBL1Jq4q5EZz3zO ifIbLgEtEdWZZEDQuiqZSKMXFlpLgl5AQGj26yTdYtMegzcFf96NsZ+komXFwQkG9DpU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/vgic: Fix reference to a non-existing function Message-Id: Date: Fri, 03 Dec 2021 12:22:04 +0000 commit a44d428158ba84144f0dca9d98bfef7e7b3ff26d Author: Michal Orzel AuthorDate: Fri Dec 3 10:58:37 2021 +0100 Commit: Julien Grall CommitDate: Fri Dec 3 12:10:50 2021 +0000 arm/vgic: Fix reference to a non-existing function Commit 68dcdf942326ad90ca527831afbee9cd4a867f84 (xen/arm: s/gic_set_guest_irq/gic_raise_guest_irq) forgot to modify a comment about lr_pending list, referring to a function that has been renamed. Fix that. Fixes: 68dcdf942326 ("xen/arm: s/gic_set_guest_irq/gic_raise_guest_irq") Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/include/asm-arm/vgic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index e69a59063a..ade427a808 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -195,7 +195,7 @@ struct vgic_cpu { * corresponding LR it is also removed from this list. */ struct list_head inflight_irqs; /* lr_pending is used to queue IRQs (struct pending_irq) that the - * vgic tried to inject in the guest (calling gic_set_guest_irq) but + * vgic tried to inject in the guest (calling gic_raise_guest_irq) but * no LRs were available at the time. * As soon as an LR is freed we remove the first IRQ from this * list and write it to the LR register. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 12:55:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 12:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237589.412068 (Exim 4.92) (envelope-from ) id 1mt85h-0000kU-Lr; Fri, 03 Dec 2021 12:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237589.412068; Fri, 03 Dec 2021 12:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt85h-0000kL-Io; Fri, 03 Dec 2021 12:55:05 +0000 Received: by outflank-mailman (input) for mailman id 237589; Fri, 03 Dec 2021 12:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt85g-0000kA-Jm for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 12:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt85g-0004Yb-J0 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 12:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt85g-00019v-IB for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 12:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=04pbvyxp4VGJm9+j37efBp/jFja2aBUuDyeTgr8CQUg=; b=3sL1vMXunJcR2IzRnT++jxhFLx DPswefPqw2Z1fzs9EQRFXDa4mH9Hg/KWdPsVWLRSSXpuaAW2V485e7DS35fQ23Hk2E7vPQ5CsYbC3 lS30PCjBZJltWsJPgM122YAY2EJ8esIpmZhudIiTtdNVxKQwPOHogeTUqQ5R5aqLaGDE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] docs/efi: Fix wrong compatible in dts example Message-Id: Date: Fri, 03 Dec 2021 12:55:04 +0000 commit 620ed2c8c777282154a91abca69083a40c9d918d Author: Luca Fancellu AuthorDate: Thu Dec 2 15:05:17 2021 +0000 Commit: Julien Grall CommitDate: Fri Dec 3 12:39:20 2021 +0000 docs/efi: Fix wrong compatible in dts example The example in section "UEFI boot and dom0less on ARM" has a wrong compatible for the DTB passthrough, it is "ramdisk" instead of "device-tree". This patch fixes the example. Fixes: a1743fc3a9fe ("arm/efi: Use dom0less configuration when using EFI boot") Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- docs/misc/efi.pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index 4abbb5bb82..abafb34527 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -222,7 +222,7 @@ domU1 { xen,uefi-binary = "initrd-3.0.31-0.4-xen"; }; module@3 { - compatible = "multiboot,ramdisk", "multiboot,module"; + compatible = "multiboot,device-tree", "multiboot,module"; xen,uefi-binary = "passthrough.dtb"; }; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 13:00:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 13:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237607.412122 (Exim 4.92) (envelope-from ) id 1mt8Aa-0003vl-7V; Fri, 03 Dec 2021 13:00:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237607.412122; Fri, 03 Dec 2021 13:00:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8Aa-0003vd-49; Fri, 03 Dec 2021 13:00:08 +0000 Received: by outflank-mailman (input) for mailman id 237607; Fri, 03 Dec 2021 13:00:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8AZ-0003vC-DF for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8AZ-0004h9-A2 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt8AZ-0001i3-8g for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rCCgidbenM4KrLMkc4Wbfzsiett172fDY0BLxtnlQrs=; b=Z7Jiy0j+RAtTUdCRM0cukmToqg PzJwtYT22KUU+rE8JofpxC24U1EFVeEi4oRqw5SEzl4JGdV8W2rC5SKlVAFnBV/POaa+6pAM17yH7 kf0njJ07XRFF7NcpvYSE6QZFPcCIGaWhayrbIQl7avzLFk08k6n9kludYkRMkTv9ZbW0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] gnttab: remove guest_physmap_remove_page() call from gnttab_map_frame() Message-Id: Date: Fri, 03 Dec 2021 13:00:07 +0000 commit 1b78d4c63687fbcd0baacb13a7bd97605ffe3b88 Author: Jan Beulich AuthorDate: Fri Dec 3 13:54:28 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 13:54:28 2021 +0100 gnttab: remove guest_physmap_remove_page() call from gnttab_map_frame() Without holding appropriate locks, attempting to remove a prior mapping of the underlying page is pointless, as the same (or another) mapping could be re-established by a parallel request on another vCPU. Move the code to Arm's gnttab_set_frame_gfn(); it cannot be dropped there since xenmem_add_to_physmap_one() doesn't call it either (unlike on x86). Of course this new placement doesn't improve things in any way as far as the security of grant status frame mappings goes (see XSA-379). Proper locking would be needed here to allow status frames to be mapped securely. In turn this then requires replacing the other use in gnttab_unpopulate_status_frames(), which yet in turn requires adjusting x86's gnttab_set_frame_gfn(). Note that with proper locking inside guest_physmap_remove_page() combined with checking the GFN's mapping there against the passed in MFN, there then is no issue with the involved multiple gnttab_set_frame_gfn()-s potentially returning varying values (due to a racing XENMAPSPACE_grant_table request). This, as a side effect, does away with gnttab_map_frame() having a local variable "gfn" which shadows a function parameter of the same name. Together with XSA-379 this points out that XSA-255's addition to gnttab_map_frame() was really useless. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Acked-by: Julien Grall --- xen/common/grant_table.c | 26 +++++++++++--------------- xen/include/asm-arm/grant_table.h | 16 +++++++++++----- xen/include/asm-x86/grant_table.h | 7 ++++++- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 012a74455b..0262f2c48a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -93,7 +93,7 @@ struct grant_table { struct radix_tree_root maptrack_tree; /* Domain to which this struct grant_table belongs. */ - const struct domain *domain; + struct domain *domain; struct grant_table_arch arch; }; @@ -1796,8 +1796,8 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) { int rc = gfn_eq(gfn, INVALID_GFN) ? 0 - : guest_physmap_remove_page(d, gfn, - page_to_mfn(pg), 0); + : gnttab_set_frame_gfn(gt, true, i, INVALID_GFN, + page_to_mfn(pg)); if ( rc ) { @@ -1807,7 +1807,6 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) domain_crash(d); return rc; } - gnttab_set_frame_gfn(gt, true, i, INVALID_GFN); } BUG_ON(page_get_owner(pg) != d); @@ -4150,6 +4149,9 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, mfn_t *mfn) struct grant_table *gt = d->grant_table; bool status = false; + if ( gfn_eq(gfn, INVALID_GFN) ) + return -EINVAL; + grant_write_lock(gt); if ( evaluate_nospec(gt->gt_version == 2) && (idx & XENMAPIDX_grant_table_status) ) @@ -4162,24 +4164,18 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, mfn_t *mfn) else rc = gnttab_get_shared_frame_mfn(d, idx, mfn); - if ( !rc && paging_mode_translate(d) ) - { - gfn_t gfn = gnttab_get_frame_gfn(gt, status, idx); - - if ( !gfn_eq(gfn, INVALID_GFN) ) - rc = guest_physmap_remove_page(d, gfn, *mfn, 0); - } - if ( !rc ) { + struct page_info *pg = mfn_to_page(*mfn); + /* * Make sure gnttab_unpopulate_status_frames() won't (successfully) * free the page until our caller has completed its operation. */ - if ( get_page(mfn_to_page(*mfn), d) ) - gnttab_set_frame_gfn(gt, status, idx, gfn); - else + if ( !get_page(pg, d) ) rc = -EBUSY; + else if ( (rc = gnttab_set_frame_gfn(gt, status, idx, gfn, *mfn)) ) + put_page(pg); } grant_write_unlock(gt); diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 0ce77f9a1c..d31a4d6805 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -71,11 +71,17 @@ int replace_grant_host_mapping(unsigned long gpaddr, mfn_t mfn, XFREE((gt)->arch.status_gfn); \ } while ( 0 ) -#define gnttab_set_frame_gfn(gt, st, idx, gfn) \ - do { \ - ((st) ? (gt)->arch.status_gfn : (gt)->arch.shared_gfn)[idx] = \ - (gfn); \ - } while ( 0 ) +#define gnttab_set_frame_gfn(gt, st, idx, gfn, mfn) \ + ({ \ + int rc_ = 0; \ + gfn_t ogfn = gnttab_get_frame_gfn(gt, st, idx); \ + if ( gfn_eq(ogfn, INVALID_GFN) || gfn_eq(ogfn, gfn) || \ + (rc_ = guest_physmap_remove_page((gt)->domain, ogfn, mfn, \ + 0)) == 0 ) \ + ((st) ? (gt)->arch.status_gfn \ + : (gt)->arch.shared_gfn)[idx] = (gfn); \ + rc_; \ + }) #define gnttab_get_frame_gfn(gt, st, idx) ({ \ (st) ? gnttab_status_gfn(NULL, gt, idx) \ diff --git a/xen/include/asm-x86/grant_table.h b/xen/include/asm-x86/grant_table.h index 84e32960c0..a8a21439a4 100644 --- a/xen/include/asm-x86/grant_table.h +++ b/xen/include/asm-x86/grant_table.h @@ -37,7 +37,12 @@ static inline int replace_grant_host_mapping(uint64_t addr, mfn_t frame, #define gnttab_init_arch(gt) 0 #define gnttab_destroy_arch(gt) do {} while ( 0 ) -#define gnttab_set_frame_gfn(gt, st, idx, gfn) do {} while ( 0 ) +#define gnttab_set_frame_gfn(gt, st, idx, gfn, mfn) \ + (gfn_eq(gfn, INVALID_GFN) \ + ? guest_physmap_remove_page((gt)->domain, \ + gnttab_get_frame_gfn(gt, st, idx), \ + mfn, 0) \ + : 0 /* Handled in add_to_physmap_one(). */) #define gnttab_get_frame_gfn(gt, st, idx) ({ \ mfn_t mfn_ = (st) ? gnttab_status_mfn(gt, idx) \ : gnttab_shared_mfn(gt, idx); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 13:00:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 13:00:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237608.412126 (Exim 4.92) (envelope-from ) id 1mt8Ak-00042m-8q; Fri, 03 Dec 2021 13:00:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237608.412126; Fri, 03 Dec 2021 13:00:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8Ak-00042g-5r; Fri, 03 Dec 2021 13:00:18 +0000 Received: by outflank-mailman (input) for mailman id 237608; Fri, 03 Dec 2021 13:00:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8Aj-000427-E3 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8Aj-0004hh-DF for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt8Aj-0001jL-CK for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ue0Jw1bSYsdWlZTf2SQeqcDOytQF1VBpnH89eSEbdp4=; b=1P8kvQoSO3pOfcUK0oyWq24thT W2YYSMVrhnhssSMWiAWDGGykXQ9akPD0BZnK+yjGAijLSLKak/TVSrnOR9hvEkn7oH7QGT5xKD86E 362BOOS99GS/jY3s1SXFqzr4t083oBBaLSGOBDrLZESYiwqsD8ogLeZmjF+MLwGfKjPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE Message-Id: Date: Fri, 03 Dec 2021 13:00:17 +0000 commit 7cfe450be3f590b8c65d52a3e513d47cdd07bf44 Author: Oleksandr Andrushchenko AuthorDate: Wed Nov 24 09:59:36 2021 +0200 Commit: Julien Grall CommitDate: Fri Dec 3 12:59:18 2021 +0000 xen/arm: rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE To better reflect the nature of the device type and not to make any confusion rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE which it really is. Suggested-by: Julien Grall Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Jiamei xie Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- xen/arch/arm/pci/pci.c | 2 +- xen/include/asm-arm/device.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index 33457fbe96..46de6e43cc 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -32,7 +32,7 @@ static int __init pci_host_generic_probe(struct dt_device_node *dev, return pci_host_common_probe(dev, &pci_generic_ecam_ops); } -DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI) +DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) .dt_match = gen_pci_dt_match, .init = pci_host_generic_probe, DT_DEVICE_END diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 61a9807d3d..516982bca8 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -49,7 +49,7 @@ static int __init pci_host_generic_probe(struct dt_device_node *dev, return pci_host_common_probe(dev, &nwl_pcie_ops); } -DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI) +DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE) .dt_match = nwl_pcie_dt_match, .init = pci_host_generic_probe, DT_DEVICE_END diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 082c14e127..78b97beaef 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -46,7 +46,7 @@ static int __init dt_pci_init(void) dt_for_each_device_node(dt_host, np) { - rc = device_init(np, DEVICE_PCI, NULL); + rc = device_init(np, DEVICE_PCI_HOSTBRIDGE, NULL); /* * Ignore the following error codes: * - EBADF: Indicate the current device is not a pci device. diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 7bf0405603..b5d451e087 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -34,7 +34,7 @@ enum device_class DEVICE_SERIAL, DEVICE_IOMMU, DEVICE_GIC, - DEVICE_PCI, + DEVICE_PCI_HOSTBRIDGE, /* Use for error */ DEVICE_UNKNOWN, }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 13:00:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 13:00:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237611.412130 (Exim 4.92) (envelope-from ) id 1mt8Au-0004EP-A1; Fri, 03 Dec 2021 13:00:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237611.412130; Fri, 03 Dec 2021 13:00:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8Au-0004EG-7E; Fri, 03 Dec 2021 13:00:28 +0000 Received: by outflank-mailman (input) for mailman id 237611; Fri, 03 Dec 2021 13:00:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8At-0004Bp-HE for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mt8At-0004hr-GT for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mt8At-0001k8-Fc for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 13:00:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FhJprdCnckEL+UA2axdMPwXqyz0G4XxUBCkTvtjFxsw=; b=kGNa2QlsOPQ6w/6OjZUilmjPzZ 9A63rJ9J6Ni14R7GFbk6/CjKhqQpeVMeNmY2uAnhAVvBexTB3qw8UicazsJGWte+4ud5FnnkorQLK Ja/b7JVkiEneFJIhfA/md3xe7VNVQvBzbz/cPyGpAalqzkAkQKIhyS+e/zkVV30KwoZc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: do not use void pointer in pci_host_common_probe Message-Id: Date: Fri, 03 Dec 2021 13:00:27 +0000 commit 7b57956b20d90f47dafb7ba1eb52d23e42efd786 Author: Oleksandr Andrushchenko AuthorDate: Wed Nov 24 09:59:42 2021 +0200 Commit: Julien Grall CommitDate: Fri Dec 3 12:59:18 2021 +0000 xen/arm: do not use void pointer in pci_host_common_probe There is no reason to use void pointer while passing ECAM ops to the pci_host_common_probe function as it is anyway casted to struct pci_ecam_ops inside. For that reason remove the void pointer and pass struct pci_ecam_ops pointer as is. Signed-off-by: Oleksandr Andrushchenko Acked-by: Julien Grall Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/ecam.c | 4 ++-- xen/arch/arm/pci/pci-host-common.c | 6 ++---- xen/include/asm-arm/pci.h | 5 +++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c index 602d00799c..2855dea213 100644 --- a/xen/arch/arm/pci/ecam.c +++ b/xen/arch/arm/pci/ecam.c @@ -24,8 +24,8 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where) { const struct pci_config_window *cfg = bridge->cfg; - struct pci_ecam_ops *ops = - container_of(bridge->ops, struct pci_ecam_ops, pci_ops); + const struct pci_ecam_ops *ops = + container_of(bridge->ops, const struct pci_ecam_ops, pci_ops); unsigned int devfn_shift = ops->bus_shift - 8; void __iomem *base; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index cdeb3a283a..ae79a0c19b 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -192,18 +192,16 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -int pci_host_common_probe(struct dt_device_node *dev, const void *data) +int pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; - struct pci_ecam_ops *ops; int err; if ( dt_device_for_passthrough(dev) ) return 0; - ops = (struct pci_ecam_ops *) data; - bridge = pci_alloc_host_bridge(); if ( !bridge ) return -ENOMEM; diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 81273e0d87..9736d6816d 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -63,7 +63,7 @@ struct pci_host_bridge { struct list_head node; /* Node in list of host bridges */ uint16_t segment; /* Segment number */ struct pci_config_window* cfg; /* Pointer to the bridge config window */ - struct pci_ops *ops; + const struct pci_ops *ops; }; struct pci_ops { @@ -89,7 +89,8 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -int pci_host_common_probe(struct dt_device_node *dev, const void *data); +int pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 15:55:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 15:55:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237809.412420 (Exim 4.92) (envelope-from ) id 1mtAtu-0002c3-AD; Fri, 03 Dec 2021 15:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237809.412420; Fri, 03 Dec 2021 15:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtAtu-0002bv-7B; Fri, 03 Dec 2021 15:55:06 +0000 Received: by outflank-mailman (input) for mailman id 237809; Fri, 03 Dec 2021 15:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtAts-0002bn-Sh for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 15:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtAts-0007j7-Qj for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mtAts-0006dT-Pf for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UpDLgzs+JtR+mysv9WSt/KyggJ0gDoSq66nxDwBzvRg=; b=yJ95w0Z3Tij/fqyd2ygerBzrMp 2qG1cRUYD002f6JAxi4t2W3hpAXlqxwsAecFHgM7/go9phhU+lx/lTVcMcOjFPTfz/FOSY3pEneFQ 7o0D7Pe/LU/HgiBFDhJOwFwEbT0oi0o0J2oLGPLkW4kBFocdNfSUwZh8OSCY3yw09Rcs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm: Switch xsm_ops to __alt_call_maybe_initdata Message-Id: Date: Fri, 03 Dec 2021 15:55:04 +0000 commit d6385ea15f7089ca6fb554249f6717c69016c8bd Author: Andrew Cooper AuthorDate: Wed Dec 1 10:34:00 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Dec 3 15:52:24 2021 +0000 xsm: Switch xsm_ops to __alt_call_maybe_initdata This should have been done at the point xsm_ops became fully altcall'd. This puts the xsm_ops structure in .init on architectures where it is no longer referenced at runtime. Fixes: d868feb95a8a ("xen/xsm: Complete altcall conversion of xsm interface") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis Reviewed-by: Daniel P. Smith --- xen/xsm/xsm_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 21fffbcb41..14d98f1f72 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -30,7 +30,7 @@ #define XSM_FRAMEWORK_VERSION "1.0.1" -struct xsm_ops __read_mostly xsm_ops; +struct xsm_ops __alt_call_maybe_initdata xsm_ops; enum xsm_ops_state { XSM_OPS_UNREGISTERED, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 15:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 15:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237810.412425 (Exim 4.92) (envelope-from ) id 1mtAu4-0002ey-DV; Fri, 03 Dec 2021 15:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237810.412425; Fri, 03 Dec 2021 15:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtAu4-0002eq-A3; Fri, 03 Dec 2021 15:55:16 +0000 Received: by outflank-mailman (input) for mailman id 237810; Fri, 03 Dec 2021 15:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtAu2-0002eg-Un for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 15:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtAu2-0007jV-U0 for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 15:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mtAu2-0006e8-TH for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 15:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jt/CSyrbqp1am8a4dsPmcyQujBhkID+qSDeYB2ZpA0w=; b=kALlT5XYUkGPk5yuhYjGpNHdyH eaJFCt3lFNkRkeC7RoRgIJnMD+HfNNKjNjyjyxE43bt63C3VS7OxbEkCi4lYDVC0dEYvkuWTEY3qn feGF/Lj4rhRk52laa/EqMlGz4pKHs/9y6ygX4yAGGFJQskg8q+raZ1OD8+dbEi3yGc68=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xsm: Drop extern of non-existent variable Message-Id: Date: Fri, 03 Dec 2021 15:55:14 +0000 commit 5f4f6c51045b1ce311f21285653cd1516ce8c419 Author: Andrew Cooper AuthorDate: Wed Dec 1 10:35:20 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Dec 3 15:52:24 2021 +0000 xsm: Drop extern of non-existent variable dummy_xsm_ops was dropped as part of organising XSM to be altcall compatible, but the extern was accidentally left around. A later change reintroduced dummy_ops which is logically the same thing, but is private to xsm/dummy.c Fixes: 164a0b9653f4 ("xsm: refactor xsm_ops handling") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis Reviewed-by: Daniel P. Smith --- xen/include/xsm/xsm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 5aa4dd588d..3e2b7fe3db 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -789,8 +789,6 @@ int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size); bool has_xsm_magic(paddr_t); #endif -extern struct xsm_ops dummy_xsm_ops; - void xsm_fixup_ops(struct xsm_ops *ops); #ifdef CONFIG_XSM_FLASK -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 03 17:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 03 Dec 2021 17:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.237879.412546 (Exim 4.92) (envelope-from ) id 1mtCQk-0002B7-3h; Fri, 03 Dec 2021 17:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 237879.412546; Fri, 03 Dec 2021 17:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtCQk-0002Az-0b; Fri, 03 Dec 2021 17:33:06 +0000 Received: by outflank-mailman (input) for mailman id 237879; Fri, 03 Dec 2021 17:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtCQi-0002At-QE for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 17:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mtCQi-0001a1-Mi for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 17:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mtCQi-0001Hj-Lk for xen-changelog@lists.xenproject.org; Fri, 03 Dec 2021 17:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ko5OSwjnM0IxvCTArlU+t4gf1/VmYmNjmusUb8NB9jI=; b=iYLnnXNGGY0QjqLe3qzXGDiteN PyYf/MZQJ8jmaOr50pMolBPKlURGC6UW6GMIvbkHwxwJr4huU26RwkyA0KR3ETE31hb0xwgtGQyIL CwE2Q6cSwP6BNh3mEsWtVR7XArCYm1QLjkLG/P/wQdlLoh7SSXsaAGOkgShtDIrtm4F0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/vPMU: Drop supported parameter from the wrmsr path Message-Id: Date: Fri, 03 Dec 2021 17:33:04 +0000 commit ea0c08bc77fe7bd7e4e65c648e17752e91912d01 Author: Andrew Cooper AuthorDate: Tue Nov 30 21:28:48 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Dec 3 17:22:44 2021 +0000 x86/vPMU: Drop supported parameter from the wrmsr path The supported parameter was added in 2d9b91f1aeaa ("VMX/vPMU: fix DebugCtl MSR handling"). It unfortunately laid the groundwork for XSA-269, and the fix 2a8a8e99feb9 ("x86/vtx: Fix the checking for unknown/invalid MSR_DEBUGCTL bits") totally rewrote MSR_DEBUGCTL handling. Strip out the parameter again. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/vpmu.c | 5 ++--- xen/arch/x86/cpu/vpmu_amd.c | 5 +---- xen/arch/x86/cpu/vpmu_intel.c | 5 +---- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/include/asm-x86/vpmu.h | 13 +++++-------- 7 files changed, 12 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 7fd69a2a58..8ec4547bed 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -116,8 +116,7 @@ void vpmu_lvtpc_update(uint32_t val) apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); } -int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, - uint64_t supported, bool_t is_write) +int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, bool is_write) { struct vcpu *curr = current; struct vpmu_struct *vpmu; @@ -137,7 +136,7 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, goto nop; if ( is_write ) - ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content, supported); + ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content); else ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 5bb4227662..25ad4ecf48 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -348,16 +348,13 @@ static void context_update(unsigned int msr, u64 msr_content) } } -static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, - uint64_t supported) +static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) { struct vcpu *v = current; struct vpmu_struct *vpmu = vcpu_vpmu(v); unsigned int idx = 0; int type = get_pmu_reg_type(msr, &idx); - ASSERT(!supported); - if ( (type == MSR_TYPE_CTRL ) && ((msr_content & CTRL_RSVD_MASK) != ctrl_rsvd[idx]) ) return -EINVAL; diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index c44e81c756..22dd4469d9 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -522,8 +522,7 @@ static int core2_vpmu_msr_common_check(u32 msr_index, int *type, int *index) return 1; } -static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, - uint64_t supported) +static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) { int i, tmp; int type = -1, index = -1; @@ -535,8 +534,6 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, if ( !core2_vpmu_msr_common_check(msr, &type, &index) ) return -EINVAL; - ASSERT(!supported); - if ( (type == MSR_TYPE_COUNTER) && (msr_content & fixed_counters_mask) ) /* Writing unsupported bits to a fixed counter */ return -EINVAL; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index f0e10dec04..fae39c4b4c 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2113,7 +2113,7 @@ static int svm_msr_write_intercept(unsigned int msr, uint64_t msr_content) case MSR_AMD_FAM15H_EVNTSEL3: case MSR_AMD_FAM15H_EVNTSEL4: case MSR_AMD_FAM15H_EVNTSEL5: - if ( vpmu_do_wrmsr(msr, msr_content, 0) ) + if ( vpmu_do_wrmsr(msr, msr_content) ) goto gpf; break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 37c31c08b9..a7a0d66234 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3487,7 +3487,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) case MSR_CORE_PERF_FIXED_CTR_CTRL...MSR_CORE_PERF_GLOBAL_OVF_CTRL: case MSR_IA32_PEBS_ENABLE: case MSR_IA32_DS_AREA: - if ( vpmu_do_wrmsr(msr, msr_content, 0) ) + if ( vpmu_do_wrmsr(msr, msr_content) ) goto gp_fault; break; diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 7f4279a051..8ba65178e9 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1163,7 +1163,7 @@ static int write_msr(unsigned int reg, uint64_t val, !is_hardware_domain(currd) ) return X86EMUL_OKAY; - if ( vpmu_do_wrmsr(reg, val, 0) ) + if ( vpmu_do_wrmsr(reg, val) ) break; return X86EMUL_OKAY; } diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h index 8cfa2cf599..e5709bd44a 100644 --- a/xen/include/asm-x86/vpmu.h +++ b/xen/include/asm-x86/vpmu.h @@ -40,8 +40,7 @@ /* Arch specific operations shared by all vpmus */ struct arch_vpmu_ops { int (*initialise)(struct vcpu *v); - int (*do_wrmsr)(unsigned int msr, uint64_t msr_content, - uint64_t supported); + int (*do_wrmsr)(unsigned int msr, uint64_t msr_content); int (*do_rdmsr)(unsigned int msr, uint64_t *msr_content); int (*do_interrupt)(struct cpu_user_regs *regs); void (*arch_vpmu_destroy)(struct vcpu *v); @@ -104,8 +103,7 @@ static inline bool_t vpmu_are_all_set(const struct vpmu_struct *vpmu, } void vpmu_lvtpc_update(uint32_t val); -int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, - uint64_t supported, bool_t is_write); +int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, bool is_write); void vpmu_do_interrupt(struct cpu_user_regs *regs); void vpmu_initialise(struct vcpu *v); void vpmu_destroy(struct vcpu *v); @@ -113,14 +111,13 @@ void vpmu_save(struct vcpu *v); int vpmu_load(struct vcpu *v, bool_t from_guest); void vpmu_dump(struct vcpu *v); -static inline int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, - uint64_t supported) +static inline int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) { - return vpmu_do_msr(msr, &msr_content, supported, 1); + return vpmu_do_msr(msr, &msr_content, true /* write */); } static inline int vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content) { - return vpmu_do_msr(msr, msr_content, 0, 0); + return vpmu_do_msr(msr, msr_content, false /* read */); } extern unsigned int vpmu_mode; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:00:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:00:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238531.413335 (Exim 4.92) (envelope-from ) id 1mu1QU-000609-5c; Mon, 06 Dec 2021 00:00:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238531.413335; Mon, 06 Dec 2021 00:00:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1QU-000601-2T; Mon, 06 Dec 2021 00:00:14 +0000 Received: by outflank-mailman (input) for mailman id 238531; Mon, 06 Dec 2021 00:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1QS-0005qR-SS for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1QS-0005ad-Rd for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1QS-0007Mu-QT for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=inmKHCUfI7i2n+8oHVkHob9zgiuMZPWxLglVy1fonQc=; b=m5jrZrIcbKWA6qrkey2iqWHTSO Eq1zU4+GAo2TgOKCSKPZUCwW5wLUXdTYHvtmP5P9Hr5O39tIOsVFemC1EKLgTDERlVhQ62baTDqoh 0WKeHkf6DYW9Mlw/ziNFRs6gp+lP5z9BkqZQyGWwSNYULyJXdmN41/GrMmJ9FG0h9kPE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/altcall: allow compound types to be passed Message-Id: Date: Mon, 06 Dec 2021 00:00:12 +0000 commit 5c7c78d0be86e3ce0f96f0000f9462e1cafbdb6e Author: Jan Beulich AuthorDate: Thu Nov 4 17:04:05 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/altcall: allow compound types to be passed Replace the conditional operator in ALT_CALL_ARG(), which was intended to limit usable types to scalar ones, by a size check. Some restriction here is necessary to make sure we don't violate the ABI's calling conventions, but limiting to scalar types was both too restrictive (disallowing e.g. guest handles) and too permissive (allowing e.g. __int128_t). Note that there was some anomaly with that conditional operator anyway: Something - I don't recall what - made it impossible to omit the middle operand. Code-generation-wise this has the effect of removing certain zero- or sign-extending in some altcall invocations. This ought to be fine as the ABI doesn't require sub-sizeof(int) values to be extended, except when passed through an ellipsis. No functions subject to altcall patching has a variable number of arguments, though. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Unfortunately this triggers -Werror=sizeof-array-argument on some versions of GCC, so alter xsm_{alloc,free}_security_evtchns() to use a pointer rather than array parameter. Signed-off-by: Andrew Cooper Reviewed-by: Daniel P. Smith --- xen/include/asm-x86/alternative.h | 4 ++-- xen/include/xsm/xsm.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h index 8e78cc91c3..8bc59b02af 100644 --- a/xen/include/asm-x86/alternative.h +++ b/xen/include/asm-x86/alternative.h @@ -168,8 +168,8 @@ extern void alternative_branches(void); #define ALT_CALL_arg6 "r9" #define ALT_CALL_ARG(arg, n) \ - register typeof((arg) ? (arg) : 0) a ## n ## _ \ - asm ( ALT_CALL_arg ## n ) = (arg) + register typeof(arg) a ## n ## _ asm ( ALT_CALL_arg ## n ) = \ + ({ BUILD_BUG_ON(sizeof(arg) > sizeof(void *)); (arg); }) #define ALT_CALL_NO_ARG(n) \ register unsigned long a ## n ## _ asm ( ALT_CALL_arg ## n ) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index c101e653f6..0b360e1a35 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -332,13 +332,13 @@ static inline void xsm_free_security_domain(struct domain *d) } static inline int xsm_alloc_security_evtchns( - struct evtchn chn[], unsigned int nr) + struct evtchn *chn, unsigned int nr) { return alternative_call(xsm_ops.alloc_security_evtchns, chn, nr); } static inline void xsm_free_security_evtchns( - struct evtchn chn[], unsigned int nr) + struct evtchn *chn, unsigned int nr) { alternative_vcall(xsm_ops.free_security_evtchns, chn, nr); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:00:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238530.413332 (Exim 4.92) (envelope-from ) id 1mu1QL-0005ZS-40; Mon, 06 Dec 2021 00:00:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238530.413332; Mon, 06 Dec 2021 00:00:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1QL-0005Z7-0s; Mon, 06 Dec 2021 00:00:05 +0000 Received: by outflank-mailman (input) for mailman id 238530; Mon, 06 Dec 2021 00:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1QI-0005AO-PV for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1QI-0005Of-Nt for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1QI-0007LM-MR for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vC6oZX84UMbhqCy+OM9GkqGpI5HumyEOHLGQcvMxrA8=; b=FCdcauY1eBJC4OexNg/XI+N2Gm B2QATzafZLQWY1KV68IClDLGsU0T1ivZh7ak5jUyuV0ktL6UJYcqAAemhvIn48Ahk8zswZ6v6xTTn hEzSiLNQgUCk3JUl1VZdp21MrH1uziRuVBhv8XPe9VncsFb/fNC+fOuqvSi42ltqtU9k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf contents" Message-Id: Date: Mon, 06 Dec 2021 00:00:02 +0000 commit 0e6c87b93e1d35fedf9cebd65395c2f79b4af11a Author: Andrew Cooper AuthorDate: Wed Nov 24 19:06:02 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Nov 25 17:14:18 2021 +0000 Revert "x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf contents" OSSTest has identified a 3rd regression caused by this change. Migration between Xen 4.15 and 4.16 on the nocera pair of machines (AMD Opteron 4133) fails with: xc: error: Failed to set CPUID policy: leaf 00000000, subleaf ffffffff, msr ffffffff (22 = Invalid argument): Internal error xc: error: Restore failed (22 = Invalid argument): Internal error which is a safety check to prevent resuming the guest when the CPUID data has been truncated. The problem is caused by shrinking of the max policies, which is an ABI that needs handling compatibly between different versions of Xen. Furthermore, shrinking of the default policies also breaks things in some cases, because certain cpuid= settings in a VM config file which used to work will now be refused. Also external toolstacks that attempt to set the CPUID policy from a featureset might now see some filled leaves not reachable due to the shrinking done to the default domain policy before applying the featureset. This reverts commit 540d911c2813c3d8f4cdbb3f5672119e5e768a3d, as well as the partial fix attempt in 81da2b544cbb003a5447c9b14d275746ad22ab37 (which added one new case where cpuid= settings might not apply correctly) and restores the same behaviour as Xen 4.15. Fixes: 540d911c2813 ("x86/CPUID: shrink max_{,sub}leaf fields according to actual leaf contents") Fixes: 81da2b544cbb ("x86/cpuid: prevent shrinking migrated policies max leaves") Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monné Acked-by: Jan Beulich --- tools/libs/guest/xg_cpuid_x86.c | 7 --- tools/tests/cpu-policy/test-cpu-policy.c | 101 ------------------------------- xen/arch/x86/cpuid.c | 10 --- xen/include/xen/lib/x86/cpuid.h | 7 --- xen/lib/x86/cpuid.c | 39 ------------ 5 files changed, 164 deletions(-) diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c index 3ffd5f683b..198892ebdf 100644 --- a/tools/libs/guest/xg_cpuid_x86.c +++ b/tools/libs/guest/xg_cpuid_x86.c @@ -638,13 +638,6 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, } } - /* - * Do not try to shrink the policy if restoring, as that could cause - * guest visible changes in the maximum leaf fields. - */ - if ( !restore ) - x86_cpuid_policy_shrink_max_leaves(p); - rc = x86_cpuid_copy_to_buffer(p, leaves, &nr_leaves); if ( rc ) { diff --git a/tools/tests/cpu-policy/test-cpu-policy.c b/tools/tests/cpu-policy/test-cpu-policy.c index 75973298df..ed450a0997 100644 --- a/tools/tests/cpu-policy/test-cpu-policy.c +++ b/tools/tests/cpu-policy/test-cpu-policy.c @@ -8,13 +8,10 @@ #include #include -#include #include #include #include -#define XSTATE_FP_SSE (X86_XCR0_FP | X86_XCR0_SSE) - static unsigned int nr_failures; #define fail(fmt, ...) \ ({ \ @@ -573,103 +570,6 @@ static void test_cpuid_out_of_range_clearing(void) } } -static void test_cpuid_maximum_leaf_shrinking(void) -{ - static const struct test { - const char *name; - struct cpuid_policy p; - } tests[] = { - { - .name = "basic", - .p = { - /* Very basic information only. */ - .basic.max_leaf = 1, - .basic.raw_fms = 0xc2, - }, - }, - { - .name = "cache", - .p = { - /* Cache subleaves present. */ - .basic.max_leaf = 4, - .cache.subleaf[0].type = 1, - }, - }, - { - .name = "feat#0", - .p = { - /* Subleaf 0 only with some valid bit. */ - .basic.max_leaf = 7, - .feat.max_subleaf = 0, - .feat.fsgsbase = 1, - }, - }, - { - .name = "feat#1", - .p = { - /* Subleaf 1 only with some valid bit. */ - .basic.max_leaf = 7, - .feat.max_subleaf = 1, - .feat.avx_vnni = 1, - }, - }, - { - .name = "topo", - .p = { - /* Topology subleaves present. */ - .basic.max_leaf = 0xb, - .topo.subleaf[0].type = 1, - }, - }, - { - .name = "xstate", - .p = { - /* First subleaf always valid (and then non-zero). */ - .basic.max_leaf = 0xd, - .xstate.xcr0_low = XSTATE_FP_SSE, - }, - }, - { - .name = "extd", - .p = { - /* Commonly available information only. */ - .extd.max_leaf = 0x80000008, - .extd.maxphysaddr = 0x28, - .extd.maxlinaddr = 0x30, - }, - }, - }; - - printf("Testing CPUID maximum leaf shrinking:\n"); - - for ( size_t i = 0; i < ARRAY_SIZE(tests); ++i ) - { - const struct test *t = &tests[i]; - struct cpuid_policy *p = memdup(&t->p); - - p->basic.max_leaf = ARRAY_SIZE(p->basic.raw) - 1; - p->feat.max_subleaf = ARRAY_SIZE(p->feat.raw) - 1; - p->extd.max_leaf = 0x80000000 | (ARRAY_SIZE(p->extd.raw) - 1); - - x86_cpuid_policy_shrink_max_leaves(p); - - /* Check the the resulting max (sub)leaf values against expecations. */ - if ( p->basic.max_leaf != t->p.basic.max_leaf ) - fail(" Test %s basic fail - expected %#x, got %#x\n", - t->name, t->p.basic.max_leaf, p->basic.max_leaf); - - if ( p->extd.max_leaf != t->p.extd.max_leaf ) - fail(" Test %s extd fail - expected %#x, got %#x\n", - t->name, t->p.extd.max_leaf, p->extd.max_leaf); - - if ( p->feat.max_subleaf != t->p.feat.max_subleaf ) - fail(" Test %s feat fail - expected %#x, got %#x\n", - t->name, t->p.feat.max_subleaf, p->feat.max_subleaf); - - free(p); - } -} - static void test_is_compatible_success(void) { static struct test { @@ -785,7 +685,6 @@ int main(int argc, char **argv) test_cpuid_serialise_success(); test_cpuid_deserialise_failure(); test_cpuid_out_of_range_clearing(); - test_cpuid_maximum_leaf_shrinking(); test_msr_serialise_success(); test_msr_deserialise_failure(); diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 8ac55f0806..151944f657 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -353,8 +353,6 @@ static void __init calculate_host_policy(void) p->extd.raw[0xa].d |= ((1u << SVM_FEATURE_VMCBCLEAN) | (1u << SVM_FEATURE_TSCRATEMSR)); } - - x86_cpuid_policy_shrink_max_leaves(p); } static void __init guest_common_default_feature_adjustments(uint32_t *fs) @@ -434,8 +432,6 @@ static void __init calculate_pv_max_policy(void) recalculate_xstate(p); p->extd.raw[0xa] = EMPTY_LEAF; /* No SVM for PV guests. */ - - x86_cpuid_policy_shrink_max_leaves(p); } static void __init calculate_pv_def_policy(void) @@ -456,8 +452,6 @@ static void __init calculate_pv_def_policy(void) sanitise_featureset(pv_featureset); cpuid_featureset_to_policy(pv_featureset, p); recalculate_xstate(p); - - x86_cpuid_policy_shrink_max_leaves(p); } static void __init calculate_hvm_max_policy(void) @@ -523,8 +517,6 @@ static void __init calculate_hvm_max_policy(void) sanitise_featureset(hvm_featureset); cpuid_featureset_to_policy(hvm_featureset, p); recalculate_xstate(p); - - x86_cpuid_policy_shrink_max_leaves(p); } static void __init calculate_hvm_def_policy(void) @@ -549,8 +541,6 @@ static void __init calculate_hvm_def_policy(void) sanitise_featureset(hvm_featureset); cpuid_featureset_to_policy(hvm_featureset, p); recalculate_xstate(p); - - x86_cpuid_policy_shrink_max_leaves(p); } void __init init_guest_cpuid(void) diff --git a/xen/include/xen/lib/x86/cpuid.h b/xen/include/xen/lib/x86/cpuid.h index 2300faf03e..a4d254ea96 100644 --- a/xen/include/xen/lib/x86/cpuid.h +++ b/xen/include/xen/lib/x86/cpuid.h @@ -386,13 +386,6 @@ void x86_cpuid_policy_fill_native(struct cpuid_policy *p); */ void x86_cpuid_policy_clear_out_of_range_leaves(struct cpuid_policy *p); -/** - * Shrink max leaf/subleaf values such that the last respective valid entry - * isn't all blank. While permitted by the spec, such extraneous leaves may - * provide undue "hints" to guests. - */ -void x86_cpuid_policy_shrink_max_leaves(struct cpuid_policy *p); - #ifdef __XEN__ #include typedef XEN_GUEST_HANDLE_64(xen_cpuid_leaf_t) cpuid_leaf_buffer_t; diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c index 1409c254c8..8eb88314f5 100644 --- a/xen/lib/x86/cpuid.c +++ b/xen/lib/x86/cpuid.c @@ -236,45 +236,6 @@ void x86_cpuid_policy_clear_out_of_range_leaves(struct cpuid_policy *p) ARRAY_SIZE(p->extd.raw) - 1); } -void x86_cpuid_policy_shrink_max_leaves(struct cpuid_policy *p) -{ - unsigned int i; - - p->basic.raw[0x4] = p->cache.raw[0]; - - for ( i = p->feat.max_subleaf; i; --i ) - if ( p->feat.raw[i].a | p->feat.raw[i].b | - p->feat.raw[i].c | p->feat.raw[i].d ) - break; - p->feat.max_subleaf = i; - p->basic.raw[0x7] = p->feat.raw[i]; - - p->basic.raw[0xb] = p->topo.raw[0]; - - /* - * Due to the way xstate gets handled in the hypervisor (see - * recalculate_xstate()) there is (for now at least) no need to fiddle - * with the xstate subleaves (IOW we assume they're already in consistent - * shape, for coming from either hardware or recalculate_xstate()). - */ - p->basic.raw[0xd] = p->xstate.raw[0]; - - for ( i = p->basic.max_leaf; i; --i ) - if ( p->basic.raw[i].a | p->basic.raw[i].b | - p->basic.raw[i].c | p->basic.raw[i].d ) - break; - p->basic.max_leaf = i; - - for ( i = p->extd.max_leaf & 0xffff; i; --i ) - if ( p->extd.raw[i].a | p->extd.raw[i].b | - p->extd.raw[i].c | p->extd.raw[i].d ) - break; - if ( i | p->extd.raw[0].b | p->extd.raw[0].c | p->extd.raw[0].d ) - p->extd.max_leaf = 0x80000000 | i; - else - p->extd.max_leaf = 0; -} - const uint32_t *x86_cpuid_lookup_deep_deps(uint32_t feature) { static const uint32_t deep_features[] = INIT_DEEP_FEATURES; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:00:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:00:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238534.413354 (Exim 4.92) (envelope-from ) id 1mu1Qe-0006Jk-H9; Mon, 06 Dec 2021 00:00:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238534.413354; Mon, 06 Dec 2021 00:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qe-0006Jc-Dp; Mon, 06 Dec 2021 00:00:24 +0000 Received: by outflank-mailman (input) for mailman id 238534; Mon, 06 Dec 2021 00:00:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qc-0006J1-VW for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qc-0005b7-Ul for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Qc-0007NT-Tn for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bHPunthhgyc6gdiz9yo0GzmSTPV7zQjAk7ydr+EQvzA=; b=W1agr1Ys0FIWraLIPzGrCqZTMa 1IfHMPgan440ldcsLELHBqmVl0oH7wbEtLoeh1G2awofgPzQhNAWKTjUAcIT0K1WvT3ttD4taexg/ CtFnIX6WX3uQIn8iEE2/tJVb6lucsRoFezEnxlEzSxxJjQq3Dr0c8oZvnxALaveLnpIU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/xsm: Complete altcall conversion of xsm interface Message-Id: Date: Mon, 06 Dec 2021 00:00:22 +0000 commit d868feb95a8a0cfa643427f10a6a540da8061ab5 Author: Andrew Cooper AuthorDate: Thu Nov 4 19:36:16 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 xen/xsm: Complete altcall conversion of xsm interface With alternative_call() capable of handling compound types, the three remaining hooks can be optimised at boot time too. Fixes: 164a0b9653f4 ("xsm: refactor xsm_ops handling") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Daniel P. Smith --- xen/include/xsm/xsm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 0b360e1a35..82458066f6 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -579,13 +579,13 @@ static inline int xsm_hypfs_op(xsm_default_t def) static inline long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op) { - return xsm_ops.do_xsm_op(op); + return alternative_call(xsm_ops.do_xsm_op, op); } #ifdef CONFIG_COMPAT static inline int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op) { - return xsm_ops.do_compat_op(op); + return alternative_call(xsm_ops.do_compat_op, op); } #endif @@ -698,7 +698,7 @@ static inline int xsm_mmuext_op( static inline int xsm_update_va_mapping( xsm_default_t def, struct domain *d, struct domain *f, l1_pgentry_t pte) { - return xsm_ops.update_va_mapping(d, f, pte); + return alternative_call(xsm_ops.update_va_mapping, d, f, pte); } static inline int xsm_priv_mapping( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:00:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238535.413358 (Exim 4.92) (envelope-from ) id 1mu1Qo-0006QF-Iy; Mon, 06 Dec 2021 00:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238535.413358; Mon, 06 Dec 2021 00:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qo-0006Q7-Ff; Mon, 06 Dec 2021 00:00:34 +0000 Received: by outflank-mailman (input) for mailman id 238535; Mon, 06 Dec 2021 00:00:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qn-0006PK-2j for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qn-0005bQ-1p for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Qn-0007OW-0z for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cdbp4s7qHTpHfC0u9n9TYtsfBlz1WazvMGkU7/jVLtU=; b=lQ5Md/shUgZ+cAzX1i5f8+ICoK b35pFXnlWtsmBoN7ASYjgFUraWhKxNt8TCuheHT/b6/iTvP/XuyJTpdZbVv417Iy2I3JBaWmwrCJ/ X7/C1AwZ1C2Z6JHTACV8II551QwK1ll65YNIPH9KMsP+YSuWGEO50dpIZB5QOa0DZYOM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/xsm: Drop xsm_hvm_control() hook Message-Id: Date: Mon, 06 Dec 2021 00:00:33 +0000 commit 28959fe44235babe31be40f09eccd139a247d858 Author: Andrew Cooper AuthorDate: Fri Oct 29 22:43:50 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 xen/xsm: Drop xsm_hvm_control() hook The final caller was dropped by c/s 58cbc034dc62 "dm_op: convert HVMOP_inject_trap and HVMOP_inject_msi" Signed-off-by: Andrew Cooper Reviewed-by: Daniel P. Smith --- xen/include/xsm/dummy.h | 7 ------- xen/include/xsm/xsm.h | 7 ------- xen/xsm/dummy.c | 1 - xen/xsm/flask/hooks.c | 1 - 4 files changed, 16 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 3b1b378b58..b024119896 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -580,13 +580,6 @@ static XSM_INLINE int xsm_hvm_param( return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_hvm_control( - XSM_DEFAULT_ARG struct domain *d, unsigned long op) -{ - XSM_ASSERT_ACTION(XSM_DM_PRIV); - return xsm_default_action(action, current->domain, d); -} - static XSM_INLINE int xsm_hvm_param_altp2mhvm(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 82458066f6..c5bd421349 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -138,7 +138,6 @@ struct xsm_ops { #endif int (*hvm_param)(struct domain *d, unsigned long op); - int (*hvm_control)(struct domain *d, unsigned long op); int (*hvm_param_altp2mhvm)(struct domain *d); int (*hvm_altp2mhvm_op)(struct domain *d, uint64_t mode, uint32_t op); int (*get_vnumainfo)(struct domain *d); @@ -595,12 +594,6 @@ static inline int xsm_hvm_param( return alternative_call(xsm_ops.hvm_param, d, op); } -static inline int xsm_hvm_control( - xsm_default_t def, struct domain *d, unsigned long op) -{ - return alternative_call(xsm_ops.hvm_control, d, op); -} - static inline int xsm_hvm_param_altp2mhvm(xsm_default_t def, struct domain *d) { return alternative_call(xsm_ops.hvm_param_altp2mhvm, d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index d8c935328e..041f59fdf4 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -103,7 +103,6 @@ void __init xsm_fixup_ops (struct xsm_ops *ops) set_to_dummy_if_null(ops, page_offline); set_to_dummy_if_null(ops, hypfs_op); set_to_dummy_if_null(ops, hvm_param); - set_to_dummy_if_null(ops, hvm_control); set_to_dummy_if_null(ops, hvm_param_altp2mhvm); set_to_dummy_if_null(ops, hvm_altp2mhvm_op); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index ea9a12bd71..3b29f7fde3 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1816,7 +1816,6 @@ static const struct xsm_ops __initconstrel flask_ops = { .page_offline = flask_page_offline, .hypfs_op = flask_hypfs_op, .hvm_param = flask_hvm_param, - .hvm_control = flask_hvm_param, .hvm_param_altp2mhvm = flask_hvm_param_altp2mhvm, .hvm_altp2mhvm_op = flask_hvm_altp2mhvm_op, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:00:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238536.413362 (Exim 4.92) (envelope-from ) id 1mu1Qy-0006ZW-KY; Mon, 06 Dec 2021 00:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238536.413362; Mon, 06 Dec 2021 00:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qy-0006ZO-HH; Mon, 06 Dec 2021 00:00:44 +0000 Received: by outflank-mailman (input) for mailman id 238536; Mon, 06 Dec 2021 00:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qx-0006Xw-5l for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Qx-0005ba-51 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Qx-0007PK-4E for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nzBt0IRKmroAjWWpiTKH49LPqwXCSXKqpq5C7FCqzq4=; b=eT2ae/IHSZp3D5lcl4h1/P1ojA 79bc3Gu4mwEEnghOmuPWdZGAlxdy9j2RFb69rvPl/WnGSTX9EBUgrIumYXr1/ur2Gw1r8WaqCeXou 4zQInpFcYG3M303qa3wJvx9WgMzrGTe20gJtycEbs/5B2eveDqfiJyqKi55TPSL5AQOo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/xsm: Improve fallback handling in xsm_fixup_ops() Message-Id: Date: Mon, 06 Dec 2021 00:00:43 +0000 commit ee3407bb05dae8fa2bbd6476e36bd96d352fd19e Author: Andrew Cooper AuthorDate: Thu Nov 4 03:12:49 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 xen/xsm: Improve fallback handling in xsm_fixup_ops() The current xsm_fixup_ops() is just shy of a full page when compiled, and very fragile to NULL function pointer errors. Address both of these issues with a minor piece of structure (ab)use. Introduce dummy_ops, and fix up the provided xsm_ops pointer by treating both as an array of unsigned longs. The compiled size improvement speaks for itself: $ ../scripts/bloat-o-meter xen-syms-before xen-syms-after add/remove: 1/0 grow/shrink: 0/1 up/down: 712/-3897 (-3185) Function old new delta dummy_ops - 712 +712 xsm_fixup_ops 3987 90 -3897 and there is an additional safety check that will make it obvious during development if there is an issue with the fallback handling. Signed-off-by: Andrew Cooper Reviewed-by: Daniel P. Smith --- xen/include/xsm/xsm.h | 9 ++ xen/xsm/dummy.c | 254 +++++++++++++++++++++++++++----------------------- 2 files changed, 147 insertions(+), 116 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index c5bd421349..5aa4dd588d 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -42,6 +42,15 @@ enum xsm_default { }; typedef enum xsm_default xsm_default_t; +/* + * !!! WARNING !!! + * + * For simplicity, xsm_fixup_ops() expects that this structure is made + * exclusively of function pointers to non-init functions. Think carefully + * before deviating from the pattern. + * + * !!! WARNING !!! + */ struct xsm_ops { void (*security_domaininfo)(struct domain *d, struct xen_domctl_getdomaininfo *info); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 041f59fdf4..4d29a9aa5b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -13,145 +13,167 @@ #define XSM_NO_WRAPPERS #include -#define set_to_dummy_if_null(ops, function) \ - do { \ - if ( !ops->function ) \ - ops->function = xsm_##function; \ - } while (0) - -void __init xsm_fixup_ops (struct xsm_ops *ops) -{ - set_to_dummy_if_null(ops, security_domaininfo); - set_to_dummy_if_null(ops, domain_create); - set_to_dummy_if_null(ops, getdomaininfo); - set_to_dummy_if_null(ops, domctl_scheduler_op); - set_to_dummy_if_null(ops, sysctl_scheduler_op); - set_to_dummy_if_null(ops, set_target); - set_to_dummy_if_null(ops, domctl); - set_to_dummy_if_null(ops, sysctl); - set_to_dummy_if_null(ops, readconsole); - - set_to_dummy_if_null(ops, evtchn_unbound); - set_to_dummy_if_null(ops, evtchn_interdomain); - set_to_dummy_if_null(ops, evtchn_close_post); - set_to_dummy_if_null(ops, evtchn_send); - set_to_dummy_if_null(ops, evtchn_status); - set_to_dummy_if_null(ops, evtchn_reset); - - set_to_dummy_if_null(ops, grant_mapref); - set_to_dummy_if_null(ops, grant_unmapref); - set_to_dummy_if_null(ops, grant_setup); - set_to_dummy_if_null(ops, grant_transfer); - set_to_dummy_if_null(ops, grant_copy); - set_to_dummy_if_null(ops, grant_query_size); - - set_to_dummy_if_null(ops, alloc_security_domain); - set_to_dummy_if_null(ops, free_security_domain); - set_to_dummy_if_null(ops, alloc_security_evtchns); - set_to_dummy_if_null(ops, free_security_evtchns); - set_to_dummy_if_null(ops, show_security_evtchn); - set_to_dummy_if_null(ops, init_hardware_domain); - - set_to_dummy_if_null(ops, get_pod_target); - set_to_dummy_if_null(ops, set_pod_target); - - set_to_dummy_if_null(ops, memory_exchange); - set_to_dummy_if_null(ops, memory_adjust_reservation); - set_to_dummy_if_null(ops, memory_stat_reservation); - set_to_dummy_if_null(ops, memory_pin_page); - set_to_dummy_if_null(ops, claim_pages); - - set_to_dummy_if_null(ops, console_io); - - set_to_dummy_if_null(ops, profile); - - set_to_dummy_if_null(ops, kexec); - set_to_dummy_if_null(ops, schedop_shutdown); - - set_to_dummy_if_null(ops, show_irq_sid); - set_to_dummy_if_null(ops, map_domain_pirq); - set_to_dummy_if_null(ops, map_domain_irq); - set_to_dummy_if_null(ops, unmap_domain_pirq); - set_to_dummy_if_null(ops, unmap_domain_irq); - set_to_dummy_if_null(ops, bind_pt_irq); - set_to_dummy_if_null(ops, unbind_pt_irq); - set_to_dummy_if_null(ops, irq_permission); - set_to_dummy_if_null(ops, iomem_permission); - set_to_dummy_if_null(ops, iomem_mapping); - set_to_dummy_if_null(ops, pci_config_permission); - set_to_dummy_if_null(ops, get_vnumainfo); +static const struct xsm_ops __initconstrel dummy_ops = { + .security_domaininfo = xsm_security_domaininfo, + .domain_create = xsm_domain_create, + .getdomaininfo = xsm_getdomaininfo, + .domctl_scheduler_op = xsm_domctl_scheduler_op, + .sysctl_scheduler_op = xsm_sysctl_scheduler_op, + .set_target = xsm_set_target, + .domctl = xsm_domctl, + .sysctl = xsm_sysctl, + .readconsole = xsm_readconsole, + + .evtchn_unbound = xsm_evtchn_unbound, + .evtchn_interdomain = xsm_evtchn_interdomain, + .evtchn_close_post = xsm_evtchn_close_post, + .evtchn_send = xsm_evtchn_send, + .evtchn_status = xsm_evtchn_status, + .evtchn_reset = xsm_evtchn_reset, + + .grant_mapref = xsm_grant_mapref, + .grant_unmapref = xsm_grant_unmapref, + .grant_setup = xsm_grant_setup, + .grant_transfer = xsm_grant_transfer, + .grant_copy = xsm_grant_copy, + .grant_query_size = xsm_grant_query_size, + + .alloc_security_domain = xsm_alloc_security_domain, + .free_security_domain = xsm_free_security_domain, + .alloc_security_evtchns = xsm_alloc_security_evtchns, + .free_security_evtchns = xsm_free_security_evtchns, + .show_security_evtchn = xsm_show_security_evtchn, + .init_hardware_domain = xsm_init_hardware_domain, + + .get_pod_target = xsm_get_pod_target, + .set_pod_target = xsm_set_pod_target, + + .memory_exchange = xsm_memory_exchange, + .memory_adjust_reservation = xsm_memory_adjust_reservation, + .memory_stat_reservation = xsm_memory_stat_reservation, + .memory_pin_page = xsm_memory_pin_page, + .claim_pages = xsm_claim_pages, + + .console_io = xsm_console_io, + + .profile = xsm_profile, + + .kexec = xsm_kexec, + .schedop_shutdown = xsm_schedop_shutdown, + + .show_irq_sid = xsm_show_irq_sid, + .map_domain_pirq = xsm_map_domain_pirq, + .map_domain_irq = xsm_map_domain_irq, + .unmap_domain_pirq = xsm_unmap_domain_pirq, + .unmap_domain_irq = xsm_unmap_domain_irq, + .bind_pt_irq = xsm_bind_pt_irq, + .unbind_pt_irq = xsm_unbind_pt_irq, + .irq_permission = xsm_irq_permission, + .iomem_permission = xsm_iomem_permission, + .iomem_mapping = xsm_iomem_mapping, + .pci_config_permission = xsm_pci_config_permission, + .get_vnumainfo = xsm_get_vnumainfo, #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) - set_to_dummy_if_null(ops, get_device_group); - set_to_dummy_if_null(ops, assign_device); - set_to_dummy_if_null(ops, deassign_device); + .get_device_group = xsm_get_device_group, + .assign_device = xsm_assign_device, + .deassign_device = xsm_deassign_device, #endif #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) - set_to_dummy_if_null(ops, assign_dtdevice); - set_to_dummy_if_null(ops, deassign_dtdevice); + .assign_dtdevice = xsm_assign_dtdevice, + .deassign_dtdevice = xsm_deassign_dtdevice, #endif - set_to_dummy_if_null(ops, resource_plug_core); - set_to_dummy_if_null(ops, resource_unplug_core); - set_to_dummy_if_null(ops, resource_plug_pci); - set_to_dummy_if_null(ops, resource_unplug_pci); - set_to_dummy_if_null(ops, resource_setup_pci); - set_to_dummy_if_null(ops, resource_setup_gsi); - set_to_dummy_if_null(ops, resource_setup_misc); - - set_to_dummy_if_null(ops, page_offline); - set_to_dummy_if_null(ops, hypfs_op); - set_to_dummy_if_null(ops, hvm_param); - set_to_dummy_if_null(ops, hvm_param_altp2mhvm); - set_to_dummy_if_null(ops, hvm_altp2mhvm_op); - - set_to_dummy_if_null(ops, do_xsm_op); + .resource_plug_core = xsm_resource_plug_core, + .resource_unplug_core = xsm_resource_unplug_core, + .resource_plug_pci = xsm_resource_plug_pci, + .resource_unplug_pci = xsm_resource_unplug_pci, + .resource_setup_pci = xsm_resource_setup_pci, + .resource_setup_gsi = xsm_resource_setup_gsi, + .resource_setup_misc = xsm_resource_setup_misc, + + .page_offline = xsm_page_offline, + .hypfs_op = xsm_hypfs_op, + .hvm_param = xsm_hvm_param, + .hvm_param_altp2mhvm = xsm_hvm_param_altp2mhvm, + .hvm_altp2mhvm_op = xsm_hvm_altp2mhvm_op, + + .do_xsm_op = xsm_do_xsm_op, #ifdef CONFIG_COMPAT - set_to_dummy_if_null(ops, do_compat_op); + .do_compat_op = xsm_do_compat_op, #endif - set_to_dummy_if_null(ops, add_to_physmap); - set_to_dummy_if_null(ops, remove_from_physmap); - set_to_dummy_if_null(ops, map_gmfn_foreign); + .add_to_physmap = xsm_add_to_physmap, + .remove_from_physmap = xsm_remove_from_physmap, + .map_gmfn_foreign = xsm_map_gmfn_foreign, - set_to_dummy_if_null(ops, vm_event_control); + .vm_event_control = xsm_vm_event_control, #ifdef CONFIG_MEM_ACCESS - set_to_dummy_if_null(ops, mem_access); + .mem_access = xsm_mem_access, #endif #ifdef CONFIG_MEM_PAGING - set_to_dummy_if_null(ops, mem_paging); + .mem_paging = xsm_mem_paging, #endif #ifdef CONFIG_MEM_SHARING - set_to_dummy_if_null(ops, mem_sharing); + .mem_sharing = xsm_mem_sharing, #endif - set_to_dummy_if_null(ops, platform_op); + .platform_op = xsm_platform_op, #ifdef CONFIG_X86 - set_to_dummy_if_null(ops, do_mca); - set_to_dummy_if_null(ops, shadow_control); - set_to_dummy_if_null(ops, mem_sharing_op); - set_to_dummy_if_null(ops, apic); - set_to_dummy_if_null(ops, machine_memory_map); - set_to_dummy_if_null(ops, domain_memory_map); - set_to_dummy_if_null(ops, mmu_update); - set_to_dummy_if_null(ops, mmuext_op); - set_to_dummy_if_null(ops, update_va_mapping); - set_to_dummy_if_null(ops, priv_mapping); - set_to_dummy_if_null(ops, ioport_permission); - set_to_dummy_if_null(ops, ioport_mapping); - set_to_dummy_if_null(ops, pmu_op); + .do_mca = xsm_do_mca, + .shadow_control = xsm_shadow_control, + .mem_sharing_op = xsm_mem_sharing_op, + .apic = xsm_apic, + .machine_memory_map = xsm_machine_memory_map, + .domain_memory_map = xsm_domain_memory_map, + .mmu_update = xsm_mmu_update, + .mmuext_op = xsm_mmuext_op, + .update_va_mapping = xsm_update_va_mapping, + .priv_mapping = xsm_priv_mapping, + .ioport_permission = xsm_ioport_permission, + .ioport_mapping = xsm_ioport_mapping, + .pmu_op = xsm_pmu_op, #endif - set_to_dummy_if_null(ops, dm_op); - set_to_dummy_if_null(ops, xen_version); - set_to_dummy_if_null(ops, domain_resource_map); + .dm_op = xsm_dm_op, + .xen_version = xsm_xen_version, + .domain_resource_map = xsm_domain_resource_map, #ifdef CONFIG_ARGO - set_to_dummy_if_null(ops, argo_enable); - set_to_dummy_if_null(ops, argo_register_single_source); - set_to_dummy_if_null(ops, argo_register_any_source); - set_to_dummy_if_null(ops, argo_send); + .argo_enable = xsm_argo_enable, + .argo_register_single_source = xsm_argo_register_single_source, + .argo_register_any_source = xsm_argo_register_any_source, + .argo_send = xsm_argo_send, #endif +}; + +void __init xsm_fixup_ops(struct xsm_ops *ops) +{ + /* + * We make some simplifying assumptions about struct xsm_ops; that it is + * made exclusively of function pointers to non-init text. + * + * This allows us to walk over struct xsm_ops as if it were an array of + * unsigned longs. + */ + unsigned long *dst = _p(ops); + const unsigned long *src = _p(&dummy_ops); + + for ( ; dst < (unsigned long *)(ops + 1); src++, dst++ ) + { + /* + * If you encounter this BUG(), then you've most likely added a new + * XSM hook but failed to provide the default implementation in + * dummy_ops. + * + * If not, then perhaps a function pointer to an init function, or + * something which isn't a function pointer at all. + */ + BUG_ON(!is_kernel_text(*src)); + + if ( !*dst ) + *dst = *src; + } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:00:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238538.413366 (Exim 4.92) (envelope-from ) id 1mu1R8-0006h3-OI; Mon, 06 Dec 2021 00:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238538.413366; Mon, 06 Dec 2021 00:00:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1R8-0006gv-Kf; Mon, 06 Dec 2021 00:00:54 +0000 Received: by outflank-mailman (input) for mailman id 238538; Mon, 06 Dec 2021 00:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1R7-0006gQ-9H for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1R7-0005bk-8W for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1R7-0007Pn-7X for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:00:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VYxCSBBP0HeD3oZXpUvf2xfXIwA3/pAXNxJOnv7YpDA=; b=3KsXnJ7XaMumCruvgcjMYR1gfe 41xKBZgmNiUp4+lCiEI7Qe80FiuZcOtgMRoVXhCjdh68E2P2GmaLIJMQPnRHz+kDFxJVAwUOzQGqQ wlKDTHzVIdrGCLa35YpZoyX43kihpaLS5kV/nGTzMn2VmY6wr/kBhDXlTik2BoWi4Z4I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpufreq: Clean up powernow registration Message-Id: Date: Mon, 06 Dec 2021 00:00:53 +0000 commit eed4f94ddbf15e70da93a075a878c304f0a079cb Author: Andrew Cooper AuthorDate: Fri Nov 12 15:13:36 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/cpufreq: Clean up powernow registration powernow_register_driver() is currently written with a K&R type definition; I'm surprised that compilers don't object to a mismatch with its declaration, which is written in an ANSI-C compatible way. Furthermore, its sole caller is cpufreq_driver_init() which is a pre-smp initcall. There are no other online CPUs, and even if there were, checking the BSP's CPUID data $N times is pointless. Simplify registration to only look at the BSP. While at it, drop obviously unused includes. Also rewrite the expression in cpufreq_driver_init() for clarity. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/cpufreq.c | 21 ++++++++++++++------- xen/arch/x86/acpi/cpufreq/powernow.c | 27 ++++----------------------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index f1f3c6923f..df9747e0b6 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -640,13 +640,20 @@ static int __init cpufreq_driver_init(void) { int ret = 0; - if ((cpufreq_controller == FREQCTL_xen) && - (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) - ret = cpufreq_register_driver(&acpi_cpufreq_driver); - else if ((cpufreq_controller == FREQCTL_xen) && - (boot_cpu_data.x86_vendor & - (X86_VENDOR_AMD | X86_VENDOR_HYGON))) - ret = powernow_register_driver(); + if ( cpufreq_controller == FREQCTL_xen ) + { + switch ( boot_cpu_data.x86_vendor ) + { + case X86_VENDOR_INTEL: + ret = cpufreq_register_driver(&acpi_cpufreq_driver); + break; + + case X86_VENDOR_AMD: + case X86_VENDOR_HYGON: + ret = powernow_register_driver(); + break; + } + } return ret; } diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index f620bebc7e..dfd96b9216 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -24,13 +24,9 @@ #include #include #include -#include #include -#include #include -#include #include -#include #include #include #include @@ -353,25 +349,10 @@ static const struct cpufreq_driver __initconstrel powernow_cpufreq_driver = { .update = powernow_cpufreq_update }; -unsigned int __init powernow_register_driver() +unsigned int __init powernow_register_driver(void) { - unsigned int i, ret = 0; - - for_each_online_cpu(i) { - struct cpuinfo_x86 *c = &cpu_data[i]; - if (!(c->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON))) - ret = -ENODEV; - else - { - u32 eax, ebx, ecx, edx; - cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &eax, &ebx, &ecx, &edx); - if ((edx & USE_HW_PSTATE) != USE_HW_PSTATE) - ret = -ENODEV; - } - if (ret) - return ret; - } + if ( !(cpuid_edx(CPUID_FREQ_VOLT_CAPABILITIES) & USE_HW_PSTATE) ) + return -ENODEV; - ret = cpufreq_register_driver(&powernow_cpufreq_driver); - return ret; + return cpufreq_register_driver(&powernow_cpufreq_driver); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:01:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238540.413372 (Exim 4.92) (envelope-from ) id 1mu1RI-0006ld-Pt; Mon, 06 Dec 2021 00:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238540.413372; Mon, 06 Dec 2021 00:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1RI-0006lT-MB; Mon, 06 Dec 2021 00:01:04 +0000 Received: by outflank-mailman (input) for mailman id 238540; Mon, 06 Dec 2021 00:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1RH-0006lE-Ci for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1RH-0005cK-Bp for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1RH-0007Qg-Aw for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AsuEMNB+accY99S4fAa+4uc0pMGcRaiKppSQ8W0Nvoo=; b=4nrix2RpF8uvZ6QdOTcjn8zRhk S4+RJ8iSpZLIFaJwpaQbG/bFlgteEjDBBvo8ZKYBCpwq+DEb5q9OHFQrKyd9FhZcgq8abN9KqniVu RfOa0IbVpfjKNxOnJKCXKHks5szAbaBRup2u4hYs4yNu7PeT/rcnDWHdbPVZxEpCLRSI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpufreq: Rework APERF/MPERF handling Message-Id: Date: Mon, 06 Dec 2021 00:01:03 +0000 commit 4dd16c44152f57f2f96d32e9a06fb7e259cde31b Author: Andrew Cooper AuthorDate: Fri Nov 12 16:28:24 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/cpufreq: Rework APERF/MPERF handling Currently, each feature_detect() (called on CPU add) hook for both cpufreq drivers duplicates cpu_has_aperfmperf in a per-cpu datastructure, and edits cpufreq_driver.getavg to point at get_measured_perf(). As all parts of this are vendor-neutral, drop the function pointer and duplicated boolean, and call get_measured_perf() directly. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpufreq/cpufreq.c | 8 +------- xen/arch/x86/acpi/cpufreq/powernow.c | 6 ------ xen/drivers/cpufreq/utility.c | 9 +++------ xen/include/acpi/cpufreq/cpufreq.h | 2 -- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index df9747e0b6..029c9398c4 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -275,7 +275,7 @@ unsigned int get_measured_perf(unsigned int cpu, unsigned int flag) return 0; policy = per_cpu(cpufreq_cpu_policy, cpu); - if (!policy || !policy->aperf_mperf) + if ( !policy || !cpu_has_aperfmperf ) return 0; switch (flag) @@ -345,12 +345,6 @@ static void feature_detect(void *info) struct cpufreq_policy *policy = info; unsigned int eax; - if ( cpu_has_aperfmperf ) - { - policy->aperf_mperf = 1; - cpufreq_driver.getavg = get_measured_perf; - } - eax = cpuid_eax(6); if (eax & 0x2) { policy->turbo = CPUFREQ_TURBO_ENABLED; diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index dfd96b9216..97a883e7a7 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -205,12 +205,6 @@ static void feature_detect(void *info) struct cpufreq_policy *policy = info; unsigned int edx; - if ( cpu_has_aperfmperf ) - { - policy->aperf_mperf = 1; - cpufreq_driver.getavg = get_measured_perf; - } - edx = cpuid_edx(CPUID_FREQ_VOLT_CAPABILITIES); if ((edx & CPB_CAPABLE) == CPB_CAPABLE) { policy->turbo = CPUFREQ_TURBO_ENABLED; diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index b93895d4dd..9eb7ecedcd 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -381,12 +381,9 @@ int cpufreq_driver_getavg(unsigned int cpu, unsigned int flag) if (!cpu_online(cpu) || !(policy = per_cpu(cpufreq_cpu_policy, cpu))) return 0; - if (cpufreq_driver.getavg) - { - freq_avg = cpufreq_driver.getavg(cpu, flag); - if (freq_avg > 0) - return freq_avg; - } + freq_avg = get_measured_perf(cpu, flag); + if ( freq_avg > 0 ) + return freq_avg; return policy->cur; } diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index e88b20bfed..4958d3f7d3 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -72,7 +72,6 @@ struct cpufreq_policy { s8 turbo; /* tristate flag: 0 for unsupported * -1 for disable, 1 for enabled * See CPUFREQ_TURBO_* below for defines */ - bool_t aperf_mperf; /* CPU has APERF/MPERF MSRs */ }; DECLARE_PER_CPU(struct cpufreq_policy *, cpufreq_cpu_policy); @@ -162,7 +161,6 @@ struct cpufreq_driver { unsigned int target_freq, unsigned int relation); unsigned int (*get)(unsigned int cpu); - unsigned int (*getavg)(unsigned int cpu, unsigned int flag); int (*exit)(struct cpufreq_policy *policy); }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:01:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238542.413374 (Exim 4.92) (envelope-from ) id 1mu1RS-0006pA-Qa; Mon, 06 Dec 2021 00:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238542.413374; Mon, 06 Dec 2021 00:01:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1RS-0006p2-Nf; Mon, 06 Dec 2021 00:01:14 +0000 Received: by outflank-mailman (input) for mailman id 238542; Mon, 06 Dec 2021 00:01:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1RR-0006oo-Fr for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1RR-0005cV-F8 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1RR-0007RH-EE for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/v+MmaRoKax5M5y238DQN4qa9XTXdMK0m0kjA5AvqhE=; b=a5o5OeAhuaxLc36Rlku4kp/IFo XVofAyFHegvY7dPBXxDUNHBfRJAMFES/AavZevYGR8uQsgqX3QEtmYep2hyvWu1/NY7rll4kgWaRr SfLihi0n2BDLK8lrSiWqhxkLitAhrH15XPmBULe+OFhlq1gARKSE4u7HqrosvRCjRtG8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpufreq: Drop opencoded CPUID handling from powernow Message-Id: Date: Mon, 06 Dec 2021 00:01:13 +0000 commit 5d9974916bca25ce2d00b888f54b89e9eabdcc92 Author: Andrew Cooper AuthorDate: Fri Nov 12 16:00:13 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/cpufreq: Drop opencoded CPUID handling from powernow Xen already collects CPUID.0x80000007.edx by default, meaning that we can refer to per-cpu data directly. This also avoids the need IPI the onlining CPU to identify whether Core Performance Boost is available. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/misc/xen-cpuid.c | 3 ++- xen/arch/x86/acpi/cpufreq/powernow.c | 26 ++++---------------------- xen/include/asm-x86/cpufeature.h | 1 + xen/include/public/arch-x86/cpufeatureset.h | 2 ++ 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 37989e4a12..9b59fec263 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -139,7 +139,8 @@ static const char *const str_7c0[32] = static const char *const str_e7d[32] = { - [ 8] = "itsc", + /* 6 */ [ 7] = "hw-pstate", + [ 8] = "itsc", [ 9] = "cpb", [10] = "efro", }; diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index 97a883e7a7..da8fc40b9a 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -32,9 +32,6 @@ #include #include -#define CPUID_FREQ_VOLT_CAPABILITIES 0x80000007 -#define CPB_CAPABLE 0x00000200 -#define USE_HW_PSTATE 0x00000080 #define HW_PSTATE_MASK 0x00000007 #define HW_PSTATE_VALID_MASK 0x80000000 #define HW_PSTATE_MAX_MASK 0x000000f0 @@ -200,21 +197,6 @@ static int powernow_cpufreq_verify(struct cpufreq_policy *policy) return cpufreq_frequency_table_verify(policy, data->freq_table); } -static void feature_detect(void *info) -{ - struct cpufreq_policy *policy = info; - unsigned int edx; - - edx = cpuid_edx(CPUID_FREQ_VOLT_CAPABILITIES); - if ((edx & CPB_CAPABLE) == CPB_CAPABLE) { - policy->turbo = CPUFREQ_TURBO_ENABLED; - if (cpufreq_verbose) - printk(XENLOG_INFO - "CPU%u: Core Boost/Turbo detected and enabled\n", - smp_processor_id()); - } -} - static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) { unsigned int i; @@ -300,9 +282,9 @@ static int powernow_cpufreq_cpu_init(struct cpufreq_policy *policy) if (result) goto err_freqfree; - if (c->cpuid_level >= 6) - on_selected_cpus(cpumask_of(cpu), feature_detect, policy, 1); - + if ( cpu_has(c, X86_FEATURE_CPB) ) + policy->turbo = CPUFREQ_TURBO_ENABLED; + /* * the first call to ->target() should result in us actually * writing something to the appropriate registers. @@ -345,7 +327,7 @@ static const struct cpufreq_driver __initconstrel powernow_cpufreq_driver = { unsigned int __init powernow_register_driver(void) { - if ( !(cpuid_edx(CPUID_FREQ_VOLT_CAPABILITIES) & USE_HW_PSTATE) ) + if ( !cpu_has_hw_pstate ) return -ENODEV; return cpufreq_register_driver(&powernow_cpufreq_driver); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index ba0fe7c0aa..4754940e23 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -122,6 +122,7 @@ #define cpu_has_enqcmd boot_cpu_has(X86_FEATURE_ENQCMD) /* CPUID level 0x80000007.edx */ +#define cpu_has_hw_pstate boot_cpu_has(X86_FEATURE_HW_PSTATE) #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) /* CPUID level 0x80000008.ebx */ diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index f11d5439ae..d6260c801a 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -247,7 +247,9 @@ XEN_CPUFEATURE(MOVDIR64B, 6*32+28) /*a MOVDIR64B instruction */ XEN_CPUFEATURE(ENQCMD, 6*32+29) /* ENQCMD{,S} instructions */ /* AMD-defined CPU features, CPUID level 0x80000007.edx, word 7 */ +XEN_CPUFEATURE(HW_PSTATE, 7*32+ 7) /* Hardware Pstates */ XEN_CPUFEATURE(ITSC, 7*32+ 8) /*a Invariant TSC */ +XEN_CPUFEATURE(CPB, 7*32+ 9) /* Core Performance Boost (Turbo) */ XEN_CPUFEATURE(EFRO, 7*32+10) /* APERF/MPERF Read Only interface */ /* AMD-defined CPU features, CPUID level 0x80000008.ebx, word 8 */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:01:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238543.413378 (Exim 4.92) (envelope-from ) id 1mu1Rc-0006sC-SC; Mon, 06 Dec 2021 00:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238543.413378; Mon, 06 Dec 2021 00:01:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rc-0006s4-P9; Mon, 06 Dec 2021 00:01:24 +0000 Received: by outflank-mailman (input) for mailman id 238543; Mon, 06 Dec 2021 00:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rb-0006ro-JL for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rb-0005cf-Ie for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Rb-0007Rs-He for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+1TH3dgkQxY7fmk0j04Mb8oMClw5WThlLR1OfAfHKYY=; b=KhMmRKCZjf0/U4d/e6Pvc6HyHQ ZUJtHnK8GyDqxnqTb1nS97pGV5ikYvIkZ/zZ0hDzHVwrQDq7vLm3egvtIc8HzxQvJQMvQ+uwhjJdE pGHkLlUB01FkDSObKQgQUUmZ4VvJnP4nzu762OV6LVdqXH71ltNQ9WM5Doh2esuIcxco=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: drop clustered_apic_check() hook Message-Id: Date: Mon, 06 Dec 2021 00:01:23 +0000 commit 56829b6ff98515ffdc478edc74cd5bcd437301aa Author: Jan Beulich AuthorDate: Fri Nov 5 13:34:12 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/APIC: drop clustered_apic_check() hook The hook functions have been empty forever (x2APIC) or issuing merely a printk() for a long time (xAPIC). Since that printk() is (a) generally useful (i.e. also in the x2APIC case) and (b) would better only be issued once the final APIC driver to use was determined, move (and generalize) it into connect_bsp_APIC(). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 2 -- xen/arch/x86/apic.c | 6 ++++++ xen/arch/x86/genapic/delivery.c | 10 ---------- xen/arch/x86/genapic/x2apic.c | 6 ------ xen/arch/x86/mpparse.c | 1 - xen/include/asm-x86/genapic.h | 5 ----- xen/include/asm-x86/mach-generic/mach_apic.h | 1 - 7 files changed, 6 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 5e38b4b17c..79c6a3e1f8 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -674,9 +674,7 @@ static void __init acpi_process_madt(void) error = acpi_parse_madt_ioapic_entries(); if (!error) { acpi_ioapic = true; - smp_found_config = true; - clustered_apic_check(); } } if (error == -EINVAL) { diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 030792cabb..55c103aaff 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -243,6 +243,12 @@ void __init connect_bsp_APIC(void) outb(0x70, 0x22); outb(0x01, 0x23); } + + printk("Enabling APIC mode: %s. Using %d I/O APICs\n", + !INT_DEST_MODE ? "Physical" + : init_apic_ldr == init_apic_ldr_flat ? "Flat" + : "Clustered", + nr_ioapics); enable_apic_mode(); } diff --git a/xen/arch/x86/genapic/delivery.c b/xen/arch/x86/genapic/delivery.c index 36ef033e65..548c33f282 100644 --- a/xen/arch/x86/genapic/delivery.c +++ b/xen/arch/x86/genapic/delivery.c @@ -19,11 +19,6 @@ void init_apic_ldr_flat(void) apic_write(APIC_LDR, val); } -void __init clustered_apic_check_flat(void) -{ - printk("Enabling APIC mode: Flat. Using %d I/O APICs\n", nr_ioapics); -} - const cpumask_t *vector_allocation_cpumask_flat(int cpu) { return &cpu_online_map; @@ -43,11 +38,6 @@ void init_apic_ldr_phys(void) /* We only deliver in phys mode - no setup needed. */ } -void __init clustered_apic_check_phys(void) -{ - printk("Enabling APIC mode: Phys. Using %d I/O APICs\n", nr_ioapics); -} - const cpumask_t *vector_allocation_cpumask_phys(int cpu) { return cpumask_of(cpu); diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index 628b441da5..425f1ff460 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -75,10 +75,6 @@ static void init_apic_ldr_x2apic_cluster(void) cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)); } -static void __init clustered_apic_check_x2apic(void) -{ -} - static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(int cpu) { return per_cpu(cluster_cpus, cpu); @@ -175,7 +171,6 @@ static const struct genapic __initconstrel apic_x2apic_phys = { .int_delivery_mode = dest_Fixed, .int_dest_mode = 0 /* physical delivery */, .init_apic_ldr = init_apic_ldr_phys, - .clustered_apic_check = clustered_apic_check_x2apic, .vector_allocation_cpumask = vector_allocation_cpumask_phys, .cpu_mask_to_apicid = cpu_mask_to_apicid_phys, .send_IPI_mask = send_IPI_mask_x2apic_phys, @@ -187,7 +182,6 @@ static const struct genapic __initconstrel apic_x2apic_cluster = { .int_delivery_mode = dest_LowestPrio, .int_dest_mode = 1 /* logical delivery */, .init_apic_ldr = init_apic_ldr_x2apic_cluster, - .clustered_apic_check = clustered_apic_check_x2apic, .vector_allocation_cpumask = vector_allocation_cpumask_x2apic_cluster, .cpu_mask_to_apicid = cpu_mask_to_apicid_x2apic_cluster, .send_IPI_mask = send_IPI_mask_x2apic_cluster, diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index dff02b142b..3df8c65f67 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -410,7 +410,6 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) } } } - clustered_apic_check(); if (!num_processors) printk(KERN_ERR "SMP mptable: no processors registered!\n"); return num_processors; diff --git a/xen/include/asm-x86/genapic.h b/xen/include/asm-x86/genapic.h index 5aa35ceb5f..dd7dfe96a3 100644 --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -32,7 +32,6 @@ struct genapic { int int_delivery_mode; int int_dest_mode; void (*init_apic_ldr)(void); - void (*clustered_apic_check)(void); const cpumask_t *(*vector_allocation_cpumask)(int cpu); unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask); void (*send_IPI_mask)(const cpumask_t *mask, int vector); @@ -54,7 +53,6 @@ extern const struct genapic apic_bigsmp; void send_IPI_self_legacy(uint8_t vector); void init_apic_ldr_flat(void); -void clustered_apic_check_flat(void); unsigned int cpu_mask_to_apicid_flat(const cpumask_t *cpumask); void send_IPI_mask_flat(const cpumask_t *mask, int vector); const cpumask_t *vector_allocation_cpumask_flat(int cpu); @@ -62,14 +60,12 @@ const cpumask_t *vector_allocation_cpumask_flat(int cpu); .int_delivery_mode = dest_LowestPrio, \ .int_dest_mode = 1 /* logical delivery */, \ .init_apic_ldr = init_apic_ldr_flat, \ - .clustered_apic_check = clustered_apic_check_flat, \ .vector_allocation_cpumask = vector_allocation_cpumask_flat, \ .cpu_mask_to_apicid = cpu_mask_to_apicid_flat, \ .send_IPI_mask = send_IPI_mask_flat, \ .send_IPI_self = send_IPI_self_legacy void init_apic_ldr_phys(void); -void clustered_apic_check_phys(void); unsigned int cpu_mask_to_apicid_phys(const cpumask_t *cpumask); void send_IPI_mask_phys(const cpumask_t *mask, int vector); const cpumask_t *vector_allocation_cpumask_phys(int cpu); @@ -77,7 +73,6 @@ const cpumask_t *vector_allocation_cpumask_phys(int cpu); .int_delivery_mode = dest_Fixed, \ .int_dest_mode = 0 /* physical delivery */, \ .init_apic_ldr = init_apic_ldr_phys, \ - .clustered_apic_check = clustered_apic_check_phys, \ .vector_allocation_cpumask = vector_allocation_cpumask_phys, \ .cpu_mask_to_apicid = cpu_mask_to_apicid_phys, \ .send_IPI_mask = send_IPI_mask_phys, \ diff --git a/xen/include/asm-x86/mach-generic/mach_apic.h b/xen/include/asm-x86/mach-generic/mach_apic.h index 75f1e766b0..b6f6361c60 100644 --- a/xen/include/asm-x86/mach-generic/mach_apic.h +++ b/xen/include/asm-x86/mach-generic/mach_apic.h @@ -14,7 +14,6 @@ #define INT_DEST_MODE (genapic.int_dest_mode) #define TARGET_CPUS ((const typeof(cpu_online_map) *)&cpu_online_map) #define init_apic_ldr (genapic.init_apic_ldr) -#define clustered_apic_check (genapic.clustered_apic_check) #define cpu_mask_to_apicid(mask) ({ \ /* \ * There are a number of places where the address of a local variable \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:01:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:01:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238544.413382 (Exim 4.92) (envelope-from ) id 1mu1Rm-0006vG-Tv; Mon, 06 Dec 2021 00:01:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238544.413382; Mon, 06 Dec 2021 00:01:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rm-0006v6-Qq; Mon, 06 Dec 2021 00:01:34 +0000 Received: by outflank-mailman (input) for mailman id 238544; Mon, 06 Dec 2021 00:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rl-0006uq-Mi for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rl-0005cp-Lz for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Rl-0007SL-L6 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/Jvh/x5OElXTVoBzwE1v0UoFJ7CiKKfOyDOemYLDARY=; b=WrZ2umLMJr3uoB0D+POl69G+dO maLdwTxtWRxAvGUDHL1tn5chipz46mvL5wDGnnpj/jcCvI7NqQVCp9Tt2ip4KtZhxzb/NY7mSKXRJ Jgq0IIXIY6YVk68z0iWZiwjrLNDufO6X+K3UHSXfVrQmlLWL1X3Eet+UfI9nX9gWI6Q4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: drop {acpi_madt,mps}_oem_check() hooks Message-Id: Date: Mon, 06 Dec 2021 00:01:33 +0000 commit 501f70b16a09983b6f8a1fb65757f26ec239a017 Author: Jan Beulich AuthorDate: Fri Nov 5 13:34:37 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/APIC: drop {acpi_madt,mps}_oem_check() hooks The hook functions have been empty for a very long time, if not (according to git history) forever. Ditch them alongside the then empty mach_mpparse.h instances and the then unused APICFUNC() macro. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 3 --- xen/arch/x86/genapic/bigsmp.c | 1 - xen/arch/x86/genapic/default.c | 1 - xen/arch/x86/genapic/probe.c | 36 ------------------------- xen/arch/x86/genapic/x2apic.c | 1 - xen/arch/x86/mpparse.c | 3 --- xen/arch/x86/x86_64/acpi_mmcfg.c | 1 - xen/include/asm-x86/genapic.h | 13 +-------- xen/include/asm-x86/mach-default/mach_mpparse.h | 17 ------------ xen/include/asm-x86/mach-generic/mach_mpparse.h | 7 ----- 10 files changed, 1 insertion(+), 82 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 79c6a3e1f8..b101ef0961 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -39,7 +39,6 @@ #include #include /* for hpet_address */ #include -#include #define PREFIX "ACPI: " @@ -75,8 +74,6 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) madt->address); } - acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id); - return 0; } diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index 6808d61d9c..b9d976e8ab 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -8,7 +8,6 @@ #include #include #include -#include #include static __init int force_bigsmp(const struct dmi_system_id *d) diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c index 53ebf20a3f..bfd068cdc6 100644 --- a/xen/arch/x86/genapic/default.c +++ b/xen/arch/x86/genapic/default.c @@ -12,7 +12,6 @@ #include #include #include -#include /* should be called last. */ static __init int probe_default(void) diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index d4d7a554a0..b963dc5ec0 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -78,39 +78,3 @@ void __init generic_apic_probe(void) printk(KERN_INFO "Using APIC driver %s\n", genapic.name); } - -/* These functions can switch the APIC even after the initial ->probe() */ - -int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid) -{ - int i; - for (i = 0; apic_probe[i]; ++i) { - if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { - if (!cmdline_apic && - genapic.name != apic_probe[i]->name) { - genapic = *apic_probe[i]; - printk(KERN_INFO "Switched to APIC driver `%s'.\n", - genapic.name); - } - return 1; - } - } - return 0; -} - -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) -{ - int i; - for (i = 0; apic_probe[i]; ++i) { - if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { - if (!cmdline_apic && - genapic.name != apic_probe[i]->name) { - genapic = *apic_probe[i]; - printk(KERN_INFO "Switched to APIC driver `%s'.\n", - genapic.name); - } - return 1; - } - } - return 0; -} diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index 425f1ff460..9064a0ca46 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -27,7 +27,6 @@ #include #include #include -#include static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus); diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 3df8c65f67..42b5ac7871 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -30,7 +30,6 @@ #include #include -#include #include /* Have we found an MP table */ @@ -326,8 +325,6 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) str[12]=0; printk("Product ID: %s ",str); - mps_oem_check(mpc, oem, str); - printk("APIC at: %#x\n", mpc->mpc_lapic); /* diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c index 650140eec5..0db8f57abb 100644 --- a/xen/arch/x86/x86_64/acpi_mmcfg.c +++ b/xen/arch/x86/x86_64/acpi_mmcfg.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "mmconfig.h" diff --git a/xen/include/asm-x86/genapic.h b/xen/include/asm-x86/genapic.h index dd7dfe96a3..51a65d3e0f 100644 --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -21,13 +21,6 @@ struct genapic { const char *name; int (*probe)(void); - /* When one of the next two hooks returns 1 the genapic - is switched to this. Essentially they are additional probe - functions. */ - int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, - char *productid); - int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); - /* Interrupt delivery parameters ('physical' vs. 'logical flat'). */ int int_delivery_mode; int int_dest_mode; @@ -38,13 +31,9 @@ struct genapic { void (*send_IPI_self)(uint8_t vector); }; -#define APICFUNC(x) .x = x - #define APIC_INIT(aname, aprobe) \ .name = aname, \ - .probe = aprobe, \ - APICFUNC(mps_oem_check), \ - APICFUNC(acpi_madt_oem_check) + .probe = aprobe extern struct genapic genapic; extern const struct genapic apic_default; diff --git a/xen/include/asm-x86/mach-default/mach_mpparse.h b/xen/include/asm-x86/mach-default/mach_mpparse.h deleted file mode 100644 index 6194b77429..0000000000 --- a/xen/include/asm-x86/mach-default/mach_mpparse.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __ASM_MACH_MPPARSE_H -#define __ASM_MACH_MPPARSE_H - -static inline int __init mps_oem_check(struct mp_config_table *mpc, char *oem, - char *productid) -{ - return 0; -} - -/* Hook from generic ACPI tables.c */ -static inline int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) -{ - return 0; -} - - -#endif /* __ASM_MACH_MPPARSE_H */ diff --git a/xen/include/asm-x86/mach-generic/mach_mpparse.h b/xen/include/asm-x86/mach-generic/mach_mpparse.h deleted file mode 100644 index 92f0974027..0000000000 --- a/xen/include/asm-x86/mach-generic/mach_mpparse.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _MACH_MPPARSE_H -#define _MACH_MPPARSE_H 1 - -int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); -int acpi_madt_oem_check(char *oem_id, char *oem_table_id); - -#endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:01:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:01:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238545.413386 (Exim 4.92) (envelope-from ) id 1mu1Rx-0006yv-0p; Mon, 06 Dec 2021 00:01:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238545.413386; Mon, 06 Dec 2021 00:01:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rw-0006yl-Tm; Mon, 06 Dec 2021 00:01:44 +0000 Received: by outflank-mailman (input) for mailman id 238545; Mon, 06 Dec 2021 00:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rv-0006yV-Ps for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Rv-0005ct-PA for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Rv-0007Sz-OH for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hb1+mEdQ9AELfChyRWuB7CLN4368yuriXqb0ihR5dd0=; b=z2pEd5/5GOHnfMjzTCyiaxDcre YbGNiWoakRzFHroqEeO6lsBepkHdaw2dgAQvnil1NXBMOab2BdYCdrWh/Kvly68WnAkD2aUrlXvhz oCX/TBwSQtOYfNgNUsQA8Z+m8JZufFnMLv+KK+oR0gTKtC/WL4q8jHpH3AUfFFN/JbAU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: drop probe_default() Message-Id: Date: Mon, 06 Dec 2021 00:01:43 +0000 commit 0ee901ce4b439ef5a44bf6ac7471e75a20dffbbe Author: Jan Beulich AuthorDate: Fri Nov 5 13:34:57 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/APIC: drop probe_default() The function does nothing but return success. Simply treat absence of a probe hook to mean just this. This then eliminates the (purely theoretical at this point) risk of trying to call through apic_x2apic_{cluster,phys}'s respective NULL pointers. While doing this also eliminate generic_apic_probe()'s "changed" variable: apic_probe[]'s default entry will now be used unconditionally in yet more obvious a way, such that separately setting genapic from apic_default is (hopefully) no longer justified. Yet that was the main purpose of the variable. To help prove that apic_default's probe() hook doesn't get used elsewhere, further make apic_probe[] static at this occasion. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/genapic/default.c | 7 +------ xen/arch/x86/genapic/probe.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c index bfd068cdc6..2c63c1f917 100644 --- a/xen/arch/x86/genapic/default.c +++ b/xen/arch/x86/genapic/default.c @@ -14,12 +14,7 @@ #include /* should be called last. */ -static __init int probe_default(void) -{ - return 1; -} - const struct genapic __initconstrel apic_default = { - APIC_INIT("default", probe_default), + APIC_INIT("default", NULL), GENAPIC_FLAT }; diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index b963dc5ec0..1ee6cd73cd 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -18,7 +18,7 @@ struct genapic __read_mostly genapic; -const struct genapic *const __initconstrel apic_probe[] = { +static const struct genapic *const __initconstrel apic_probe[] = { &apic_bigsmp, &apic_default, /* must be last */ NULL, @@ -59,22 +59,20 @@ custom_param("apic", genapic_apic_force); void __init generic_apic_probe(void) { - bool changed; int i; record_boot_APIC_mode(); check_x2apic_preenabled(); - cmdline_apic = changed = !!genapic.name; - for (i = 0; !changed && apic_probe[i]; i++) { - if (apic_probe[i]->probe()) { - changed = 1; + cmdline_apic = genapic.name; + + for (i = 0; !genapic.name && apic_probe[i]; i++) { + if (!apic_probe[i]->probe || apic_probe[i]->probe()) genapic = *apic_probe[i]; - } } - if (!changed) - genapic = apic_default; + + BUG_ON(!genapic.name); printk(KERN_INFO "Using APIC driver %s\n", genapic.name); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:01:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:01:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238546.413389 (Exim 4.92) (envelope-from ) id 1mu1S7-00072B-25; Mon, 06 Dec 2021 00:01:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238546.413389; Mon, 06 Dec 2021 00:01:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1S6-000723-VM; Mon, 06 Dec 2021 00:01:54 +0000 Received: by outflank-mailman (input) for mailman id 238546; Mon, 06 Dec 2021 00:01:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1S5-00071c-St for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1S5-0005dM-SD for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1S5-0007Tp-RR for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:01:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8uV2EKUtbeE1vC+f9lLCc8jYaFaTjoiFGcunxXD+NT8=; b=xZcL1TULxIWP7trthvmee7a0UA y2ys9pRH1TqVrTEqjsM+82F9CYZ/vG8YYh2AJSoRKQduLJKJm+rOelien3N4lt8v/kH6NOCMK4pzn powrCW5TRrAb8N9I9jIEWTFP+gpUoHygXQ+fP39d1qnNy0MHRPdfNP7dDCqJX087cP44=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/APIC: rename cmdline_apic Message-Id: Date: Mon, 06 Dec 2021 00:01:53 +0000 commit b8a13f487a0f3168e9caeaff20bb978772cee0e7 Author: Jan Beulich AuthorDate: Fri Nov 5 13:35:21 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/APIC: rename cmdline_apic The name hasn't been appropriate for a long time: It covers not only command line overrides, but also x2APIC pre-enabled state. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/genapic/probe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c index 1ee6cd73cd..66bc5ce072 100644 --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -24,7 +24,7 @@ static const struct genapic *const __initconstrel apic_probe[] = { NULL, }; -static bool_t __initdata cmdline_apic; +static bool __initdata forced_apic; void __init generic_bigsmp_probe(void) { @@ -35,7 +35,7 @@ void __init generic_bigsmp_probe(void) * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support */ - if (!cmdline_apic && genapic.name == apic_default.name) + if (!forced_apic && genapic.name == apic_default.name) if (apic_bigsmp.probe()) { genapic = apic_bigsmp; printk(KERN_INFO "Overriding APIC driver with %s\n", @@ -65,7 +65,7 @@ void __init generic_apic_probe(void) check_x2apic_preenabled(); - cmdline_apic = genapic.name; + forced_apic = genapic.name; for (i = 0; !genapic.name && apic_probe[i]; i++) { if (!apic_probe[i]->probe || apic_probe[i]->probe()) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:02:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:02:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238547.413396 (Exim 4.92) (envelope-from ) id 1mu1SH-00075P-4k; Mon, 06 Dec 2021 00:02:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238547.413396; Mon, 06 Dec 2021 00:02:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1SH-00075H-0f; Mon, 06 Dec 2021 00:02:05 +0000 Received: by outflank-mailman (input) for mailman id 238547; Mon, 06 Dec 2021 00:02:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1SF-000750-W9 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1SF-0005df-VR for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1SF-0007V5-Uh for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gEW9WW6Gx0X1Wiler4Ay5651ZHZctj9brW9oXRN7pNQ=; b=FDUfzC8vJ2qNUlaMI0IZmEiE2u 5amKw1/YUp6QvqUdoqI6wLSQ0S9zEIOqaU4Cdtx59US/ythge5lRiOcidt61gzb5ReURzZWypntoT uYJHIhoGuFDv2pXvDS6WwnlnxWTJ0WZDCwRdenJhKWkgt68kiBaNgrrYbZCFQEN/Pg9Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ACPI: drop dead interpreter-related code Message-Id: Date: Mon, 06 Dec 2021 00:02:03 +0000 commit 6de7e460c376ce583b6b0eb4f5bb73b004d1388b Author: Jan Beulich AuthorDate: Fri Nov 5 13:35:46 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/ACPI: drop dead interpreter-related code CONFIG_ACPI_INTERPRETER does not get defined anywhere, the enclosed code wouldn't build, and the default-to-phys logic works differently anyway (see genapic/bigsmp.c:probe_bigsmp()). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/acpi/boot.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index b101ef0961..24702d041c 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -477,16 +477,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) const struct acpi_table_fadt *fadt = container_of(table, const struct acpi_table_fadt, header); -#ifdef CONFIG_ACPI_INTERPRETER - /* initialize sci_int early for INT_SRC_OVR MADT parsing */ - acpi_fadt.sci_int = fadt->sci_int; - - /* initialize rev and apic_phys_dest_mode for x86_64 genapic */ - acpi_fadt.revision = fadt->revision; - acpi_fadt.force_apic_physical_destination_mode = - fadt->force_apic_physical_destination_mode; -#endif - /* detect the location of the ACPI PM Timer */ if (fadt->header.revision >= FADT2_REVISION_ID && fadt->xpm_timer_block.space_id == ACPI_ADR_SPACE_SYSTEM_IO) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:02:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:02:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238548.413398 (Exim 4.92) (envelope-from ) id 1mu1SR-000797-57; Mon, 06 Dec 2021 00:02:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238548.413398; Mon, 06 Dec 2021 00:02:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1SR-00078z-2D; Mon, 06 Dec 2021 00:02:15 +0000 Received: by outflank-mailman (input) for mailman id 238548; Mon, 06 Dec 2021 00:02:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1SQ-00078h-35 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1SQ-0005du-2O for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1SQ-0007WD-1Y for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pnQisZPrA2DsPBbeY6fi6y6IXB2CmW3aBrhk+J4Nt9Y=; b=SYUnWawUmrjd6By1a3bKB8cRdY By/JKobCJDPBpYzAc0SfyJPPgq6LHLgQBiEk4/Q201DrzJWrg9WfIBjHA5cbxcyGcRb7L+iFnbHYG 7k1tAb/rPDSW4j1q0MpYcWumUkumyZ34Vy38lQzxQ8N7MOuWHDjXqnZOYubuGXkGHOl4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/smp: Support NULL IPI function pointers Message-Id: Date: Mon, 06 Dec 2021 00:02:14 +0000 commit 06c30ad7662f0c9fc8bc1c356f8aeaa63fb731ec Author: Andrew Cooper AuthorDate: Wed Nov 17 16:16:23 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 xen/smp: Support NULL IPI function pointers There are several cases where the act of interrupting a remote processor has the required side effect. Explicitly allow NULL function pointers so the calling code doesn't have to provide a stub implementation. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/mm/hap/hap.c | 11 +---------- xen/arch/x86/mm/p2m-ept.c | 11 ++--------- xen/common/smp.c | 6 +++++- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 73575deb0d..5b269ef8b3 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -696,15 +696,6 @@ static void hap_update_cr3(struct vcpu *v, int do_locking, bool noflush) hvm_update_guest_cr3(v, noflush); } -/* - * Dummy function to use with on_selected_cpus in order to trigger a vmexit on - * selected pCPUs. When the VM resumes execution it will get a new ASID/VPID - * and thus a clean TLB. - */ -static void dummy_flush(void *data) -{ -} - static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), void *ctxt) { @@ -737,7 +728,7 @@ static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), * not currently running will already be flushed when scheduled because of * the ASID tickle done in the loop above. */ - on_selected_cpus(mask, dummy_flush, NULL, 0); + on_selected_cpus(mask, NULL, NULL, 0); return true; } diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index b2d57a3ee8..1459f66c00 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1236,14 +1236,6 @@ static void ept_memory_type_changed(struct p2m_domain *p2m) ept_sync_domain(p2m); } -static void __ept_sync_domain(void *info) -{ - /* - * The invalidation will be done before VMENTER (see - * vmx_vmenter_helper()). - */ -} - static void ept_sync_domain_prepare(struct p2m_domain *p2m) { struct domain *d = p2m->domain; @@ -1269,7 +1261,8 @@ static void ept_sync_domain_prepare(struct p2m_domain *p2m) static void ept_sync_domain_mask(struct p2m_domain *p2m, const cpumask_t *mask) { - on_selected_cpus(mask, __ept_sync_domain, p2m, 1); + /* Invalidation will be done in vmx_vmenter_helper(). */ + on_selected_cpus(mask, NULL, NULL, 1); } void ept_sync_domain(struct p2m_domain *p2m) diff --git a/xen/common/smp.c b/xen/common/smp.c index 79f4ebd145..781bcf2c24 100644 --- a/xen/common/smp.c +++ b/xen/common/smp.c @@ -87,7 +87,11 @@ void smp_call_function_interrupt(void) irq_enter(); - if ( call_data.wait ) + if ( unlikely(!func) ) + { + cpumask_clear_cpu(cpu, &call_data.selected); + } + else if ( call_data.wait ) { (*func)(info); smp_mb(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:02:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:02:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238549.413402 (Exim 4.92) (envelope-from ) id 1mu1Sb-0007By-6r; Mon, 06 Dec 2021 00:02:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238549.413402; Mon, 06 Dec 2021 00:02:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sb-0007Bs-3e; Mon, 06 Dec 2021 00:02:25 +0000 Received: by outflank-mailman (input) for mailman id 238549; Mon, 06 Dec 2021 00:02:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sa-0007Bb-6I for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sa-0005fa-5Z for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Sa-0007XI-4h for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=F4dBzGen3P8pmLBdTmysbv/1bBy2dczi+QihwjrVDlY=; b=VIjoIw3KWSssdu18fK7HA74VEp dbMYpVaToNOdNNyCoEkDRxs/i8dytF3rN1o5XtGZIUZQ1LfVf1jmD/9ZxbNRelz6sWI7pnzQUdNHd 9kOwrokrIkV/vxHHhdiXcviM26bZRNx6lG8XB9y6XKNFKVadjHjhxJes7nUWcYjoi3LQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/wait: Remove indirect jump Message-Id: Date: Mon, 06 Dec 2021 00:02:24 +0000 commit f03567bd7e8efc0f667a67905862e6047babdb7a Author: Andrew Cooper AuthorDate: Fri Oct 22 16:07:07 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 xen/wait: Remove indirect jump There is no need for this to be an indirect jump at all. Execution always returns to a specific location, so use a direct jump instead. Use a named label for the jump. As both 1 and 2 have disappeared as labels, rename 3 to skip to better describe its purpose. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/wait.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xen/common/wait.c b/xen/common/wait.c index 24716e7676..9276d76464 100644 --- a/xen/common/wait.c +++ b/xen/common/wait.c @@ -144,18 +144,16 @@ static void __prepare_to_wait(struct waitqueue_vcpu *wqv) "push %%r8; push %%r9; push %%r10; push %%r11;" "push %%r12; push %%r13; push %%r14; push %%r15;" - "call 1f;" - "1: addq $2f-1b,(%%rsp);" "sub %%esp,%%ecx;" "cmp %3,%%ecx;" - "ja 3f;" + "ja .L_skip;" "mov %%rsp,%%rsi;" /* check_wakeup_from_wait() longjmp()'s to this point. */ - "2: rep movsb;" + ".L_wq_resume: rep movsb;" "mov %%rsp,%%rsi;" - "3: pop %%rax;" + ".L_skip:" "pop %%r15; pop %%r14; pop %%r13; pop %%r12;" "pop %%r11; pop %%r10; pop %%r9; pop %%r8;" "pop %%rbp; pop %%rdx; pop %%rbx; pop %%rax" @@ -204,15 +202,14 @@ void check_wakeup_from_wait(void) } /* - * Hand-rolled longjmp(). Returns to the pointer on the top of - * wqv->stack, and lands on a `rep movs` instruction. All other GPRs are - * restored from the stack, so are available for use here. + * Hand-rolled longjmp(). Returns to __prepare_to_wait(), and lands on a + * `rep movs` instruction. All other GPRs are restored from the stack, so + * are available for use here. */ asm volatile ( - "mov %1,%%"__OP"sp; INDIRECT_JMP %[ip]" + "mov %1,%%"__OP"sp; jmp .L_wq_resume;" : : "S" (wqv->stack), "D" (wqv->esp), - "c" ((char *)get_cpu_info() - (char *)wqv->esp), - [ip] "r" (*(unsigned long *)wqv->stack) + "c" ((char *)get_cpu_info() - (char *)wqv->esp) : "memory" ); unreachable(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:02:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:02:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238551.413406 (Exim 4.92) (envelope-from ) id 1mu1Sm-0007F4-8B; Mon, 06 Dec 2021 00:02:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238551.413406; Mon, 06 Dec 2021 00:02:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sm-0007Ew-5A; Mon, 06 Dec 2021 00:02:36 +0000 Received: by outflank-mailman (input) for mailman id 238551; Mon, 06 Dec 2021 00:02:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sk-0007Ek-9e for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sk-0005fl-8o for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Sk-0007YP-81 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7f6ZRZvi1HPsmtPQycYEa6I1ufQR4uzwmMuOOVfFOqA=; b=oLHDDrMDsBf52okElks16Qqe4Q /6/PEqVga1IhZllHrmvFB7hslhI8TC2R8iZxf8DvMHZ8laAyWb/L7Sh+7CzbapltNbbSPuhMRHFjT ZNA7K5L9VLZsK+OeaHzErJ+ILktyIhDWZDXAYNAU9nubeMTEO+L3oxT4W+bttzH40c50=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/IO-APIC: Drop function pointers from __ioapic_{read,write}_entry() Message-Id: Date: Mon, 06 Dec 2021 00:02:34 +0000 commit 245a320ce22752562c2143d0fb406aeb2e334dfb Author: Andrew Cooper AuthorDate: Sun Oct 31 00:03:56 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/IO-APIC: Drop function pointers from __ioapic_{read,write}_entry() Function pointers are expensive, and the raw parameter is a constant at the root of all call trees, meaning that it predicts very well with local branch history. Furthermore, the knock-on effects are quite impressive. $ ../scripts/bloat-o-meter xen-syms-before xen-syms-after add/remove: 0/4 grow/shrink: 3/9 up/down: 459/-823 (-364) Function old new delta __ioapic_write_entry 73 286 +213 __ioapic_read_entry 75 276 +201 save_IO_APIC_setup 182 227 +45 eoi_IO_APIC_irq 241 229 -12 disable_IO_APIC 296 280 -16 mask_IO_APIC_setup 272 240 -32 __io_apic_write 46 - -46 __io_apic_read 46 - -46 io_apic_set_pci_routing 985 930 -55 __io_apic_eoi.part 223 161 -62 io_apic_write 69 - -69 io_apic_read 69 - -69 restore_IO_APIC_setup 325 253 -72 ioapic_guest_write 1413 1333 -80 clear_IO_APIC_pin 447 343 -104 setup_IO_APIC 5148 4988 -160 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/io_apic.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index c3ad9efac8..1c49a0fe14 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -235,11 +235,19 @@ union entry_union { struct IO_APIC_route_entry __ioapic_read_entry( unsigned int apic, unsigned int pin, bool raw) { - unsigned int (*read)(unsigned int, unsigned int) - = raw ? __io_apic_read : io_apic_read; union entry_union eu; - eu.w1 = (*read)(apic, 0x10 + 2 * pin); - eu.w2 = (*read)(apic, 0x11 + 2 * pin); + + if ( raw ) + { + eu.w1 = __io_apic_read(apic, 0x10 + 2 * pin); + eu.w2 = __io_apic_read(apic, 0x11 + 2 * pin); + } + else + { + eu.w1 = io_apic_read(apic, 0x10 + 2 * pin); + eu.w2 = io_apic_read(apic, 0x11 + 2 * pin); + } + return eu.entry; } @@ -259,12 +267,18 @@ void __ioapic_write_entry( unsigned int apic, unsigned int pin, bool raw, struct IO_APIC_route_entry e) { - void (*write)(unsigned int, unsigned int, unsigned int) - = raw ? __io_apic_write : io_apic_write; union entry_union eu = { .entry = e }; - (*write)(apic, 0x11 + 2*pin, eu.w2); - (*write)(apic, 0x10 + 2*pin, eu.w1); + if ( raw ) + { + __io_apic_write(apic, 0x11 + 2 * pin, eu.w2); + __io_apic_write(apic, 0x10 + 2 * pin, eu.w1); + } + else + { + io_apic_write(apic, 0x11 + 2 * pin, eu.w2); + io_apic_write(apic, 0x10 + 2 * pin, eu.w1); + } } static void ioapic_write_entry( -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:02:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:02:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238553.413409 (Exim 4.92) (envelope-from ) id 1mu1Sw-0007Hw-9u; Mon, 06 Dec 2021 00:02:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238553.413409; Mon, 06 Dec 2021 00:02:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Sw-0007Hp-6b; Mon, 06 Dec 2021 00:02:46 +0000 Received: by outflank-mailman (input) for mailman id 238553; Mon, 06 Dec 2021 00:02:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Su-0007Ha-DJ for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Su-0005fv-CV for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1Su-0007ZF-Bo for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4Zt8XI9uCoRm/WidnCPFHY9Tmwcrkwh/6DBoGeiyQ1M=; b=pjpix+yYfQLoQxu90kb71H8SK8 aiKsKDDRrkVmZQu30OisQu/DZdSS5g+qD7LWNOuQI91w90LuxZts0C0igTj46la6zZo+yT5bVJe94 WBuwFLTIFDt+LS8UNsomCAPukqD2/64mxeZmlZTCOPx9cDoiOjgycjmXHp5ZrlkrzN+c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: Remove callback from paging->flush_tlb() hook Message-Id: Date: Mon, 06 Dec 2021 00:02:44 +0000 commit 11d9e114b53045e5f2009a26dad1d0d0f7df441e Author: Andrew Cooper AuthorDate: Wed Nov 17 17:45:21 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/hvm: Remove callback from paging->flush_tlb() hook TLB flushing is a hotpath, and function pointer calls are expensive (especially under retpoline) for what amounts to an identity transform on the data. Just pass the vcpu_bitmap bitmap directly. As we use NULL for all rather than none, introduce a flush_vcpu() helper to avoid the risk of logical errors from opencoding the expression. This also means the viridian callers can avoid writing an all-ones bitmap for the flushing logic to consume. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/hvm.c | 7 +------ xen/arch/x86/hvm/viridian/viridian.c | 34 +++++++++++----------------------- xen/arch/x86/mm/hap/hap.c | 11 ++++++++--- xen/arch/x86/mm/shadow/common.c | 18 +++++++++++------- xen/arch/x86/mm/shadow/private.h | 3 +-- xen/include/asm-x86/paging.h | 11 ++++------- 6 files changed, 36 insertions(+), 48 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index eee365711d..31e9474db0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4047,17 +4047,12 @@ static void hvm_s3_resume(struct domain *d) } } -static bool always_flush(void *ctxt, struct vcpu *v) -{ - return true; -} - static int hvmop_flush_tlb_all(void) { if ( !is_hvm_domain(current->domain) ) return -EINVAL; - return paging_flush_tlb(always_flush, NULL) ? 0 : -ERESTART; + return paging_flush_tlb(NULL) ? 0 : -ERESTART; } static int hvmop_set_evtchn_upcall_vector( diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index efdd60b205..9e1363207f 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -574,13 +574,6 @@ static void vpmask_fill(struct hypercall_vpmask *vpmask) bitmap_fill(vpmask->mask, HVM_MAX_VCPUS); } -static bool vpmask_test(const struct hypercall_vpmask *vpmask, - unsigned int vp) -{ - ASSERT(vp < HVM_MAX_VCPUS); - return test_bit(vp, vpmask->mask); -} - static unsigned int vpmask_first(const struct hypercall_vpmask *vpmask) { return find_first_bit(vpmask->mask, HVM_MAX_VCPUS); @@ -669,17 +662,6 @@ static int hv_vpset_to_vpmask(const struct hv_vpset *set, #undef NR_VPS_PER_BANK } -/* - * Windows should not issue the hypercalls requiring this callback in the - * case where vcpu_id would exceed the size of the mask. - */ -static bool need_flush(void *ctxt, struct vcpu *v) -{ - struct hypercall_vpmask *vpmask = ctxt; - - return vpmask_test(vpmask, v->vcpu_id); -} - union hypercall_input { uint64_t raw; struct { @@ -714,6 +696,7 @@ static int hvcall_flush(const union hypercall_input *input, uint64_t flags; uint64_t vcpu_mask; } input_params; + unsigned long *vcpu_bitmap; /* These hypercalls should never use the fast-call convention. */ if ( input->fast ) @@ -730,18 +713,19 @@ static int hvcall_flush(const union hypercall_input *input, * so err on the safe side. */ if ( input_params.flags & HV_FLUSH_ALL_PROCESSORS ) - vpmask_fill(vpmask); + vcpu_bitmap = NULL; else { vpmask_empty(vpmask); vpmask_set(vpmask, 0, input_params.vcpu_mask); + vcpu_bitmap = vpmask->mask; } /* * A false return means that another vcpu is currently trying * a similar operation, so back off. */ - if ( !paging_flush_tlb(need_flush, vpmask) ) + if ( !paging_flush_tlb(vcpu_bitmap) ) return -ERESTART; output->rep_complete = input->rep_count; @@ -760,6 +744,7 @@ static int hvcall_flush_ex(const union hypercall_input *input, uint64_t flags; struct hv_vpset set; } input_params; + unsigned long *vcpu_bitmap; /* These hypercalls should never use the fast-call convention. */ if ( input->fast ) @@ -770,8 +755,9 @@ static int hvcall_flush_ex(const union hypercall_input *input, sizeof(input_params)) != HVMTRANS_okay ) return -EINVAL; - if ( input_params.flags & HV_FLUSH_ALL_PROCESSORS ) - vpmask_fill(vpmask); + if ( input_params.flags & HV_FLUSH_ALL_PROCESSORS || + input_params.set.format == HV_GENERIC_SET_ALL ) + vcpu_bitmap = NULL; else { union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); @@ -801,13 +787,15 @@ static int hvcall_flush_ex(const union hypercall_input *input, rc = hv_vpset_to_vpmask(set, vpmask); if ( rc ) return rc; + + vcpu_bitmap = vpmask->mask; } /* * A false return means that another vcpu is currently trying * a similar operation, so back off. */ - if ( !paging_flush_tlb(need_flush, vpmask) ) + if ( !paging_flush_tlb(vcpu_bitmap) ) return -ERESTART; output->rep_complete = input->rep_count; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 5b269ef8b3..de4b13565a 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -696,8 +696,13 @@ static void hap_update_cr3(struct vcpu *v, int do_locking, bool noflush) hvm_update_guest_cr3(v, noflush); } -static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), - void *ctxt) +static bool flush_vcpu(const struct vcpu *v, const unsigned long *vcpu_bitmap) +{ + return !vcpu_bitmap || test_bit(v->vcpu_id, vcpu_bitmap); +} + +/* Flush TLB of selected vCPUs. NULL for all. */ +static bool flush_tlb(const unsigned long *vcpu_bitmap) { static DEFINE_PER_CPU(cpumask_t, flush_cpumask); cpumask_t *mask = &this_cpu(flush_cpumask); @@ -712,7 +717,7 @@ static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), { unsigned int cpu; - if ( !flush_vcpu(ctxt, v) ) + if ( !flush_vcpu(v, vcpu_bitmap) ) continue; hvm_asid_flush_vcpu(v); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 8c1b041f71..de09ef5cae 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3069,9 +3069,13 @@ static void sh_clean_dirty_bitmap(struct domain *d) } -/* Fluhs TLB of selected vCPUs. */ -bool shadow_flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), - void *ctxt) +static bool flush_vcpu(const struct vcpu *v, const unsigned long *vcpu_bitmap) +{ + return !vcpu_bitmap || test_bit(v->vcpu_id, vcpu_bitmap); +} + +/* Flush TLB of selected vCPUs. NULL for all. */ +bool shadow_flush_tlb(const unsigned long *vcpu_bitmap) { static DEFINE_PER_CPU(cpumask_t, flush_cpumask); cpumask_t *mask = &this_cpu(flush_cpumask); @@ -3084,12 +3088,12 @@ bool shadow_flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), /* Pause all other vcpus. */ for_each_vcpu ( d, v ) - if ( v != current && flush_vcpu(ctxt, v) ) + if ( v != current && flush_vcpu(v, vcpu_bitmap) ) vcpu_pause_nosync(v); /* Now that all VCPUs are signalled to deschedule, we wait... */ for_each_vcpu ( d, v ) - if ( v != current && flush_vcpu(ctxt, v) ) + if ( v != current && flush_vcpu(v, vcpu_bitmap) ) while ( !vcpu_runnable(v) && v->is_running ) cpu_relax(); @@ -3103,7 +3107,7 @@ bool shadow_flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), { unsigned int cpu; - if ( !flush_vcpu(ctxt, v) ) + if ( !flush_vcpu(v, vcpu_bitmap) ) continue; paging_update_cr3(v, false); @@ -3118,7 +3122,7 @@ bool shadow_flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), /* Done. */ for_each_vcpu ( d, v ) - if ( v != current && flush_vcpu(ctxt, v) ) + if ( v != current && flush_vcpu(v, vcpu_bitmap) ) vcpu_unpause(v); return true; diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index 35efb1b984..e4db8d3254 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -922,8 +922,7 @@ static inline int sh_check_page_has_no_refs(struct page_info *page) } /* Flush the TLB of the selected vCPUs. */ -bool shadow_flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), - void *ctxt); +bool shadow_flush_tlb(const unsigned long *vcpu_bitmap); #endif /* _XEN_SHADOW_PRIVATE_H */ diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 996c2cd038..308f1115dd 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,9 +141,7 @@ struct paging_mode { void (*update_cr3 )(struct vcpu *v, int do_locking, bool noflush); void (*update_paging_modes )(struct vcpu *v); - bool (*flush_tlb )(bool (*flush_vcpu)(void *ctxt, - struct vcpu *v), - void *ctxt); + bool (*flush_tlb )(const unsigned long *vcpu_bitmap); unsigned int guest_levels; @@ -417,11 +415,10 @@ static always_inline unsigned int paging_max_paddr_bits(const struct domain *d) return bits; } -static inline bool paging_flush_tlb(bool (*flush_vcpu)(void *ctxt, - struct vcpu *v), - void *ctxt) +/* Flush selected vCPUs TLBs. NULL for all. */ +static inline bool paging_flush_tlb(const unsigned long *vcpu_bitmap) { - return paging_get_hostmode(current)->flush_tlb(flush_vcpu, ctxt); + return paging_get_hostmode(current)->flush_tlb(vcpu_bitmap); } #endif /* XEN_PAGING_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:02:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:02:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238554.413415 (Exim 4.92) (envelope-from ) id 1mu1T6-0007Mb-DB; Mon, 06 Dec 2021 00:02:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238554.413415; Mon, 06 Dec 2021 00:02:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1T6-0007MS-9T; Mon, 06 Dec 2021 00:02:56 +0000 Received: by outflank-mailman (input) for mailman id 238554; Mon, 06 Dec 2021 00:02:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1T4-0007Kx-GI for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1T4-0005gL-Fb for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1T4-0007bi-Eo for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:02:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WpSW9F6fD7qnUzN7neCR/lixa+uSstTYzy8Tf/pY7UA=; b=Sl0Pl57wsQNtn/QUPJSSgRsKEy QYv62QJm1NcjHSLPqo63mMNU62ogUQHcwPaJyI4lPCPBZsLRI9V+PrQKF9oYhe45yJNG8G5JlnzS6 2U3xBPeEZIx4+RpVyxodM0S6obGh4J3AI+t5y2p6z67VlUWqZs0lpMLvtlr1/PbKzx7c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/dom0: Fix command line parsing issues with dom0_nodes= Message-Id: Date: Mon, 06 Dec 2021 00:02:54 +0000 commit 8969d58404ceddf9994574253965dc46c4308da3 Author: Andrew Cooper AuthorDate: Fri Nov 19 13:16:12 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/dom0: Fix command line parsing issues with dom0_nodes= This is a simple comma separated list, so use the normal form. * Don't cease processing subsequent elements on an error * Do report -EINVAL for things like `dom0_nodes=4foo` * Don't opencode the cmdline_strcmp() helper Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/dom0_build.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index fe24e11b37..5a7441ed5b 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -169,30 +169,37 @@ bool __initdata dom0_affinity_relaxed; static int __init parse_dom0_nodes(const char *s) { + const char *ss; + int rc = 0; + do { + ss = strchr(s, ','); + if ( !ss ) + ss = strchr(s, '\0'); + if ( isdigit(*s) ) { + const char *endp; + if ( dom0_nr_pxms >= ARRAY_SIZE(dom0_pxms) ) - return -E2BIG; - dom0_pxms[dom0_nr_pxms] = simple_strtoul(s, &s, 0); - if ( !*s || *s == ',' ) - ++dom0_nr_pxms; + rc = -E2BIG; + else if ( (dom0_pxms[dom0_nr_pxms] = simple_strtoul(s, &endp, 0), + endp != ss) ) + rc = -EINVAL; + else + dom0_nr_pxms++; } - else if ( !strncmp(s, "relaxed", 7) && (!s[7] || s[7] == ',') ) - { + else if ( !cmdline_strcmp(s, "relaxed") ) dom0_affinity_relaxed = true; - s += 7; - } - else if ( !strncmp(s, "strict", 6) && (!s[6] || s[6] == ',') ) - { + else if ( !cmdline_strcmp(s, "strict") ) dom0_affinity_relaxed = false; - s += 6; - } else - return -EINVAL; - } while ( *s++ == ',' ); + rc = -EINVAL; - return s[-1] ? -EINVAL : 0; + s = ss + 1; + } while ( *ss ); + + return rc; } custom_param("dom0_nodes", parse_dom0_nodes); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:03:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:03:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238555.413418 (Exim 4.92) (envelope-from ) id 1mu1TG-0007Pl-De; Mon, 06 Dec 2021 00:03:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238555.413418; Mon, 06 Dec 2021 00:03:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TG-0007Pd-As; Mon, 06 Dec 2021 00:03:06 +0000 Received: by outflank-mailman (input) for mailman id 238555; Mon, 06 Dec 2021 00:03:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TE-0007PJ-JD for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TE-0005gi-IY for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1TE-0007cx-Hu for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jVZ1j5bB7LcHuJjspPcmsfiJsaju9AKq2jouoH+Rtvo=; b=BW1sZc1tszKdiqq8zxKi1sYWfI 2MOMT+e5Q4w2GpH/i5WQDoZPNVmvx0+bPkJnVdt4/Jwr3Uf6p3ls0+1tH07s6qqSDuVheH+Wb1KDv QYEk1szQ/2ClIOIfwPUz78KU3zmMKPotZuWYvtw6FmDZnEoWaoNQKYsPIMkXqDbsx2nw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Collect PERFC_exceptions stats for IST vectors too Message-Id: Date: Mon, 06 Dec 2021 00:03:04 +0000 commit d9f60a924c03761081b99145a51bc85ee54efcdc Author: Andrew Cooper AuthorDate: Fri Oct 8 10:47:07 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/traps: Collect PERFC_exceptions stats for IST vectors too This causes NMIs, #DB and #MC to be counted, rather than being reported as 0. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/entry.S | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index d5998acf88..3caa565476 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -1005,6 +1005,13 @@ handle_ist_exception: #endif movq %rsp,%rdi movzbl UREGS_entry_vector(%rsp),%eax + +#ifdef CONFIG_PERF_COUNTERS + lea per_cpu__perfcounters(%rip), %rcx + add STACK_CPUINFO_FIELD(per_cpu_offset)(%r14), %rcx + incl ASM_PERFC_exceptions * 4(%rcx, %rax, 4) +#endif + leaq exception_table(%rip),%rdx mov (%rdx, %rax, 8), %rdx INDIRECT_CALL %rdx -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:03:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:03:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238556.413422 (Exim 4.92) (envelope-from ) id 1mu1TQ-0007Sa-FF; Mon, 06 Dec 2021 00:03:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238556.413422; Mon, 06 Dec 2021 00:03:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TQ-0007SS-CF; Mon, 06 Dec 2021 00:03:16 +0000 Received: by outflank-mailman (input) for mailman id 238556; Mon, 06 Dec 2021 00:03:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TO-0007SH-ME for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TO-0005gm-La for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1TO-0007dq-Kw for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=L1WAmIlASwodUl8YRTHdL7/TnvLgp6QMNL8KOaWU+Fs=; b=C8QVMs1KvRbYZV+6le7u83dUNn nzjo3v86PSr6zas4uglUFNnICCjyXqZtNuVBIyEBTQ17ZVu3ZxCnuFBDiuCMFU8+3WkdUmybOsrZC hNXQX/R8tQXL03Rfx9d78h8n95VLtYMBge/iBraiKlUdIcQElpZ59umEV3VlYHPTnCyk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Drop dummy_nmi_callback() Message-Id: Date: Mon, 06 Dec 2021 00:03:14 +0000 commit 04c48ccd75963891e377c5f27dd7411dde1a4286 Author: Andrew Cooper AuthorDate: Fri Oct 8 13:11:21 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/traps: Drop dummy_nmi_callback() The unconditional nmi_callback() call in do_nmi() calls dummy_nmi_callback() in all cases other than for a few specific and rare tasks (alternative patching, microcode loading, etc). Indirect calls are expensive under retpoline, so rearrange the logic to use NULL as the default, and skip the call entirely in the common case. While rearranging the code, fold the exit paths. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 84c9d9686a..3bc4cd5e1e 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1869,29 +1869,23 @@ static void unknown_nmi_error(const struct cpu_user_regs *regs, } } -static int dummy_nmi_callback(const struct cpu_user_regs *regs, int cpu) -{ - return 0; -} - -static nmi_callback_t *nmi_callback = dummy_nmi_callback; +static nmi_callback_t *__read_mostly nmi_callback; DEFINE_PER_CPU(unsigned int, nmi_count); void do_nmi(const struct cpu_user_regs *regs) { unsigned int cpu = smp_processor_id(); + nmi_callback_t *callback; unsigned char reason = 0; bool handle_unknown = false; this_cpu(nmi_count)++; nmi_enter(); - if ( nmi_callback(regs, cpu) ) - { - nmi_exit(); - return; - } + callback = ACCESS_ONCE(nmi_callback); + if ( unlikely(callback) && callback(regs, cpu) ) + goto out; /* * Accessing port 0x61 may trap to SMM which has been actually @@ -1918,6 +1912,7 @@ void do_nmi(const struct cpu_user_regs *regs) unknown_nmi_error(regs, reason); } + out: nmi_exit(); } @@ -1932,7 +1927,7 @@ nmi_callback_t *set_nmi_callback(nmi_callback_t *callback) void unset_nmi_callback(void) { - nmi_callback = dummy_nmi_callback; + nmi_callback = NULL; } bool nmi_check_continuation(void) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 00:03:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 00:03:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238557.413426 (Exim 4.92) (envelope-from ) id 1mu1Ta-0007VW-Ge; Mon, 06 Dec 2021 00:03:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238557.413426; Mon, 06 Dec 2021 00:03:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1Ta-0007VO-Dk; Mon, 06 Dec 2021 00:03:26 +0000 Received: by outflank-mailman (input) for mailman id 238557; Mon, 06 Dec 2021 00:03:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TY-0007V1-Pf for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mu1TY-0005gr-P3 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mu1TY-0007ej-OI for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 00:03:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GKyxKjDccADDxxCYjFijQsFfF+MzznpGR1gB9t063qQ=; b=lTsFb/6t9dOr4g46fDe3ry41Fn ozwxcUJ69f3ZaOxy4CPaqTsDwNe6h1Tj2DVXKdmZuuOTJr4vcmTXXUM9crQ9FD0VXiZnKXIsPw0LK 6olc1jBpMhKVxfTuIzywBbPzVVG3eAoT5SN4jBtyG0WMKds7NUHWrPIur49lbKmZSbrY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/crash: Drop manual hooking of exception_table[] Message-Id: Date: Mon, 06 Dec 2021 00:03:24 +0000 commit e7f147bf4ac725492962a501da72f5ab6be682db Author: Andrew Cooper AuthorDate: Thu Oct 7 14:02:10 2021 +0100 Commit: Andrew Cooper CommitDate: Mon Nov 29 13:53:05 2021 +0000 x86/crash: Drop manual hooking of exception_table[] NMI hooking in the crash path has undergone several revisions since its introduction. What we have now is not sufficiently different from the regular nmi_callback() mechanism to warrant special casing. Use set_nmi_callback() directly, and do away with patching a read-only data structure via a read-write alias. This also means that the vmx_vmexit_handler() can and should call do_nmi() directly, rather than indirecting through the exception table to pick up the crash path hook. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/crash.c | 15 ++------------- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/traps.c | 5 +++++ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 0611b4fb9b..f6264946a6 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -36,10 +36,8 @@ static unsigned int crashing_cpu; static DEFINE_PER_CPU_READ_MOSTLY(bool, crash_save_done); /* This becomes the NMI handler for non-crashing CPUs, when Xen is crashing. */ -static void noreturn do_nmi_crash(const struct cpu_user_regs *regs) +static int noreturn do_nmi_crash(const struct cpu_user_regs *regs, int cpu) { - unsigned int cpu = smp_processor_id(); - stac(); /* nmi_shootdown_cpus() should ensure that this assertion is correct. */ @@ -136,16 +134,7 @@ static void nmi_shootdown_cpus(void) SYS_DESC_irq_gate, 0, &trap_nop); set_ist(&idt_tables[cpu][TRAP_machine_check], IST_NONE); - /* - * Ideally would be: - * exception_table[TRAP_nmi] = &do_nmi_crash; - * - * but the exception_table is read only. Access it via its directmap - * mappings. - */ - write_atomic((unsigned long *)__va(__pa(&exception_table[TRAP_nmi])), - (unsigned long)&do_nmi_crash); - + set_nmi_callback(do_nmi_crash); smp_send_nmi_allbutself(); msecs = 1000; /* Wait at most a second for the other cpus to stop */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d403e2d806..37c31c08b9 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3887,7 +3887,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) ((intr_info & INTR_INFO_INTR_TYPE_MASK) == MASK_INSR(X86_EVENTTYPE_NMI, INTR_INFO_INTR_TYPE_MASK)) ) { - exception_table[TRAP_nmi](regs); + do_nmi(regs); enable_nmis(); } break; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3bc4cd5e1e..6d7d88c3c4 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1883,6 +1883,11 @@ void do_nmi(const struct cpu_user_regs *regs) this_cpu(nmi_count)++; nmi_enter(); + /* + * Think carefully before putting any logic before this point. + * nmi_callback() might be the crash quiesce... + */ + callback = ACCESS_ONCE(nmi_callback); if ( unlikely(callback) && callback(regs, cpu) ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 13:22:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 13:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238881.413994 (Exim 4.92) (envelope-from ) id 1muDwU-0007Ti-6v; Mon, 06 Dec 2021 13:22:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238881.413994; Mon, 06 Dec 2021 13:22:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwU-0007TY-41; Mon, 06 Dec 2021 13:22:06 +0000 Received: by outflank-mailman (input) for mailman id 238881; Mon, 06 Dec 2021 13:22:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwS-0007St-Rg for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwS-0005qb-PD for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muDwS-0000OL-OC for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kI6U2+OG3+NSXAoarwdJpl3/jhSc8TordA2N76NCW9o=; b=jyVoJ0P2/t/xKtOKF8Yd/Ai/kU WjnqqPg8VaogwVpSk8s6FhDTgFT3FcLa+qiqcQLX9N2z9Um3BnlefdeUYcDXXLQCDjq70HNtl0Aga 1BG8qy4ip77FAZmQzV2ckIKg9dLKT/2ewC1vVzonVOIGb3eiGDWSGx7a7qGJwtBODNlI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/shadow: defer/avoid paging_mfn_is_dirty() invocation Message-Id: Date: Mon, 06 Dec 2021 13:22:04 +0000 commit b4411416fee92cea6cd7a04bfda95bdf377f631e Author: Jan Beulich AuthorDate: Mon Dec 6 14:10:42 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:10:42 2021 +0100 x86/shadow: defer/avoid paging_mfn_is_dirty() invocation paging_mfn_is_dirty() is moderately expensive, so avoid its use unless its result might actually change anything. This means moving the surrounding if() down below all other checks that can result in clearing _PAGE_RW from sflags, in order to then check whether _PAGE_RW is actually still set there before calling the function. While moving the block of code, fold two if()s and make a few style adjustments. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7b8f4dd13b..be617281fc 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -604,23 +604,6 @@ _sh_propagate(struct vcpu *v, && !(gflags & _PAGE_DIRTY)) ) sflags &= ~_PAGE_RW; - // shadow_mode_log_dirty support - // - // Only allow the guest write access to a page a) on a demand fault, - // or b) if the page is already marked as dirty. - // - // (We handle log-dirty entirely inside the shadow code, without using the - // p2m_ram_logdirty p2m type: only HAP uses that.) - if ( unlikely((level == 1) && shadow_mode_log_dirty(d)) ) - { - if ( mfn_valid(target_mfn) ) { - if ( ft & FETCH_TYPE_WRITE ) - paging_mark_dirty(d, target_mfn); - else if ( !paging_mfn_is_dirty(d, target_mfn) ) - sflags &= ~_PAGE_RW; - } - } - #ifdef CONFIG_HVM if ( unlikely(level == 1) && is_hvm_domain(d) ) { @@ -661,6 +644,25 @@ _sh_propagate(struct vcpu *v, ) ) sflags &= ~_PAGE_RW; + /* + * shadow_mode_log_dirty support + * + * Only allow the guest write access to a page a) on a demand fault, + * or b) if the page is already marked as dirty. + * + * (We handle log-dirty entirely inside the shadow code, without using the + * p2m_ram_logdirty p2m type: only HAP uses that.) + */ + if ( level == 1 && unlikely(shadow_mode_log_dirty(d)) && + mfn_valid(target_mfn) ) + { + if ( ft & FETCH_TYPE_WRITE ) + paging_mark_dirty(d, target_mfn); + else if ( (sflags & _PAGE_RW) && + !paging_mfn_is_dirty(d, target_mfn) ) + sflags &= ~_PAGE_RW; + } + // PV guests in 64-bit mode use two different page tables for user vs // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. // It is always shadowed as present... -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 13:22:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 13:22:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238885.413998 (Exim 4.92) (envelope-from ) id 1muDwe-0007f3-8V; Mon, 06 Dec 2021 13:22:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238885.413998; Mon, 06 Dec 2021 13:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwe-0007ex-5a; Mon, 06 Dec 2021 13:22:16 +0000 Received: by outflank-mailman (input) for mailman id 238885; Mon, 06 Dec 2021 13:22:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwc-0007en-TF for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwc-0005qf-SN for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muDwc-0000Ph-RQ for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=voApElnnx0HPe4M/56m0qy3sCLk1qiEJqQPWY054UvA=; b=OXX2SPwlF7mj68nGVpAd+O0Kjv 3k1dwWqFnClo9SOf8yrNphVBuByo1ZEut/QCkGW0hzv4bBEYX+3jGc0RdgEypFtQdJS4QcTxeO5ef 9bDzD17AGTKyjkoDFnwjDyUazp1c67N06LLHEQh667vJJBfENgtI0MDcKj16rEPZSpmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PoD: HVM guests can't pin their pages Message-Id: Date: Mon, 06 Dec 2021 13:22:14 +0000 commit 8553b17cc218046408db0fb96dfe750bce7445b9 Author: Jan Beulich AuthorDate: Mon Dec 6 14:12:09 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:12:09 2021 +0100 x86/PoD: HVM guests can't pin their pages Pinning is a PV concept, used there only for page table pages. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m-pod.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index d8d1a0ce7e..9c4c0caccb 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -271,9 +271,6 @@ p2m_pod_set_cache_target(struct p2m_domain *p2m, unsigned long pod_target, int p goto out; } - if ( test_and_clear_bit(_PGT_pinned, &(page+i)->u.inuse.type_info) ) - put_page_and_type(page + i); - put_page_alloc_ref(page + i); put_page(page + i); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 13:22:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 13:22:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238886.414003 (Exim 4.92) (envelope-from ) id 1muDwo-0007kA-AV; Mon, 06 Dec 2021 13:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238886.414003; Mon, 06 Dec 2021 13:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwo-0007k2-7K; Mon, 06 Dec 2021 13:22:26 +0000 Received: by outflank-mailman (input) for mailman id 238886; Mon, 06 Dec 2021 13:22:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwn-0007jf-0p for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwm-0005r1-WE for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muDwm-0000S7-VE for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W8M3XeYF7ZScVJWMxHZqFNhc64tCZoN36nm+ejae9UA=; b=FTQ83v7GVpZmvtbhQXsUxLE7G5 C77TMDPnolX7MUlCOdEU9W2ej7iav3wNYCxnVO6s3gN3O0PifbRMT7lraWXDUh76trSZH1bcFxdvn UCX/OdSZk6KwBBZNjPBYxcWNlPdLKhrMBHiVnPwjyliwWTlMecXWu/aB2dY9PJt2ZBSw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/mm: don't open-code p2m_is_pod() Message-Id: Date: Mon, 06 Dec 2021 13:22:24 +0000 commit c80878c3203d6ddb80f6c5ca4f4c83a5fc042ebe Author: Jan Beulich AuthorDate: Mon Dec 6 14:13:03 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:13:03 2021 +0100 x86/mm: don't open-code p2m_is_pod() Replace all comparisons against p2m_populate_on_demand (outside of switch() statements) with the designated predicate. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m-ept.c | 6 +++--- xen/arch/x86/mm/p2m-pod.c | 6 +++--- xen/arch/x86/mm/p2m-pt.c | 11 +++++------ xen/arch/x86/mm/p2m.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 6 +++--- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 1459f66c00..a4f5fc4b0d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -344,7 +344,7 @@ static int ept_next_level(struct p2m_domain *p2m, bool_t read_only, { int rc; - if ( e.sa_p2mt == p2m_populate_on_demand ) + if ( p2m_is_pod(e.sa_p2mt) ) return GUEST_TABLE_POD_PAGE; if ( read_only ) @@ -1071,7 +1071,7 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, index = gfn_remainder >> (i * EPT_TABLE_ORDER); ept_entry = table + index; - if ( ept_entry->sa_p2mt == p2m_populate_on_demand ) + if ( p2m_is_pod(ept_entry->sa_p2mt) ) { if ( !(q & P2M_ALLOC) ) { @@ -1478,7 +1478,7 @@ static void ept_dump_p2m_table(unsigned char key) ept_entry = table + (gfn_remainder >> order); if ( ret != GUEST_TABLE_MAP_FAILED && is_epte_valid(ept_entry) ) { - if ( ept_entry->sa_p2mt == p2m_populate_on_demand ) + if ( p2m_is_pod(ept_entry->sa_p2mt) ) printk("gfn: %13lx order: %2d PoD\n", gfn, order); else printk("gfn: %13lx order: %2d mfn: %13lx %c%c%c %c%c%c\n", diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9c4c0caccb..afee09ab40 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -540,7 +540,7 @@ decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) p2m->get_entry(p2m, gfn_add(gfn, i), &t, &a, 0, &cur_order, NULL); n = 1UL << min(order, cur_order); - if ( t == p2m_populate_on_demand ) + if ( p2m_is_pod(t) ) pod += n; else if ( p2m_is_ram(t) ) ram += n; @@ -615,7 +615,7 @@ decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) if ( order < cur_order ) cur_order = order; n = 1UL << cur_order; - if ( t == p2m_populate_on_demand ) + if ( p2m_is_pod(t) ) { /* This shouldn't be able to fail */ if ( p2m_set_entry(p2m, gfn_add(gfn, i), INVALID_MFN, cur_order, @@ -1329,7 +1329,7 @@ mark_populate_on_demand(struct domain *d, unsigned long gfn_l, p2m->get_entry(p2m, gfn_add(gfn, i), &ot, &a, 0, &cur_order, NULL); n = 1UL << min(order, cur_order); - if ( ot == p2m_populate_on_demand ) + if ( p2m_is_pod(ot) ) { /* Count how many PoD entries we'll be replacing if successful */ pod_count += n; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 09c99d78aa..ef3f8e02a4 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -841,7 +841,7 @@ pod_retry_l3: flags = l3e_get_flags(*l3e); if ( !(flags & _PAGE_PRESENT) ) { - if ( p2m_flags_to_type(flags) == p2m_populate_on_demand ) + if ( p2m_is_pod(p2m_flags_to_type(flags)) ) { if ( q & P2M_ALLOC ) { @@ -884,7 +884,7 @@ pod_retry_l2: if ( !(flags & _PAGE_PRESENT) ) { /* PoD: Try to populate a 2-meg chunk */ - if ( p2m_flags_to_type(flags) == p2m_populate_on_demand ) + if ( p2m_is_pod(p2m_flags_to_type(flags)) ) { if ( q & P2M_ALLOC ) { if ( p2m_pod_demand_populate(p2m, gfn_, PAGE_ORDER_2M) ) @@ -923,7 +923,7 @@ pod_retry_l1: if ( !(flags & _PAGE_PRESENT) && !p2m_is_paging(l1t) ) { /* PoD: Try to populate */ - if ( l1t == p2m_populate_on_demand ) + if ( p2m_is_pod(l1t) ) { if ( q & P2M_ALLOC ) { if ( p2m_pod_demand_populate(p2m, gfn_, PAGE_ORDER_4K) ) @@ -1094,8 +1094,7 @@ static long p2m_pt_audit_p2m(struct p2m_domain *p2m) if ( !(l2e_get_flags(l2e[i2]) & _PAGE_PRESENT) ) { if ( (l2e_get_flags(l2e[i2]) & _PAGE_PSE) - && ( p2m_flags_to_type(l2e_get_flags(l2e[i2])) - == p2m_populate_on_demand ) ) + && p2m_is_pod(p2m_flags_to_type(l2e_get_flags(l2e[i2]))) ) entry_count+=SUPERPAGE_PAGES; gfn += 1 << (L2_PAGETABLE_SHIFT - PAGE_SHIFT); continue; @@ -1132,7 +1131,7 @@ static long p2m_pt_audit_p2m(struct p2m_domain *p2m) type = p2m_flags_to_type(l1e_get_flags(l1e[i1])); if ( !(l1e_get_flags(l1e[i1]) & _PAGE_PRESENT) ) { - if ( type == p2m_populate_on_demand ) + if ( p2m_is_pod(type) ) entry_count++; continue; } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index def1695cf0..1d5a87a969 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -992,7 +992,7 @@ guest_physmap_add_entry(struct domain *d, gfn_t gfn, mfn_t mfn, ASSERT(mfn_valid(omfn)); set_gpfn_from_mfn(mfn_x(omfn), INVALID_M2P_ENTRY); } - else if ( ot == p2m_populate_on_demand ) + else if ( p2m_is_pod(ot) ) { /* Count how man PoD entries we'll be replacing if successful */ pod_count++; diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index be617281fc..bddef53163 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1478,7 +1478,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) mfn_t gl3mfn = get_gfn_query_unlocked(d, gfn_x(gl3gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl3mfn = get_shadow_status(d, gl3mfn, SH_type_l3_shadow); - else if ( p2mt != p2m_populate_on_demand ) + else if ( !p2m_is_pod(p2mt) ) result |= SHADOW_SET_ERROR; #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) @@ -1537,7 +1537,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) mfn_t gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl2mfn = get_shadow_status(d, gl2mfn, SH_type_l2_shadow); - else if ( p2mt != p2m_populate_on_demand ) + else if ( !p2m_is_pod(p2mt) ) result |= SHADOW_SET_ERROR; #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) @@ -1588,7 +1588,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) mfn_t gl1mfn = get_gfn_query_unlocked(d, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl1mfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); - else if ( p2mt != p2m_populate_on_demand ) + else if ( !p2m_is_pod(p2mt) ) result |= SHADOW_SET_ERROR; } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 13:22:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 13:22:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238887.414007 (Exim 4.92) (envelope-from ) id 1muDwy-0007no-Bd; Mon, 06 Dec 2021 13:22:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238887.414007; Mon, 06 Dec 2021 13:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwy-0007ng-8n; Mon, 06 Dec 2021 13:22:36 +0000 Received: by outflank-mailman (input) for mailman id 238887; Mon, 06 Dec 2021 13:22:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwx-0007nU-49 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDwx-0005rC-3R for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muDwx-0000T9-2V for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wGHyWQPIevaCdw8jJD4+LR7oWXgxMEzHR/MEDB7xZRg=; b=MddZdJicNjV/0vTIR50Ze/e9Tn LYlEBMBKDGdfWhC/iAYMagWfXO6GWAw3j4Mso2QU38LgHbXiV1zD4SENmZuU06aUDiy1DKzT0MR/Z inabQt9dSd4XTR5Eash/iHKbukYmOWBTEHTOmXjh0ZHoqW/cJoK4Hjd88/22T603BI+w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: fail virt-to-linear conversion for insn fetches from non-code segments Message-Id: Date: Mon, 06 Dec 2021 13:22:35 +0000 commit 311297f4216a4387bdae6df6cfbb1f5edb06618a Author: Jan Beulich AuthorDate: Mon Dec 6 14:15:05 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:15:05 2021 +0100 x86/HVM: fail virt-to-linear conversion for insn fetches from non-code segments Just like (in protected mode) reads may not go to exec-only segments and writes may not go to non-writable ones, insn fetches may not access data segments. Fixes: 623e83716791 ("hvm: Support hardware task switching") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 31e9474db0..7658f95aee 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2551,6 +2551,9 @@ bool hvm_vcpu_virtual_to_linear( */ ASSERT(seg < x86_seg_none); + /* However, check that insn fetches only ever specify CS. */ + ASSERT(access_type != hvm_access_insn_fetch || seg == x86_seg_cs); + if ( !(v->arch.hvm.guest_cr[0] & X86_CR0_PE) ) { /* @@ -2615,10 +2618,17 @@ bool hvm_vcpu_virtual_to_linear( if ( (reg->type & 0xa) == 0x8 ) goto out; /* execute-only code segment */ break; + case hvm_access_write: if ( (reg->type & 0xa) != 0x2 ) goto out; /* not a writable data segment */ break; + + case hvm_access_insn_fetch: + if ( !(reg->type & 0x8) ) + goto out; /* not a code segment */ + break; + default: break; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 13:22:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 13:22:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238888.414011 (Exim 4.92) (envelope-from ) id 1muDx8-0007si-Dc; Mon, 06 Dec 2021 13:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238888.414011; Mon, 06 Dec 2021 13:22:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDx8-0007sa-AN; Mon, 06 Dec 2021 13:22:46 +0000 Received: by outflank-mailman (input) for mailman id 238888; Mon, 06 Dec 2021 13:22:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDx7-0007rV-8X for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDx7-0005rc-7h for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muDx7-0000UO-6e for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oZeLKdAXi5JmNENcSz/HBATXZrP4yY8l76RBzudAIA8=; b=X9/duESybsvB7l5h3BAY3EOyY8 d487oLtUW0p5JUToZ0ySZvukuXY8qi4aQcf1hvc9fH7qQbkdiZ8JEFb4K6EgKeFNAY2qW4LN93u3O BYiGauei72JRtf3zIuLrLuHcjGRE82L7fkau1tL7D89SMFwvcpjjTZyfsXBJ4xAKu9S0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] EFI: move efi-boot.h inclusion point Message-Id: Date: Mon, 06 Dec 2021 13:22:45 +0000 commit 1f9540cd8eb63cce7702d6791093b871198a9afe Author: Jan Beulich AuthorDate: Mon Dec 6 14:15:54 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:15:54 2021 +0100 EFI: move efi-boot.h inclusion point When it was introduced, it was imo placed way too high up, making it necessary to forward-declare way too many static functions. Move it down together with - the efi_check_dt_boot() stub, which afaict was deliberately placed immediately ahead of the #include, - blexit(), because of its use of the efi_arch_blexit() hook. Move up get_value() and set_color() to before the inclusion so their forward declarations can also be zapped. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Luca Fancellu --- xen/common/efi/boot.c | 193 +++++++++++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 103 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 8fd5e2d078..114ea8278f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -111,25 +111,10 @@ struct file { }; }; -static CHAR16 *FormatDec(UINT64 Val, CHAR16 *Buffer); -static CHAR16 *FormatHex(UINT64 Val, UINTN Width, CHAR16 *Buffer); -static void DisplayUint(UINT64 Val, INTN Width); -static CHAR16 *wstrcpy(CHAR16 *d, const CHAR16 *s); -static void PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode); -static char *get_value(const struct file *cfg, const char *section, - const char *item); -static char *split_string(char *s); -static CHAR16 *s2w(union string *str); -static char *w2s(const union string *str); -static EFI_FILE_HANDLE get_parent_handle(EFI_LOADED_IMAGE *loaded_image, - CHAR16 **leaf); static bool read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, struct file *file, const char *options); static bool read_section(const EFI_LOADED_IMAGE *image, const CHAR16 *name, struct file *file, const char *options); -static size_t wstrlen(const CHAR16 * s); -static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz); -static bool match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2); static void efi_init(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable); static void efi_console_set_mode(void); @@ -168,19 +153,6 @@ static void __init PrintErr(const CHAR16 *s) StdErr->OutputString(StdErr, (CHAR16 *)s ); } -#ifndef CONFIG_HAS_DEVICE_TREE -static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) -{ - return 0; -} -#endif - -/* - * Include architecture specific implementation here, which references the - * static globals defined above. - */ -#include "efi-boot.h" - static CHAR16 *__init FormatDec(UINT64 Val, CHAR16 *Buffer) { if ( Val >= 10 ) @@ -291,30 +263,6 @@ static bool __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) !memcmp(guid1->Data4, guid2->Data4, sizeof(guid1->Data4)); } -void __init noreturn blexit(const CHAR16 *str) -{ - if ( str ) - PrintStr(str); - PrintStr(newline); - - if ( !efi_bs ) - efi_arch_halt(); - - if ( cfg.need_to_free ) - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - if ( kernel.need_to_free ) - efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); - if ( ramdisk.need_to_free ) - efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size)); - if ( xsm.need_to_free ) - efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); - - efi_arch_blexit(); - - efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); - unreachable(); /* not reached */ -} - /* generic routine for printing error messages */ static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) { @@ -542,6 +490,7 @@ static CHAR16 *__init point_tail(CHAR16 *fn) break; } } + /* * Truncate string at first space, and return pointer * to remainder of string, if any/ NULL returned if @@ -559,6 +508,95 @@ static char * __init split_string(char *s) return NULL; } +static char *__init get_value(const struct file *cfg, const char *section, + const char *item) +{ + char *ptr = cfg->str, *end = ptr + cfg->size; + size_t slen = section ? strlen(section) : 0, ilen = strlen(item); + bool match = !slen; + + for ( ; ptr < end; ++ptr ) + { + switch ( *ptr ) + { + case 0: + continue; + case '[': + if ( !slen ) + break; + if ( match ) + return NULL; + match = strncmp(++ptr, section, slen) == 0 && ptr[slen] == ']'; + break; + default: + if ( match && strncmp(ptr, item, ilen) == 0 && ptr[ilen] == '=' ) + { + ptr += ilen + 1; + /* strip off any leading spaces */ + while ( *ptr && isspace(*ptr) ) + ptr++; + return ptr; + } + break; + } + ptr += strlen(ptr); + } + return NULL; +} + +static int __init __maybe_unused set_color(uint32_t mask, int bpp, + uint8_t *pos, uint8_t *sz) +{ + if ( bpp < 0 ) + return bpp; + if ( !mask ) + return -EINVAL; + for ( *pos = 0; !(mask & 1); ++*pos ) + mask >>= 1; + for ( *sz = 0; mask & 1; ++*sz) + mask >>= 1; + if ( mask ) + return -EINVAL; + return max(*pos + *sz, bpp); +} + +#ifndef CONFIG_HAS_DEVICE_TREE +static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) +{ + return 0; +} +#endif + +/* + * Include architecture specific implementation here, which references the + * static globals defined above. + */ +#include "efi-boot.h" + +void __init noreturn blexit(const CHAR16 *str) +{ + if ( str ) + PrintStr(str); + PrintStr(newline); + + if ( !efi_bs ) + efi_arch_halt(); + + if ( cfg.need_to_free ) + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + if ( kernel.need_to_free ) + efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); + if ( ramdisk.need_to_free ) + efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size)); + if ( xsm.need_to_free ) + efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); + + efi_arch_blexit(); + + efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); + unreachable(); /* not reached */ +} + static void __init handle_file_info(const CHAR16 *name, const struct file *file, const char *options) { @@ -685,42 +723,6 @@ static void __init pre_parse(const struct file *cfg) " last line will be ignored.\r\n"); } -static char *__init get_value(const struct file *cfg, const char *section, - const char *item) -{ - char *ptr = cfg->str, *end = ptr + cfg->size; - size_t slen = section ? strlen(section) : 0, ilen = strlen(item); - bool match = !slen; - - for ( ; ptr < end; ++ptr ) - { - switch ( *ptr ) - { - case 0: - continue; - case '[': - if ( !slen ) - break; - if ( match ) - return NULL; - match = strncmp(++ptr, section, slen) == 0 && ptr[slen] == ']'; - break; - default: - if ( match && strncmp(ptr, item, ilen) == 0 && ptr[ilen] == '=' ) - { - ptr += ilen + 1; - /* strip off any leading spaces */ - while ( *ptr && isspace(*ptr) ) - ptr++; - return ptr; - } - break; - } - ptr += strlen(ptr); - } - return NULL; -} - static void __init efi_init(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { efi_ih = ImageHandle; @@ -1114,21 +1116,6 @@ static void __init efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *Syste efi_fw_vendor = (void *)efi_fw_vendor + DIRECTMAP_VIRT_START; } -static int __init __maybe_unused set_color(u32 mask, int bpp, u8 *pos, u8 *sz) -{ - if ( bpp < 0 ) - return bpp; - if ( !mask ) - return -EINVAL; - for ( *pos = 0; !(mask & 1); ++*pos ) - mask >>= 1; - for ( *sz = 0; mask & 1; ++*sz) - mask >>= 1; - if ( mask ) - return -EINVAL; - return max(*pos + *sz, bpp); -} - void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 13:22:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 13:22:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.238890.414015 (Exim 4.92) (envelope-from ) id 1muDxI-0007we-GI; Mon, 06 Dec 2021 13:22:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 238890.414015; Mon, 06 Dec 2021 13:22:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDxI-0007wW-DC; Mon, 06 Dec 2021 13:22:56 +0000 Received: by outflank-mailman (input) for mailman id 238890; Mon, 06 Dec 2021 13:22:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDxH-0007wA-Bw for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muDxH-0005rm-BD for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muDxH-0000VR-AM for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 13:22:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E95jSP2beEjzearw+TLmmnt1gfP+4u86cMoBM+9cE+I=; b=ghjmLvaZwJ7g1udITXnK+hO06X z/F2nro/YgXje4dFdirptIgoaPxkKbHeIr1LnqhU8ROs646HYV/1tCgeFz00UoglVQp4TsXZHcuid HaN8FkM055CCTNnrY2TsNQLUb0s1YQ016R4EmZjuC8FeXYgNNgbB0PMxI+TgOopRU/1c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] EFI: drop copy-in from QueryVariableInfo()'s OUT-only variable bouncing Message-Id: Date: Mon, 06 Dec 2021 13:22:55 +0000 commit f0abfb5eca6821fb58c09331d0fa3ec97f86e0bb Author: Jan Beulich AuthorDate: Mon Dec 6 14:16:37 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:16:37 2021 +0100 EFI: drop copy-in from QueryVariableInfo()'s OUT-only variable bouncing While be12fcca8b78 ("efi: fix alignment of function parameters in compat mode") intentionally bounced them both ways to avoid any functional change so close to the release of 4.16, the bouncing-in shouldn't really be needed. In exchange the local variables need to gain initializers to avoid copying back prior stack contents. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Luca Fancellu --- xen/common/efi/runtime.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index d2fdc28df3..fcd5a9cada 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -608,7 +608,15 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) case XEN_EFI_query_variable_info: { - uint64_t max_store_size, remain_store_size, max_size; + /* + * Put OUT variables on the stack to make them 8 byte aligned when + * called from the compat handler, as their placement in + * compat_pf_efi_runtime_call will make them 4 byte aligned instead + * and compilers may validly complain. This is done regardless of + * whether called from the compat handler or not, as it's not worth + * the extra logic to differentiate. + */ + uint64_t max_store_size = 0, remain_store_size = 0, max_size = 0; if ( op->misc & ~XEN_EFI_VARINFO_BOOT_SNAPSHOT ) return -EINVAL; @@ -642,21 +650,6 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) if ( !efi_enabled(EFI_RS) || (efi_rs->Hdr.Revision >> 16) < 2 ) return -EOPNOTSUPP; - /* - * Bounce the variables onto the stack to make them 8 byte aligned when - * called from the compat handler, as their placement in - * compat_pf_efi_runtime_call will make them 4 byte aligned instead and - * and compilers may validly complain. - * - * Note that while the function parameters are OUT only, copy the - * values here anyway just in case. This is done regardless of whether - * called from the compat handler or not, as it's not worth the extra - * logic to differentiate. - */ - max_store_size = op->u.query_variable_info.max_store_size; - remain_store_size = op->u.query_variable_info.remain_store_size; - max_size = op->u.query_variable_info.max_size; - state = efi_rs_enter(); if ( !state.cr3 ) return -EOPNOTSUPP; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:33:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:33:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239276.414722 (Exim 4.92) (envelope-from ) id 1muFzF-00019I-CL; Mon, 06 Dec 2021 15:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239276.414722; Mon, 06 Dec 2021 15:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzF-00019A-9X; Mon, 06 Dec 2021 15:33:05 +0000 Received: by outflank-mailman (input) for mailman id 239276; Mon, 06 Dec 2021 15:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzE-000194-7o for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzE-00005Q-6v for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muFzE-0002TO-5s for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d3oq93Rlt0se0zk+3sdE2ztDmYEkUtuVBa63jiE0dA0=; b=O9VlVHRsHpuE+lYMnfzGotrAIg EIlvBcmJ3SJrfXeTqk3qvqaRfoqaoZly66zPMi/tds4uodv3olybWmuN/qor5TdlsOCFvpdw8tuEc oFURJOzfukMlNDw4E7LAGNQBVRNaoH3hdF3fv7aBpFMh8cmi3ISyytQ2b2D5LmZ3DPf4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: Resign from my maintainership roles Message-Id: Date: Mon, 06 Dec 2021 15:33:04 +0000 commit 608531a0cc34a5bc096ccf585e16f182b5ed83e1 Author: Ian Jackson AuthorDate: Mon Dec 6 14:34:20 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 14:34:20 2021 +0000 MAINTAINERS: Resign from my maintainership roles Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson --- MAINTAINERS | 7 ------- 1 file changed, 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 136f51ad5c..e43dc0edce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -256,7 +256,6 @@ S: Supported F: xen/drivers/passthrough/arm/smmu-v3.c Change Log -M: Ian Jackson R: Community Manager S: Maintained F: CHANGELOG.md @@ -375,7 +374,6 @@ F: xen/arch/x86/machine_kexec.c F: xen/arch/x86/x86_64/kexec_reloc.S LIBS -M: Ian Jackson M: Wei Liu R: Juergen Gross S: Supported @@ -396,7 +394,6 @@ F: tools/include/xentoollog.h F: tools/libs/ LIBXENLIGHT -M: Ian Jackson M: Wei Liu M: Anthony PERARD S: Supported @@ -458,7 +455,6 @@ S: Supported F: tools/python QEMU-DM -M: Ian Jackson S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git @@ -517,7 +513,6 @@ F: xen/arch/arm/tee/ F: xen/include/asm-arm/tee TOOLSTACK -M: Ian Jackson M: Wei Liu S: Supported F: autogen.sh @@ -639,7 +634,6 @@ F: xen/include/asm-x86/guest/hyperv-tlfs.h F: xen/include/asm-x86/hvm/viridian.h XENSTORE -M: Ian Jackson M: Wei Liu M: Juergen Gross R: Julien Grall @@ -665,7 +659,6 @@ F: docs/misc/xsm-flask.txt THE REST M: Andrew Cooper M: George Dunlap -M: Ian Jackson M: Jan Beulich M: Julien Grall M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239277.414726 (Exim 4.92) (envelope-from ) id 1muFzQ-0001BK-E8; Mon, 06 Dec 2021 15:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239277.414726; Mon, 06 Dec 2021 15:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzQ-0001BC-B2; Mon, 06 Dec 2021 15:33:16 +0000 Received: by outflank-mailman (input) for mailman id 239277; Mon, 06 Dec 2021 15:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzO-0001B1-Gq for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzO-00005W-Fw for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muFzO-0002UM-F5 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ylfskPKzr58C65M9nbEbqPSeIXi8JEmQRyarLo9l0FY=; b=EtIyFsOYl4BMQIsd84Ea1sVTC1 ERS+BOjL8FbJvoVsyq0HqxPapYEXo3+iONh/2gu1xzPm2RoELbWccbwZUe89SpnKcbfT1+qXaRemb 9MuJ2vMGWSXvoJ2UdlzdraCqddMFftnlIOF4ZqfktJOKZbOSl66Md5uO1Ky1ryRBLnsA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Mon, 06 Dec 2021 15:33:14 +0000 commit c623a84c2a4fda1cd25f5347a6298706218eb5fb Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 14:41:35 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 85f660c30f..f4c08d0b19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,7 +60,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239278.414730 (Exim 4.92) (envelope-from ) id 1muFza-0001Ej-FW; Mon, 06 Dec 2021 15:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239278.414730; Mon, 06 Dec 2021 15:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFza-0001Eb-CT; Mon, 06 Dec 2021 15:33:26 +0000 Received: by outflank-mailman (input) for mailman id 239278; Mon, 06 Dec 2021 15:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzY-0001EH-QC for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzY-00005o-PN for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muFzY-0002VO-ON for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ntz1hRSdb0MG7vJZhNiESIV301wApurqg87TiyG9HO4=; b=A8NGvSrMTCw+2O69pSp90NL9XR GUs1NzskQz+HgK06txyRYD0yQ5lU27WsQV5kIy5sDwdeID39ND2CikvOwP9yWasAELa/VkJ3ueCmA kPMSpmBV7ZzAQc2iCaQUh+PDoQxAaFrwBfitksQDTpFMSD/DnHZgYYGfSXqgNA/XgH4k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Mon, 06 Dec 2021 15:33:24 +0000 commit c4cf5388652e8434652e30c73aa79635b4253675 Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:27:49 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson (cherry picked from commit c623a84c2a4fda1cd25f5347a6298706218eb5fb) --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4b72a6adae..04eb361222 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,7 +60,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:33:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:33:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239279.414735 (Exim 4.92) (envelope-from ) id 1muFzk-0001HT-Hh; Mon, 06 Dec 2021 15:33:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239279.414735; Mon, 06 Dec 2021 15:33:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzk-0001HF-E5; Mon, 06 Dec 2021 15:33:36 +0000 Received: by outflank-mailman (input) for mailman id 239279; Mon, 06 Dec 2021 15:33:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzj-0001Gx-21 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzj-000062-1L for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muFzj-0002WI-0S for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fl0xm+QWPpjqOyRax7tkhpduIBAMDADgTSV6gAaQsWM=; b=F5580hnAlASY6b9Dbz+z4xxQ7p r+XKpwkhsix9TR+hHIr6bXGru4o+S8DiDH+YoXT02nD6KjJ4JIOVPhhLKUJFfkung08wubH1pe6gJ BWKoYk+A2GH8J/Q3ZgLXP5neIuFWnlvCeEV/moYcVThDgLkgRn2e65c11jd6axEOv5zU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.13] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Mon, 06 Dec 2021 15:33:35 +0000 commit d0e2c2762b981abd984af66a844ac12d8bf8f813 Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:29:04 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson (cherry picked from commit c623a84c2a4fda1cd25f5347a6298706218eb5fb) (cherry picked from commit c4cf5388652e8434652e30c73aa79635b4253675) --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 806e02b4f8..bdd885ddff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,7 +60,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:33:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:33:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239280.414738 (Exim 4.92) (envelope-from ) id 1muFzu-0001KM-IU; Mon, 06 Dec 2021 15:33:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239280.414738; Mon, 06 Dec 2021 15:33:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzu-0001KE-Fe; Mon, 06 Dec 2021 15:33:46 +0000 Received: by outflank-mailman (input) for mailman id 239280; Mon, 06 Dec 2021 15:33:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzt-0001Ju-BG for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muFzt-00006D-AX for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muFzt-0002XZ-9d for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TFJ4BCNnMABENNC06UAZn+9oLMeg2MWvY6m779eru/c=; b=2h6yBxfoL/z06zYn3H2MSmWAM4 blx4BikRVIq9NZ/JSsnGibSU7AtxWwHDvysr7zFo7mww6IuedKI2fQjm3iSacxbv/9wysUDls/Hx/ /28dDPvS4xxh69jR2MW39JH/3TrThyWBU4cwJp8ilnfQEkn4eZpr7VLP9Ncp+Q+KSGlQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.12] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Mon, 06 Dec 2021 15:33:45 +0000 commit b9aa1635b38a7bc092d60123b87c545f25db31e4 Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:29:33 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson (cherry picked from commit c623a84c2a4fda1cd25f5347a6298706218eb5fb) (cherry picked from commit c4cf5388652e8434652e30c73aa79635b4253675) (cherry picked from commit d0e2c2762b981abd984af66a844ac12d8bf8f813) --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a084275e79..adae750e45 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -58,7 +58,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239311.414786 (Exim 4.92) (envelope-from ) id 1muGKZ-0005zJ-24; Mon, 06 Dec 2021 15:55:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239311.414786; Mon, 06 Dec 2021 15:55:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKY-0005z9-V4; Mon, 06 Dec 2021 15:55:06 +0000 Received: by outflank-mailman (input) for mailman id 239311; Mon, 06 Dec 2021 15:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKX-0005z3-7Y for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKX-0000Uj-2b for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muGKX-000484-1b for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MnuefkYLXBgYXkhGIesvpZ0QdYiC7d04K8709PmCtT0=; b=OzPoGvQCbpb6HEQ/vcVUrHNkOL 4uqx7IY+GCMj1uab3aOQ+ug+iIdm/TqIo7PhR1EtjNT0+AW2GrkAT/u2c4l0PnoM+Ia7DN/3ZfYYx SHCZaioVOCL8fUZeQCXAq0TWQ+hWX0rxQqhFV/zqcqx0/tAiVp3GyYBVDpRVU5wnDp7M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.16] xen/Makefile: Set version to reopen as 4.16 stable branch Message-Id: Date: Mon, 06 Dec 2021 15:55:05 +0000 commit d9faedccd9b70948a7eea76a21daf5814ae44dfb Author: Ian Jackson AuthorDate: Mon Dec 6 15:45:41 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:46:27 2021 +0000 xen/Makefile: Set version to reopen as 4.16 stable branch Signed-off-by: Ian Jackson --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index dfb0efcc26..e3e281177c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 16 -export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.16 From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239312.414789 (Exim 4.92) (envelope-from ) id 1muGKi-000618-3G; Mon, 06 Dec 2021 15:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239312.414789; Mon, 06 Dec 2021 15:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKi-000611-0F; Mon, 06 Dec 2021 15:55:16 +0000 Received: by outflank-mailman (input) for mailman id 239312; Mon, 06 Dec 2021 15:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKh-00060t-6k for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKh-0000Uu-5r for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muGKh-00048h-4o for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RxZ7MhUsmJjQ2Y4C5n7oFjxultnSmO6y+zvFZJyC68w=; b=cXKgRdXqXfCZEeRWxyuF/jpQcB c+0wyns1sHU7KofCbf9d+3J8b02ipstQoLbNM2XNQkw/1kFX0kMv6kzMhCICN7ECj9/dlMsg7jUmV uXzQLjw1FFcZvtJrL//mlA5eRL2ClY/QKazLfSXXIVuOwd60dHB5vyUsemC6xQjQ3a4c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.16] MAINTAINERS: Update for this being the 4.16 stable branch Message-Id: Date: Mon, 06 Dec 2021 15:55:15 +0000 commit 5974b00dd62ad855af881df23d4b1a1c86ebdb88 Author: Ian Jackson AuthorDate: Mon Dec 6 15:44:16 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:46:27 2021 +0000 MAINTAINERS: Update for this being the 4.16 stable branch Signed-off-by: Ian Jackson --- MAINTAINERS | 92 ++++++------------------------------------------------------- 1 file changed, 9 insertions(+), 83 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4956db1011..fab396b4e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -54,6 +54,15 @@ list. Remember to copy the appropriate stable branch maintainer who will be listed in this section of the MAINTAINERS file in the appropriate branch. +The maintainer for this branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + TODO - Loooking for new tools stable maintainer + + Unstable Subsystem Maintainers ============================== @@ -104,89 +113,6 @@ Descriptions of section entries: xen-maintainers- - Check-in policy - =============== - -In order for a patch to be checked in, in general, several conditions -must be met: - -1. In order to get a change to a given file committed, it must have - the approval of at least one maintainer of that file. - - A patch of course needs Acks from the maintainers of each file that - it changes; so a patch which changes xen/arch/x86/traps.c, - xen/arch/x86/mm/p2m.c, and xen/arch/x86/mm/shadow/multi.c would - require an Ack from each of the three sets of maintainers. - - See below for rules on nested maintainership. - -2. It must have appropriate approval from someone other than the - submitter. This can be either: - - a. An Acked-by from a maintainer of the code being touched (a - co-maintainer if available, or a more general level maintainer if - not available; see the secton on nested maintainership) - - b. A Reviewed-by by anyone of suitable stature in the community - -3. Sufficient time must have been given for anyone to respond. This - depends in large part upon the urgency and nature of the patch. - For a straightforward uncontroversial patch, a day or two may be - sufficient; for a controversial patch, a week or two may be better. - -4. There must be no "open" objections. - -In a case where one person submits a patch and a maintainer gives an -Ack, the Ack stands in for both the approval requirement (#1) and the -Acked-by-non-submitter requirement (#2). - -In a case where a maintainer themselves submits a patch, the -Signed-off-by meets the approval requirement (#1); so a Review -from anyone in the community suffices for requirement #2. - -Before a maintainer checks in their own patch with another community -member's R-b but no co-maintainer Ack, it is especially important to -give their co-maintainer opportunity to give feedback, perhaps -declaring their intention to check it in without their co-maintainers -ack a day before doing so. - -Maintainers may choose to override non-maintainer objections in the -case that consensus can't be reached. - -As always, no policy can cover all possible situations. In -exceptional circumstances, committers may commit a patch in absence of -one or more of the above requirements, if they are reasonably -confident that the other maintainers will approve of their decision in -retrospect. - - The meaning of nesting - ====================== - -Many maintainership areas are "nested": for example, there are entries -for xen/arch/x86 as well as xen/arch/x86/mm, and even -xen/arch/x86/mm/shadow; and there is a section at the end called "THE -REST" which lists all committers. The meaning of nesting is that: - -1. Under normal circumstances, the Ack of the most specific maintainer -is both necessary and sufficient to get a change to a given file -committed. So a change to xen/arch/x86/mm/shadow/multi.c requires the -the Ack of the xen/arch/x86/mm/shadow maintainer for that part of the -patch, but would not require the Ack of the xen/arch/x86 maintainer or -the xen/arch/x86/mm maintainer. - -2. In unusual circumstances, a more general maintainer's Ack can stand -in for or even overrule a specific maintainer's Ack. Unusual -circumstances might include: - - The patch is fixing a high-priority issue causing immediate pain, - and the more specific maintainer is not available. - - The more specific maintainer has not responded either to the - original patch, nor to "pings", within a reasonable amount of time. - - The more general maintainer wants to overrule the more specific - maintainer on some issue. (This should be exceptional.) - - In the case of a disagreement between maintainers, THE REST can - settle the matter by majority vote. (This should be very exceptional - indeed.) - Maintainers List (try to look for most precise areas first) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.16 From xen-changelog-bounces@lists.xenproject.org Mon Dec 06 15:55:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 06 Dec 2021 15:55:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.239313.414793 (Exim 4.92) (envelope-from ) id 1muGKt-00065I-5v; Mon, 06 Dec 2021 15:55:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239313.414793; Mon, 06 Dec 2021 15:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKt-00065A-3A; Mon, 06 Dec 2021 15:55:27 +0000 Received: by outflank-mailman (input) for mailman id 239313; Mon, 06 Dec 2021 15:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKr-00064p-9b for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muGKr-0000V0-8l for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muGKr-00049J-81 for xen-changelog@lists.xenproject.org; Mon, 06 Dec 2021 15:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=x6MilOyTDZdBXtynZKm+Jngy4A4zG8B7Zzi4LP0/N2o=; b=o/pRHTMYdQYjmMut3y8Q2O0rl7 XePDGmxKJIOQVW/EaEyFpb0qt6b8hEdrgYk1ai+hDqhmWZuvtDryn8A1R/wU0FlJLU7F63psqSk8b yvrukV9V1BlsJtfBwcEZeROkElFOzHlqtXqhkPmZxRDa1V6EskrY24zxdI5JRqGKcTgs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.16] REAMDE: trim over-long lines around figlet Message-Id: Date: Mon, 06 Dec 2021 15:55:25 +0000 commit 2dcea9c94c59cf2a9c7ee824a573f7c1b864b5d5 Author: Ian Jackson AuthorDate: Mon Dec 6 15:46:04 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:46:27 2021 +0000 REAMDE: trim over-long lines around figlet Signed-off-by: Ian Jackson --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 189c749bb0..6edcf0d5c0 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ -############################################################ +################################## __ __ _ _ _ __ \ \/ /___ _ __ | || | / |/ /_ \ // _ \ '_ \ | || |_ | | '_ \ / \ __/ | | | |__ _|| | (_) | /_/\_\___|_| |_| |_|(_)_|\___/ -############################################################ +################################## https://www.xen.org/ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:22:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240426.416910 (Exim 4.92) (envelope-from ) id 1muPBD-0003t3-Mf; Tue, 07 Dec 2021 01:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240426.416910; Tue, 07 Dec 2021 01:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBD-0003sv-JN; Tue, 07 Dec 2021 01:22:03 +0000 Received: by outflank-mailman (input) for mailman id 240426; Tue, 07 Dec 2021 01:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBC-0003sp-2T for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBC-0005Po-1W for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPBC-0007x5-0Q for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VIUf1XIVsG+hIBQZ9iEatzwvoK5EPn9ky1v42ZxVnGw=; b=I9Pu9p5uxPkfUMT6tPBEOD/7Uc +JbrhChRxy688VIJPRrC/XVIPll8gRQvUIt5hOo/QX7mPB7mgwHfUOfxyMC265IgWK6ESwfNN15b3 ll7RUT1QW0/Rgi778suW6oDhDipbmlQWDEFcCIrrDCX5S6wlbO0on4zwiK+vpd++TVIM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Update libfdt to v1.6.1 Message-Id: Date: Tue, 07 Dec 2021 01:22:02 +0000 commit ad9cf6bde5b90d4c1e5a79a2803e98d6344c27d7 Author: Vikram Garhwal AuthorDate: Thu Nov 11 23:27:20 2021 -0800 Commit: Julien Grall CommitDate: Wed Dec 1 16:40:19 2021 +0000 Update libfdt to v1.6.1 Update libfdt to v1.6.1 of libfdt taken from git://github.com/dgibson/dtc. This update is done to support device tree overlays. A few minor changes are done to make it compatible with Xen: fdt_overlay.c: overlay_fixup_phandle() Replace strtoul() with simple_strtoul() as strtoul() is not available in Xen lib and included lib.h. Change char *endptr to const char *endptr. This change is required for using simple_strtoul(). libfdt_env.h: Remaining Xen changes to libfdt_env.h carried over from existing libfdt (v1.4.0) Signed-off-by: Vikram Garhwal Reviewed-by: Luca Fancellu Tested-by: Luca Fancellu Reviewed-by: Julien Grall --- xen/common/libfdt/Makefile.libfdt | 10 +- xen/common/libfdt/fdt.c | 226 ++++++--- xen/common/libfdt/fdt_addresses.c | 101 ++++ xen/common/libfdt/fdt_check.c | 93 ++++ xen/common/libfdt/fdt_empty_tree.c | 46 +- xen/common/libfdt/fdt_overlay.c | 884 ++++++++++++++++++++++++++++++++++++ xen/common/libfdt/fdt_ro.c | 514 ++++++++++++++++----- xen/common/libfdt/fdt_rw.c | 249 +++++----- xen/common/libfdt/fdt_strerror.c | 55 +-- xen/common/libfdt/fdt_sw.c | 312 +++++++++---- xen/common/libfdt/fdt_wip.c | 88 ++-- xen/common/libfdt/libfdt_internal.h | 223 ++++++--- xen/common/libfdt/version.lds | 24 +- xen/include/xen/libfdt/fdt.h | 51 +-- xen/include/xen/libfdt/libfdt.h | 858 +++++++++++++++++++++++++++++----- xen/include/xen/libfdt/libfdt_env.h | 98 +++- 16 files changed, 3046 insertions(+), 786 deletions(-) diff --git a/xen/common/libfdt/Makefile.libfdt b/xen/common/libfdt/Makefile.libfdt index 91126c000a..b6d8fc02dd 100644 --- a/xen/common/libfdt/Makefile.libfdt +++ b/xen/common/libfdt/Makefile.libfdt @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) # Makefile.libfdt # # This is not a complete Makefile of itself. Instead, it is designed to @@ -6,5 +7,12 @@ LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h LIBFDT_VERSION = version.lds -LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c +LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \ + fdt_addresses.c fdt_overlay.c fdt_check.c LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) +LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) + +libfdt_clean: + @$(VECHO) CLEAN "(libfdt)" + rm -f $(STD_CLEANFILES:%=$(LIBFDT_dir)/%) + rm -f $(LIBFDT_dir)/$(LIBFDT_soname) diff --git a/xen/common/libfdt/fdt.c b/xen/common/libfdt/fdt.c index bbc77177d9..9fe7cf4b74 100644 --- a/xen/common/libfdt/fdt.c +++ b/xen/common/libfdt/fdt.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,40 +10,156 @@ #include "libfdt_internal.h" -int fdt_check_header(const void *fdt) +/* + * Minimal sanity check for a read-only tree. fdt_ro_probe_() checks + * that the given buffer contains what appears to be a flattened + * device tree with sane information in its header. + */ +int32_t fdt_ro_probe_(const void *fdt) { + uint32_t totalsize = fdt_totalsize(fdt); + + if (can_assume(VALID_DTB)) + return totalsize; + + /* The device tree must be at an 8-byte aligned address */ + if ((uintptr_t)fdt & 7) + return -FDT_ERR_ALIGNMENT; + if (fdt_magic(fdt) == FDT_MAGIC) { /* Complete tree */ - if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) - return -FDT_ERR_BADVERSION; - if (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION) - return -FDT_ERR_BADVERSION; + if (!can_assume(LATEST)) { + if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) + return -FDT_ERR_BADVERSION; + if (fdt_last_comp_version(fdt) > + FDT_LAST_SUPPORTED_VERSION) + return -FDT_ERR_BADVERSION; + } } else if (fdt_magic(fdt) == FDT_SW_MAGIC) { /* Unfinished sequential-write blob */ - if (fdt_size_dt_struct(fdt) == 0) + if (!can_assume(VALID_INPUT) && fdt_size_dt_struct(fdt) == 0) return -FDT_ERR_BADSTATE; } else { return -FDT_ERR_BADMAGIC; } + if (totalsize < INT32_MAX) + return totalsize; + else + return -FDT_ERR_TRUNCATED; +} + +static int check_off_(uint32_t hdrsize, uint32_t totalsize, uint32_t off) +{ + return (off >= hdrsize) && (off <= totalsize); +} + +static int check_block_(uint32_t hdrsize, uint32_t totalsize, + uint32_t base, uint32_t size) +{ + if (!check_off_(hdrsize, totalsize, base)) + return 0; /* block start out of bounds */ + if ((base + size) < base) + return 0; /* overflow */ + if (!check_off_(hdrsize, totalsize, base + size)) + return 0; /* block end out of bounds */ + return 1; +} + +size_t fdt_header_size_(uint32_t version) +{ + if (version <= 1) + return FDT_V1_SIZE; + else if (version <= 2) + return FDT_V2_SIZE; + else if (version <= 3) + return FDT_V3_SIZE; + else if (version <= 16) + return FDT_V16_SIZE; + else + return FDT_V17_SIZE; +} + +size_t fdt_header_size(const void *fdt) +{ + return can_assume(LATEST) ? FDT_V17_SIZE : + fdt_header_size_(fdt_version(fdt)); +} + +int fdt_check_header(const void *fdt) +{ + size_t hdrsize; + + /* The device tree must be at an 8-byte aligned address */ + if ((uintptr_t)fdt & 7) + return -FDT_ERR_ALIGNMENT; + + if (fdt_magic(fdt) != FDT_MAGIC) + return -FDT_ERR_BADMAGIC; + if (!can_assume(LATEST)) { + if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION) + || (fdt_last_comp_version(fdt) > + FDT_LAST_SUPPORTED_VERSION)) + return -FDT_ERR_BADVERSION; + if (fdt_version(fdt) < fdt_last_comp_version(fdt)) + return -FDT_ERR_BADVERSION; + } + hdrsize = fdt_header_size(fdt); + if (!can_assume(VALID_DTB)) { + + if ((fdt_totalsize(fdt) < hdrsize) + || (fdt_totalsize(fdt) > INT_MAX)) + return -FDT_ERR_TRUNCATED; + + /* Bounds check memrsv block */ + if (!check_off_(hdrsize, fdt_totalsize(fdt), + fdt_off_mem_rsvmap(fdt))) + return -FDT_ERR_TRUNCATED; + } + + if (!can_assume(VALID_DTB)) { + /* Bounds check structure block */ + if (!can_assume(LATEST) && fdt_version(fdt) < 17) { + if (!check_off_(hdrsize, fdt_totalsize(fdt), + fdt_off_dt_struct(fdt))) + return -FDT_ERR_TRUNCATED; + } else { + if (!check_block_(hdrsize, fdt_totalsize(fdt), + fdt_off_dt_struct(fdt), + fdt_size_dt_struct(fdt))) + return -FDT_ERR_TRUNCATED; + } + + /* Bounds check strings block */ + if (!check_block_(hdrsize, fdt_totalsize(fdt), + fdt_off_dt_strings(fdt), + fdt_size_dt_strings(fdt))) + return -FDT_ERR_TRUNCATED; + } + return 0; } const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len) { - unsigned absoffset = offset + fdt_off_dt_struct(fdt); + unsigned int uoffset = offset; + unsigned int absoffset = offset + fdt_off_dt_struct(fdt); - if ((absoffset < offset) - || ((absoffset + len) < absoffset) - || (absoffset + len) > fdt_totalsize(fdt)) + if (offset < 0) return NULL; - if (fdt_version(fdt) >= 0x11) - if (((offset + len) < offset) + if (!can_assume(VALID_INPUT)) + if ((absoffset < uoffset) + || ((absoffset + len) < absoffset) + || (absoffset + len) > fdt_totalsize(fdt)) + return NULL; + + if (can_assume(LATEST) || fdt_version(fdt) >= 0x11) + if (((uoffset + len) < uoffset) || ((offset + len) > fdt_size_dt_struct(fdt))) return NULL; - return _fdt_offset_ptr(fdt, offset); + return fdt_offset_ptr_(fdt, offset); } uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) @@ -98,7 +171,7 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) *nextoffset = -FDT_ERR_TRUNCATED; tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE); - if (!tagp) + if (!can_assume(VALID_DTB) && !tagp) return FDT_END; /* premature end */ tag = fdt32_to_cpu(*tagp); offset += FDT_TAGSIZE; @@ -110,17 +183,21 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) do { p = fdt_offset_ptr(fdt, offset++, 1); } while (p && (*p != '\0')); - if (!p) + if (!can_assume(VALID_DTB) && !p) return FDT_END; /* premature end */ break; case FDT_PROP: lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp)); - if (!lenp) + if (!can_assume(VALID_DTB) && !lenp) return FDT_END; /* premature end */ /* skip-name offset, length and value */ offset += sizeof(struct fdt_property) - FDT_TAGSIZE + fdt32_to_cpu(*lenp); + if (!can_assume(LATEST) && + fdt_version(fdt) < 0x10 && fdt32_to_cpu(*lenp) >= 8 && + ((offset - fdt32_to_cpu(*lenp)) % 8) != 0) + offset += 4; break; case FDT_END: @@ -139,19 +216,25 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) return tag; } -int _fdt_check_node_offset(const void *fdt, int offset) +int fdt_check_node_offset_(const void *fdt, int offset) { - if ((offset < 0) || (offset % FDT_TAGSIZE) - || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE)) + if (!can_assume(VALID_INPUT) + && ((offset < 0) || (offset % FDT_TAGSIZE))) + return -FDT_ERR_BADOFFSET; + + if (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE) return -FDT_ERR_BADOFFSET; return offset; } -int _fdt_check_prop_offset(const void *fdt, int offset) +int fdt_check_prop_offset_(const void *fdt, int offset) { - if ((offset < 0) || (offset % FDT_TAGSIZE) - || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP)) + if (!can_assume(VALID_INPUT) + && ((offset < 0) || (offset % FDT_TAGSIZE))) + return -FDT_ERR_BADOFFSET; + + if (fdt_next_tag(fdt, offset, &offset) != FDT_PROP) return -FDT_ERR_BADOFFSET; return offset; @@ -163,7 +246,7 @@ int fdt_next_node(const void *fdt, int offset, int *depth) uint32_t tag; if (offset >= 0) - if ((nextoffset = _fdt_check_node_offset(fdt, offset)) < 0) + if ((nextoffset = fdt_check_node_offset_(fdt, offset)) < 0) return nextoffset; do { @@ -225,7 +308,7 @@ int fdt_next_subnode(const void *fdt, int offset) return offset; } -const char *_fdt_find_string(const char *strtab, int tabsize, const char *s) +const char *fdt_find_string_(const char *strtab, int tabsize, const char *s) { int len = strlen(s) + 1; const char *last = strtab + tabsize - len; @@ -239,9 +322,12 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s) int fdt_move(const void *fdt, void *buf, int bufsize) { - FDT_CHECK_HEADER(fdt); + if (!can_assume(VALID_INPUT) && bufsize < 0) + return -FDT_ERR_NOSPACE; + + FDT_RO_PROBE(fdt); - if (fdt_totalsize(fdt) > bufsize) + if (fdt_totalsize(fdt) > (unsigned int)bufsize) return -FDT_ERR_NOSPACE; memmove(buf, fdt, fdt_totalsize(fdt)); diff --git a/xen/common/libfdt/fdt_addresses.c b/xen/common/libfdt/fdt_addresses.c new file mode 100644 index 0000000000..9a82cd0ba2 --- /dev/null +++ b/xen/common/libfdt/fdt_addresses.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2014 David Gibson + * Copyright (C) 2018 embedded brains GmbH + */ +#include "libfdt_env.h" + +#include +#include + +#include "libfdt_internal.h" + +static int fdt_cells(const void *fdt, int nodeoffset, const char *name) +{ + const fdt32_t *c; + uint32_t val; + int len; + + c = fdt_getprop(fdt, nodeoffset, name, &len); + if (!c) + return len; + + if (len != sizeof(*c)) + return -FDT_ERR_BADNCELLS; + + val = fdt32_to_cpu(*c); + if (val > FDT_MAX_NCELLS) + return -FDT_ERR_BADNCELLS; + + return (int)val; +} + +int fdt_address_cells(const void *fdt, int nodeoffset) +{ + int val; + + val = fdt_cells(fdt, nodeoffset, "#address-cells"); + if (val == 0) + return -FDT_ERR_BADNCELLS; + if (val == -FDT_ERR_NOTFOUND) + return 2; + return val; +} + +int fdt_size_cells(const void *fdt, int nodeoffset) +{ + int val; + + val = fdt_cells(fdt, nodeoffset, "#size-cells"); + if (val == -FDT_ERR_NOTFOUND) + return 1; + return val; +} + +/* This function assumes that [address|size]_cells is 1 or 2 */ +int fdt_appendprop_addrrange(void *fdt, int parent, int nodeoffset, + const char *name, uint64_t addr, uint64_t size) +{ + int addr_cells, size_cells, ret; + uint8_t data[sizeof(fdt64_t) * 2], *prop; + + ret = fdt_address_cells(fdt, parent); + if (ret < 0) + return ret; + addr_cells = ret; + + ret = fdt_size_cells(fdt, parent); + if (ret < 0) + return ret; + size_cells = ret; + + /* check validity of address */ + prop = data; + if (addr_cells == 1) { + if ((addr > UINT32_MAX) || ((UINT32_MAX + 1 - addr) < size)) + return -FDT_ERR_BADVALUE; + + fdt32_st(prop, (uint32_t)addr); + } else if (addr_cells == 2) { + fdt64_st(prop, addr); + } else { + return -FDT_ERR_BADNCELLS; + } + + /* check validity of size */ + prop += addr_cells * sizeof(fdt32_t); + if (size_cells == 1) { + if (size > UINT32_MAX) + return -FDT_ERR_BADVALUE; + + fdt32_st(prop, (uint32_t)size); + } else if (size_cells == 2) { + fdt64_st(prop, size); + } else { + return -FDT_ERR_BADNCELLS; + } + + return fdt_appendprop(fdt, nodeoffset, name, data, + (addr_cells + size_cells) * sizeof(fdt32_t)); +} diff --git a/xen/common/libfdt/fdt_check.c b/xen/common/libfdt/fdt_check.c new file mode 100644 index 0000000000..fa410a86e2 --- /dev/null +++ b/xen/common/libfdt/fdt_check.c @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2006 David Gibson, IBM Corporation. + */ +#include "libfdt_env.h" + +#include +#include + +#include "libfdt_internal.h" + +int fdt_check_full(const void *fdt, size_t bufsize) +{ + int err; + int num_memrsv; + int offset, nextoffset = 0; + uint32_t tag; + unsigned int depth = 0; + const void *prop; + const char *propname; + bool expect_end = false; + + if (bufsize < FDT_V1_SIZE) + return -FDT_ERR_TRUNCATED; + if (bufsize < fdt_header_size(fdt)) + return -FDT_ERR_TRUNCATED; + err = fdt_check_header(fdt); + if (err != 0) + return err; + if (bufsize < fdt_totalsize(fdt)) + return -FDT_ERR_TRUNCATED; + + num_memrsv = fdt_num_mem_rsv(fdt); + if (num_memrsv < 0) + return num_memrsv; + + while (1) { + offset = nextoffset; + tag = fdt_next_tag(fdt, offset, &nextoffset); + + if (nextoffset < 0) + return nextoffset; + + /* If we see two root nodes, something is wrong */ + if (expect_end && tag != FDT_END) + return -FDT_ERR_BADSTRUCTURE; + + switch (tag) { + case FDT_NOP: + break; + + case FDT_END: + if (depth != 0) + return -FDT_ERR_BADSTRUCTURE; + return 0; + + case FDT_BEGIN_NODE: + depth++; + if (depth > INT_MAX) + return -FDT_ERR_BADSTRUCTURE; + + /* The root node must have an empty name */ + if (depth == 1) { + const char *name; + int len; + + name = fdt_get_name(fdt, offset, &len); + if (*name || len) + return -FDT_ERR_BADSTRUCTURE; + } + break; + + case FDT_END_NODE: + if (depth == 0) + return -FDT_ERR_BADSTRUCTURE; + depth--; + if (depth == 0) + expect_end = true; + break; + + case FDT_PROP: + prop = fdt_getprop_by_offset(fdt, offset, &propname, + &err); + if (!prop) + return err; + break; + + default: + return -FDT_ERR_INTERNAL; + } + } +} diff --git a/xen/common/libfdt/fdt_empty_tree.c b/xen/common/libfdt/fdt_empty_tree.c index d50561101f..49d54d44b8 100644 --- a/xen/common/libfdt/fdt_empty_tree.c +++ b/xen/common/libfdt/fdt_empty_tree.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2012 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -79,4 +36,3 @@ int fdt_create_empty_tree(void *buf, int bufsize) return fdt_open_into(buf, buf, bufsize); } - diff --git a/xen/common/libfdt/fdt_overlay.c b/xen/common/libfdt/fdt_overlay.c new file mode 100644 index 0000000000..7b95e2b639 --- /dev/null +++ b/xen/common/libfdt/fdt_overlay.c @@ -0,0 +1,884 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2016 Free Electrons + * Copyright (C) 2016 NextThing Co. + */ +#include "libfdt_env.h" + +#include +#include +#include + +#include "libfdt_internal.h" + +/** + * overlay_get_target_phandle - retrieves the target phandle of a fragment + * @fdto: pointer to the device tree overlay blob + * @fragment: node offset of the fragment in the overlay + * + * overlay_get_target_phandle() retrieves the target phandle of an + * overlay fragment when that fragment uses a phandle (target + * property) instead of a path (target-path property). + * + * returns: + * the phandle pointed by the target property + * 0, if the phandle was not found + * -1, if the phandle was malformed + */ +static uint32_t overlay_get_target_phandle(const void *fdto, int fragment) +{ + const fdt32_t *val; + int len; + + val = fdt_getprop(fdto, fragment, "target", &len); + if (!val) + return 0; + + if ((len != sizeof(*val)) || (fdt32_to_cpu(*val) == (uint32_t)-1)) + return (uint32_t)-1; + + return fdt32_to_cpu(*val); +} + +/** + * overlay_get_target - retrieves the offset of a fragment's target + * @fdt: Base device tree blob + * @fdto: Device tree overlay blob + * @fragment: node offset of the fragment in the overlay + * @pathp: pointer which receives the path of the target (or NULL) + * + * overlay_get_target() retrieves the target offset in the base + * device tree of a fragment, no matter how the actual targeting is + * done (through a phandle or a path) + * + * returns: + * the targeted node offset in the base device tree + * Negative error code on error + */ +static int overlay_get_target(const void *fdt, const void *fdto, + int fragment, char const **pathp) +{ + uint32_t phandle; + const char *path = NULL; + int path_len = 0, ret; + + /* Try first to do a phandle based lookup */ + phandle = overlay_get_target_phandle(fdto, fragment); + if (phandle == (uint32_t)-1) + return -FDT_ERR_BADPHANDLE; + + /* no phandle, try path */ + if (!phandle) { + /* And then a path based lookup */ + path = fdt_getprop(fdto, fragment, "target-path", &path_len); + if (path) + ret = fdt_path_offset(fdt, path); + else + ret = path_len; + } else + ret = fdt_node_offset_by_phandle(fdt, phandle); + + /* + * If we haven't found either a target or a + * target-path property in a node that contains a + * __overlay__ subnode (we wouldn't be called + * otherwise), consider it a improperly written + * overlay + */ + if (ret < 0 && path_len == -FDT_ERR_NOTFOUND) + ret = -FDT_ERR_BADOVERLAY; + + /* return on error */ + if (ret < 0) + return ret; + + /* return pointer to path (if available) */ + if (pathp) + *pathp = path ? path : NULL; + + return ret; +} + +/** + * overlay_phandle_add_offset - Increases a phandle by an offset + * @fdt: Base device tree blob + * @node: Device tree overlay blob + * @name: Name of the property to modify (phandle or linux,phandle) + * @delta: offset to apply + * + * overlay_phandle_add_offset() increments a node phandle by a given + * offset. + * + * returns: + * 0 on success. + * Negative error code on error + */ +static int overlay_phandle_add_offset(void *fdt, int node, + const char *name, uint32_t delta) +{ + const fdt32_t *val; + uint32_t adj_val; + int len; + + val = fdt_getprop(fdt, node, name, &len); + if (!val) + return len; + + if (len != sizeof(*val)) + return -FDT_ERR_BADPHANDLE; + + adj_val = fdt32_to_cpu(*val); + if ((adj_val + delta) < adj_val) + return -FDT_ERR_NOPHANDLES; + + adj_val += delta; + if (adj_val == (uint32_t)-1) + return -FDT_ERR_NOPHANDLES; + + return fdt_setprop_inplace_u32(fdt, node, name, adj_val); +} + +/** + * overlay_adjust_node_phandles - Offsets the phandles of a node + * @fdto: Device tree overlay blob + * @node: Offset of the node we want to adjust + * @delta: Offset to shift the phandles of + * + * overlay_adjust_node_phandles() adds a constant to all the phandles + * of a given node. This is mainly use as part of the overlay + * application process, when we want to update all the overlay + * phandles to not conflict with the overlays of the base device tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_adjust_node_phandles(void *fdto, int node, + uint32_t delta) +{ + int child; + int ret; + + ret = overlay_phandle_add_offset(fdto, node, "phandle", delta); + if (ret && ret != -FDT_ERR_NOTFOUND) + return ret; + + ret = overlay_phandle_add_offset(fdto, node, "linux,phandle", delta); + if (ret && ret != -FDT_ERR_NOTFOUND) + return ret; + + fdt_for_each_subnode(child, fdto, node) { + ret = overlay_adjust_node_phandles(fdto, child, delta); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_adjust_local_phandles - Adjust the phandles of a whole overlay + * @fdto: Device tree overlay blob + * @delta: Offset to shift the phandles of + * + * overlay_adjust_local_phandles() adds a constant to all the + * phandles of an overlay. This is mainly use as part of the overlay + * application process, when we want to update all the overlay + * phandles to not conflict with the overlays of the base device tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_adjust_local_phandles(void *fdto, uint32_t delta) +{ + /* + * Start adjusting the phandles from the overlay root + */ + return overlay_adjust_node_phandles(fdto, 0, delta); +} + +/** + * overlay_update_local_node_references - Adjust the overlay references + * @fdto: Device tree overlay blob + * @tree_node: Node offset of the node to operate on + * @fixup_node: Node offset of the matching local fixups node + * @delta: Offset to shift the phandles of + * + * overlay_update_local_nodes_references() update the phandles + * pointing to a node within the device tree overlay by adding a + * constant delta. + * + * This is mainly used as part of a device tree application process, + * where you want the device tree overlays phandles to not conflict + * with the ones from the base device tree before merging them. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_update_local_node_references(void *fdto, + int tree_node, + int fixup_node, + uint32_t delta) +{ + int fixup_prop; + int fixup_child; + int ret; + + fdt_for_each_property_offset(fixup_prop, fdto, fixup_node) { + const fdt32_t *fixup_val; + const char *tree_val; + const char *name; + int fixup_len; + int tree_len; + int i; + + fixup_val = fdt_getprop_by_offset(fdto, fixup_prop, + &name, &fixup_len); + if (!fixup_val) + return fixup_len; + + if (fixup_len % sizeof(uint32_t)) + return -FDT_ERR_BADOVERLAY; + fixup_len /= sizeof(uint32_t); + + tree_val = fdt_getprop(fdto, tree_node, name, &tree_len); + if (!tree_val) { + if (tree_len == -FDT_ERR_NOTFOUND) + return -FDT_ERR_BADOVERLAY; + + return tree_len; + } + + for (i = 0; i < fixup_len; i++) { + fdt32_t adj_val; + uint32_t poffset; + + poffset = fdt32_to_cpu(fixup_val[i]); + + /* + * phandles to fixup can be unaligned. + * + * Use a memcpy for the architectures that do + * not support unaligned accesses. + */ + memcpy(&adj_val, tree_val + poffset, sizeof(adj_val)); + + adj_val = cpu_to_fdt32(fdt32_to_cpu(adj_val) + delta); + + ret = fdt_setprop_inplace_namelen_partial(fdto, + tree_node, + name, + strlen(name), + poffset, + &adj_val, + sizeof(adj_val)); + if (ret == -FDT_ERR_NOSPACE) + return -FDT_ERR_BADOVERLAY; + + if (ret) + return ret; + } + } + + fdt_for_each_subnode(fixup_child, fdto, fixup_node) { + const char *fixup_child_name = fdt_get_name(fdto, fixup_child, + NULL); + int tree_child; + + tree_child = fdt_subnode_offset(fdto, tree_node, + fixup_child_name); + if (tree_child == -FDT_ERR_NOTFOUND) + return -FDT_ERR_BADOVERLAY; + if (tree_child < 0) + return tree_child; + + ret = overlay_update_local_node_references(fdto, + tree_child, + fixup_child, + delta); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_update_local_references - Adjust the overlay references + * @fdto: Device tree overlay blob + * @delta: Offset to shift the phandles of + * + * overlay_update_local_references() update all the phandles pointing + * to a node within the device tree overlay by adding a constant + * delta to not conflict with the base overlay. + * + * This is mainly used as part of a device tree application process, + * where you want the device tree overlays phandles to not conflict + * with the ones from the base device tree before merging them. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_update_local_references(void *fdto, uint32_t delta) +{ + int fixups; + + fixups = fdt_path_offset(fdto, "/__local_fixups__"); + if (fixups < 0) { + /* There's no local phandles to adjust, bail out */ + if (fixups == -FDT_ERR_NOTFOUND) + return 0; + + return fixups; + } + + /* + * Update our local references from the root of the tree + */ + return overlay_update_local_node_references(fdto, 0, fixups, + delta); +} + +/** + * overlay_fixup_one_phandle - Set an overlay phandle to the base one + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * @symbols_off: Node offset of the symbols node in the base device tree + * @path: Path to a node holding a phandle in the overlay + * @path_len: number of path characters to consider + * @name: Name of the property holding the phandle reference in the overlay + * @name_len: number of name characters to consider + * @poffset: Offset within the overlay property where the phandle is stored + * @label: Label of the node referenced by the phandle + * + * overlay_fixup_one_phandle() resolves an overlay phandle pointing to + * a node in the base device tree. + * + * This is part of the device tree overlay application process, when + * you want all the phandles in the overlay to point to the actual + * base dt nodes. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_fixup_one_phandle(void *fdt, void *fdto, + int symbols_off, + const char *path, uint32_t path_len, + const char *name, uint32_t name_len, + int poffset, const char *label) +{ + const char *symbol_path; + uint32_t phandle; + fdt32_t phandle_prop; + int symbol_off, fixup_off; + int prop_len; + + if (symbols_off < 0) + return symbols_off; + + symbol_path = fdt_getprop(fdt, symbols_off, label, + &prop_len); + if (!symbol_path) + return prop_len; + + symbol_off = fdt_path_offset(fdt, symbol_path); + if (symbol_off < 0) + return symbol_off; + + phandle = fdt_get_phandle(fdt, symbol_off); + if (!phandle) + return -FDT_ERR_NOTFOUND; + + fixup_off = fdt_path_offset_namelen(fdto, path, path_len); + if (fixup_off == -FDT_ERR_NOTFOUND) + return -FDT_ERR_BADOVERLAY; + if (fixup_off < 0) + return fixup_off; + + phandle_prop = cpu_to_fdt32(phandle); + return fdt_setprop_inplace_namelen_partial(fdto, fixup_off, + name, name_len, poffset, + &phandle_prop, + sizeof(phandle_prop)); +}; + +/** + * overlay_fixup_phandle - Set an overlay phandle to the base one + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * @symbols_off: Node offset of the symbols node in the base device tree + * @property: Property offset in the overlay holding the list of fixups + * + * overlay_fixup_phandle() resolves all the overlay phandles pointed + * to in a __fixups__ property, and updates them to match the phandles + * in use in the base device tree. + * + * This is part of the device tree overlay application process, when + * you want all the phandles in the overlay to point to the actual + * base dt nodes. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_fixup_phandle(void *fdt, void *fdto, int symbols_off, + int property) +{ + const char *value; + const char *label; + int len; + + value = fdt_getprop_by_offset(fdto, property, + &label, &len); + if (!value) { + if (len == -FDT_ERR_NOTFOUND) + return -FDT_ERR_INTERNAL; + + return len; + } + + do { + const char *path, *name, *fixup_end; + const char *fixup_str = value; + uint32_t path_len, name_len; + uint32_t fixup_len; + char *sep; + const char *endptr; + int poffset, ret; + + fixup_end = memchr(value, '\0', len); + if (!fixup_end) + return -FDT_ERR_BADOVERLAY; + fixup_len = fixup_end - fixup_str; + + len -= fixup_len + 1; + value += fixup_len + 1; + + path = fixup_str; + sep = memchr(fixup_str, ':', fixup_len); + if (!sep || *sep != ':') + return -FDT_ERR_BADOVERLAY; + + path_len = sep - path; + if (path_len == (fixup_len - 1)) + return -FDT_ERR_BADOVERLAY; + + fixup_len -= path_len + 1; + name = sep + 1; + sep = memchr(name, ':', fixup_len); + if (!sep || *sep != ':') + return -FDT_ERR_BADOVERLAY; + + name_len = sep - name; + if (!name_len) + return -FDT_ERR_BADOVERLAY; + + poffset = simple_strtoul(sep + 1, &endptr, 10); + if ((*endptr != '\0') || (endptr <= (sep + 1))) + return -FDT_ERR_BADOVERLAY; + + ret = overlay_fixup_one_phandle(fdt, fdto, symbols_off, + path, path_len, name, name_len, + poffset, label); + if (ret) + return ret; + } while (len > 0); + + return 0; +} + +/** + * overlay_fixup_phandles - Resolve the overlay phandles to the base + * device tree + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * + * overlay_fixup_phandles() resolves all the overlay phandles pointing + * to nodes in the base device tree. + * + * This is one of the steps of the device tree overlay application + * process, when you want all the phandles in the overlay to point to + * the actual base dt nodes. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_fixup_phandles(void *fdt, void *fdto) +{ + int fixups_off, symbols_off; + int property; + + /* We can have overlays without any fixups */ + fixups_off = fdt_path_offset(fdto, "/__fixups__"); + if (fixups_off == -FDT_ERR_NOTFOUND) + return 0; /* nothing to do */ + if (fixups_off < 0) + return fixups_off; + + /* And base DTs without symbols */ + symbols_off = fdt_path_offset(fdt, "/__symbols__"); + if ((symbols_off < 0 && (symbols_off != -FDT_ERR_NOTFOUND))) + return symbols_off; + + fdt_for_each_property_offset(property, fdto, fixups_off) { + int ret; + + ret = overlay_fixup_phandle(fdt, fdto, symbols_off, property); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_apply_node - Merges a node into the base device tree + * @fdt: Base Device Tree blob + * @target: Node offset in the base device tree to apply the fragment to + * @fdto: Device tree overlay blob + * @node: Node offset in the overlay holding the changes to merge + * + * overlay_apply_node() merges a node into a target base device tree + * node pointed. + * + * This is part of the final step in the device tree overlay + * application process, when all the phandles have been adjusted and + * resolved and you just have to merge overlay into the base device + * tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_apply_node(void *fdt, int target, + void *fdto, int node) +{ + int property; + int subnode; + + fdt_for_each_property_offset(property, fdto, node) { + const char *name; + const void *prop; + int prop_len; + int ret; + + prop = fdt_getprop_by_offset(fdto, property, &name, + &prop_len); + if (prop_len == -FDT_ERR_NOTFOUND) + return -FDT_ERR_INTERNAL; + if (prop_len < 0) + return prop_len; + + ret = fdt_setprop(fdt, target, name, prop, prop_len); + if (ret) + return ret; + } + + fdt_for_each_subnode(subnode, fdto, node) { + const char *name = fdt_get_name(fdto, subnode, NULL); + int nnode; + int ret; + + nnode = fdt_add_subnode(fdt, target, name); + if (nnode == -FDT_ERR_EXISTS) { + nnode = fdt_subnode_offset(fdt, target, name); + if (nnode == -FDT_ERR_NOTFOUND) + return -FDT_ERR_INTERNAL; + } + + if (nnode < 0) + return nnode; + + ret = overlay_apply_node(fdt, nnode, fdto, subnode); + if (ret) + return ret; + } + + return 0; +} + +/** + * overlay_merge - Merge an overlay into its base device tree + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * + * overlay_merge() merges an overlay into its base device tree. + * + * This is the next to last step in the device tree overlay application + * process, when all the phandles have been adjusted and resolved and + * you just have to merge overlay into the base device tree. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_merge(void *fdt, void *fdto) +{ + int fragment; + + fdt_for_each_subnode(fragment, fdto, 0) { + int overlay; + int target; + int ret; + + /* + * Each fragments will have an __overlay__ node. If + * they don't, it's not supposed to be merged + */ + overlay = fdt_subnode_offset(fdto, fragment, "__overlay__"); + if (overlay == -FDT_ERR_NOTFOUND) + continue; + + if (overlay < 0) + return overlay; + + target = overlay_get_target(fdt, fdto, fragment, NULL); + if (target < 0) + return target; + + ret = overlay_apply_node(fdt, target, fdto, overlay); + if (ret) + return ret; + } + + return 0; +} + +static int get_path_len(const void *fdt, int nodeoffset) +{ + int len = 0, namelen; + const char *name; + + FDT_RO_PROBE(fdt); + + for (;;) { + name = fdt_get_name(fdt, nodeoffset, &namelen); + if (!name) + return namelen; + + /* root? we're done */ + if (namelen == 0) + break; + + nodeoffset = fdt_parent_offset(fdt, nodeoffset); + if (nodeoffset < 0) + return nodeoffset; + len += namelen + 1; + } + + /* in case of root pretend it's "/" */ + if (len == 0) + len++; + return len; +} + +/** + * overlay_symbol_update - Update the symbols of base tree after a merge + * @fdt: Base Device Tree blob + * @fdto: Device tree overlay blob + * + * overlay_symbol_update() updates the symbols of the base tree with the + * symbols of the applied overlay + * + * This is the last step in the device tree overlay application + * process, allowing the reference of overlay symbols by subsequent + * overlay operations. + * + * returns: + * 0 on success + * Negative error code on failure + */ +static int overlay_symbol_update(void *fdt, void *fdto) +{ + int root_sym, ov_sym, prop, path_len, fragment, target; + int len, frag_name_len, ret, rel_path_len; + const char *s, *e; + const char *path; + const char *name; + const char *frag_name; + const char *rel_path; + const char *target_path; + char *buf; + void *p; + + ov_sym = fdt_subnode_offset(fdto, 0, "__symbols__"); + + /* if no overlay symbols exist no problem */ + if (ov_sym < 0) + return 0; + + root_sym = fdt_subnode_offset(fdt, 0, "__symbols__"); + + /* it no root symbols exist we should create them */ + if (root_sym == -FDT_ERR_NOTFOUND) + root_sym = fdt_add_subnode(fdt, 0, "__symbols__"); + + /* any error is fatal now */ + if (root_sym < 0) + return root_sym; + + /* iterate over each overlay symbol */ + fdt_for_each_property_offset(prop, fdto, ov_sym) { + path = fdt_getprop_by_offset(fdto, prop, &name, &path_len); + if (!path) + return path_len; + + /* verify it's a string property (terminated by a single \0) */ + if (path_len < 1 || memchr(path, '\0', path_len) != &path[path_len - 1]) + return -FDT_ERR_BADVALUE; + + /* keep end marker to avoid strlen() */ + e = path + path_len; + + if (*path != '/') + return -FDT_ERR_BADVALUE; + + /* get fragment name first */ + s = strchr(path + 1, '/'); + if (!s) { + /* Symbol refers to something that won't end + * up in the target tree */ + continue; + } + + frag_name = path + 1; + frag_name_len = s - path - 1; + + /* verify format; safe since "s" lies in \0 terminated prop */ + len = sizeof("/__overlay__/") - 1; + if ((e - s) > len && (memcmp(s, "/__overlay__/", len) == 0)) { + /* //__overlay__/ */ + rel_path = s + len; + rel_path_len = e - rel_path - 1; + } else if ((e - s) == len + && (memcmp(s, "/__overlay__", len - 1) == 0)) { + /* //__overlay__ */ + rel_path = ""; + rel_path_len = 0; + } else { + /* Symbol refers to something that won't end + * up in the target tree */ + continue; + } + + /* find the fragment index in which the symbol lies */ + ret = fdt_subnode_offset_namelen(fdto, 0, frag_name, + frag_name_len); + /* not found? */ + if (ret < 0) + return -FDT_ERR_BADOVERLAY; + fragment = ret; + + /* an __overlay__ subnode must exist */ + ret = fdt_subnode_offset(fdto, fragment, "__overlay__"); + if (ret < 0) + return -FDT_ERR_BADOVERLAY; + + /* get the target of the fragment */ + ret = overlay_get_target(fdt, fdto, fragment, &target_path); + if (ret < 0) + return ret; + target = ret; + + /* if we have a target path use */ + if (!target_path) { + ret = get_path_len(fdt, target); + if (ret < 0) + return ret; + len = ret; + } else { + len = strlen(target_path); + } + + ret = fdt_setprop_placeholder(fdt, root_sym, name, + len + (len > 1) + rel_path_len + 1, &p); + if (ret < 0) + return ret; + + if (!target_path) { + /* again in case setprop_placeholder changed it */ + ret = overlay_get_target(fdt, fdto, fragment, &target_path); + if (ret < 0) + return ret; + target = ret; + } + + buf = p; + if (len > 1) { /* target is not root */ + if (!target_path) { + ret = fdt_get_path(fdt, target, buf, len + 1); + if (ret < 0) + return ret; + } else + memcpy(buf, target_path, len + 1); + + } else + len--; + + buf[len] = '/'; + memcpy(buf + len + 1, rel_path, rel_path_len); + buf[len + 1 + rel_path_len] = '\0'; + } + + return 0; +} + +int fdt_overlay_apply(void *fdt, void *fdto) +{ + uint32_t delta; + int ret; + + FDT_RO_PROBE(fdt); + FDT_RO_PROBE(fdto); + + ret = fdt_find_max_phandle(fdt, &delta); + if (ret) + goto err; + + ret = overlay_adjust_local_phandles(fdto, delta); + if (ret) + goto err; + + ret = overlay_update_local_references(fdto, delta); + if (ret) + goto err; + + ret = overlay_fixup_phandles(fdt, fdto); + if (ret) + goto err; + + ret = overlay_merge(fdt, fdto); + if (ret) + goto err; + + ret = overlay_symbol_update(fdt, fdto); + if (ret) + goto err; + + /* + * The overlay has been damaged, erase its magic. + */ + fdt_set_magic(fdto, ~0); + + return 0; + +err: + /* + * The overlay might have been damaged, erase its magic. + */ + fdt_set_magic(fdto, ~0); + + /* + * The base device tree might have been damaged, erase its + * magic. + */ + fdt_set_magic(fdt, ~0); + + return ret; +} diff --git a/xen/common/libfdt/fdt_ro.c b/xen/common/libfdt/fdt_ro.c index 36f9b480d1..17584da257 100644 --- a/xen/common/libfdt/fdt_ro.c +++ b/xen/common/libfdt/fdt_ro.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,12 +10,13 @@ #include "libfdt_internal.h" -static int _fdt_nodename_eq(const void *fdt, int offset, +static int fdt_nodename_eq_(const void *fdt, int offset, const char *s, int len) { - const char *p = fdt_offset_ptr(fdt, offset + FDT_TAGSIZE, len+1); + int olen; + const char *p = fdt_get_name(fdt, offset, &olen); - if (! p) + if (!p || olen < len) /* short match */ return 0; @@ -73,37 +31,174 @@ static int _fdt_nodename_eq(const void *fdt, int offset, return 0; } +const char *fdt_get_string(const void *fdt, int stroffset, int *lenp) +{ + int32_t totalsize; + uint32_t absoffset; + size_t len; + int err; + const char *s, *n; + + if (can_assume(VALID_INPUT)) { + s = (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset; + + if (lenp) + *lenp = strlen(s); + return s; + } + totalsize = fdt_ro_probe_(fdt); + err = totalsize; + if (totalsize < 0) + goto fail; + + err = -FDT_ERR_BADOFFSET; + absoffset = stroffset + fdt_off_dt_strings(fdt); + if (absoffset >= (unsigned)totalsize) + goto fail; + len = totalsize - absoffset; + + if (fdt_magic(fdt) == FDT_MAGIC) { + if (stroffset < 0) + goto fail; + if (can_assume(LATEST) || fdt_version(fdt) >= 17) { + if ((unsigned)stroffset >= fdt_size_dt_strings(fdt)) + goto fail; + if ((fdt_size_dt_strings(fdt) - stroffset) < len) + len = fdt_size_dt_strings(fdt) - stroffset; + } + } else if (fdt_magic(fdt) == FDT_SW_MAGIC) { + unsigned int sw_stroffset = -stroffset; + + if ((stroffset >= 0) || + (sw_stroffset > fdt_size_dt_strings(fdt))) + goto fail; + if (sw_stroffset < len) + len = sw_stroffset; + } else { + err = -FDT_ERR_INTERNAL; + goto fail; + } + + s = (const char *)fdt + absoffset; + n = memchr(s, '\0', len); + if (!n) { + /* missing terminating NULL */ + err = -FDT_ERR_TRUNCATED; + goto fail; + } + + if (lenp) + *lenp = n - s; + return s; + +fail: + if (lenp) + *lenp = err; + return NULL; +} + const char *fdt_string(const void *fdt, int stroffset) { - return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset; + return fdt_get_string(fdt, stroffset, NULL); } -static int _fdt_string_eq(const void *fdt, int stroffset, +static int fdt_string_eq_(const void *fdt, int stroffset, const char *s, int len) { - const char *p = fdt_string(fdt, stroffset); + int slen; + const char *p = fdt_get_string(fdt, stroffset, &slen); + + return p && (slen == len) && (memcmp(p, s, len) == 0); +} + +int fdt_find_max_phandle(const void *fdt, uint32_t *phandle) +{ + uint32_t max = 0; + int offset = -1; + + while (true) { + uint32_t value; + + offset = fdt_next_node(fdt, offset, NULL); + if (offset < 0) { + if (offset == -FDT_ERR_NOTFOUND) + break; + + return offset; + } + + value = fdt_get_phandle(fdt, offset); + + if (value > max) + max = value; + } + + if (phandle) + *phandle = max; + + return 0; +} + +int fdt_generate_phandle(const void *fdt, uint32_t *phandle) +{ + uint32_t max; + int err; + + err = fdt_find_max_phandle(fdt, &max); + if (err < 0) + return err; + + if (max == FDT_MAX_PHANDLE) + return -FDT_ERR_NOPHANDLES; + + if (phandle) + *phandle = max + 1; + + return 0; +} - return (strlen(p) == len) && (memcmp(p, s, len) == 0); +static const struct fdt_reserve_entry *fdt_mem_rsv(const void *fdt, int n) +{ + unsigned int offset = n * sizeof(struct fdt_reserve_entry); + unsigned int absoffset = fdt_off_mem_rsvmap(fdt) + offset; + + if (!can_assume(VALID_INPUT)) { + if (absoffset < fdt_off_mem_rsvmap(fdt)) + return NULL; + if (absoffset > fdt_totalsize(fdt) - + sizeof(struct fdt_reserve_entry)) + return NULL; + } + return fdt_mem_rsv_(fdt, n); } int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size) { - FDT_CHECK_HEADER(fdt); - *address = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->address); - *size = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->size); + const struct fdt_reserve_entry *re; + + FDT_RO_PROBE(fdt); + re = fdt_mem_rsv(fdt, n); + if (!can_assume(VALID_INPUT) && !re) + return -FDT_ERR_BADOFFSET; + + *address = fdt64_ld_(&re->address); + *size = fdt64_ld_(&re->size); return 0; } int fdt_num_mem_rsv(const void *fdt) { - int i = 0; + int i; + const struct fdt_reserve_entry *re; - while (fdt64_to_cpu(_fdt_mem_rsv(fdt, i)->size) != 0) - i++; - return i; + for (i = 0; (re = fdt_mem_rsv(fdt, i)) != NULL; i++) { + if (fdt64_ld_(&re->size) == 0) + return i; + } + return -FDT_ERR_TRUNCATED; } -static int _nextprop(const void *fdt, int offset) +static int nextprop_(const void *fdt, int offset) { uint32_t tag; int nextoffset; @@ -132,13 +227,13 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset, { int depth; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); for (depth = 0; (offset >= 0) && (depth >= 0); offset = fdt_next_node(fdt, offset, &depth)) if ((depth == 1) - && _fdt_nodename_eq(fdt, offset, name, namelen)) + && fdt_nodename_eq_(fdt, offset, name, namelen)) return offset; if (depth < 0) @@ -152,17 +247,17 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, return fdt_subnode_offset_namelen(fdt, parentoffset, name, strlen(name)); } -int fdt_path_offset(const void *fdt, const char *path) +int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen) { - const char *end = path + strlen(path); + const char *end = path + namelen; const char *p = path; int offset = 0; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* see if we have an alias */ if (*path != '/') { - const char *q = strchr(path, '/'); + const char *q = memchr(path, '/', end - p); if (!q) q = end; @@ -175,14 +270,15 @@ int fdt_path_offset(const void *fdt, const char *path) p = q; } - while (*p) { + while (p < end) { const char *q; - while (*p == '/') + while (*p == '/') { p++; - if (! *p) - return offset; - q = strchr(p, '/'); + if (p == end) + return offset; + } + q = memchr(p, '/', end - p); if (! q) q = end; @@ -196,19 +292,42 @@ int fdt_path_offset(const void *fdt, const char *path) return offset; } +int fdt_path_offset(const void *fdt, const char *path) +{ + return fdt_path_offset_namelen(fdt, path, strlen(path)); +} + const char *fdt_get_name(const void *fdt, int nodeoffset, int *len) { - const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset); + const struct fdt_node_header *nh = fdt_offset_ptr_(fdt, nodeoffset); + const char *nameptr; int err; - if (((err = fdt_check_header(fdt)) != 0) - || ((err = _fdt_check_node_offset(fdt, nodeoffset)) < 0)) + if (((err = fdt_ro_probe_(fdt)) < 0) + || ((err = fdt_check_node_offset_(fdt, nodeoffset)) < 0)) + goto fail; + + nameptr = nh->name; + + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10) { + /* + * For old FDT versions, match the naming conventions of V16: + * give only the leaf name (after all /). The actual tree + * contents are loosely checked. + */ + const char *leaf; + leaf = strrchr(nameptr, '/'); + if (leaf == NULL) { + err = -FDT_ERR_BADSTRUCTURE; goto fail; + } + nameptr = leaf+1; + } if (len) - *len = strlen(nh->name); + *len = strlen(nameptr); - return nh->name; + return nameptr; fail: if (len) @@ -220,58 +339,81 @@ int fdt_first_property_offset(const void *fdt, int nodeoffset) { int offset; - if ((offset = _fdt_check_node_offset(fdt, nodeoffset)) < 0) + if ((offset = fdt_check_node_offset_(fdt, nodeoffset)) < 0) return offset; - return _nextprop(fdt, offset); + return nextprop_(fdt, offset); } int fdt_next_property_offset(const void *fdt, int offset) { - if ((offset = _fdt_check_prop_offset(fdt, offset)) < 0) + if ((offset = fdt_check_prop_offset_(fdt, offset)) < 0) return offset; - return _nextprop(fdt, offset); + return nextprop_(fdt, offset); } -const struct fdt_property *fdt_get_property_by_offset(const void *fdt, - int offset, - int *lenp) +static const struct fdt_property *fdt_get_property_by_offset_(const void *fdt, + int offset, + int *lenp) { int err; const struct fdt_property *prop; - if ((err = _fdt_check_prop_offset(fdt, offset)) < 0) { + if (!can_assume(VALID_INPUT) && + (err = fdt_check_prop_offset_(fdt, offset)) < 0) { if (lenp) *lenp = err; return NULL; } - prop = _fdt_offset_ptr(fdt, offset); + prop = fdt_offset_ptr_(fdt, offset); if (lenp) - *lenp = fdt32_to_cpu(prop->len); + *lenp = fdt32_ld_(&prop->len); return prop; } -const struct fdt_property *fdt_get_property_namelen(const void *fdt, - int offset, - const char *name, - int namelen, int *lenp) +const struct fdt_property *fdt_get_property_by_offset(const void *fdt, + int offset, + int *lenp) +{ + /* Prior to version 16, properties may need realignment + * and this API does not work. fdt_getprop_*() will, however. */ + + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10) { + if (lenp) + *lenp = -FDT_ERR_BADVERSION; + return NULL; + } + + return fdt_get_property_by_offset_(fdt, offset, lenp); +} + +static const struct fdt_property *fdt_get_property_namelen_(const void *fdt, + int offset, + const char *name, + int namelen, + int *lenp, + int *poffset) { for (offset = fdt_first_property_offset(fdt, offset); (offset >= 0); (offset = fdt_next_property_offset(fdt, offset))) { const struct fdt_property *prop; - if (!(prop = fdt_get_property_by_offset(fdt, offset, lenp))) { + prop = fdt_get_property_by_offset_(fdt, offset, lenp); + if (!can_assume(LIBFDT_FLAWLESS) && !prop) { offset = -FDT_ERR_INTERNAL; break; } - if (_fdt_string_eq(fdt, fdt32_to_cpu(prop->nameoff), - name, namelen)) + if (fdt_string_eq_(fdt, fdt32_ld_(&prop->nameoff), + name, namelen)) { + if (poffset) + *poffset = offset; return prop; + } } if (lenp) @@ -279,6 +421,25 @@ const struct fdt_property *fdt_get_property_namelen(const void *fdt, return NULL; } + +const struct fdt_property *fdt_get_property_namelen(const void *fdt, + int offset, + const char *name, + int namelen, int *lenp) +{ + /* Prior to version 16, properties may need realignment + * and this API does not work. fdt_getprop_*() will, however. */ + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10) { + if (lenp) + *lenp = -FDT_ERR_BADVERSION; + return NULL; + } + + return fdt_get_property_namelen_(fdt, offset, name, namelen, lenp, + NULL); +} + + const struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset, const char *name, int *lenp) @@ -290,12 +451,18 @@ const struct fdt_property *fdt_get_property(const void *fdt, const void *fdt_getprop_namelen(const void *fdt, int nodeoffset, const char *name, int namelen, int *lenp) { + int poffset; const struct fdt_property *prop; - prop = fdt_get_property_namelen(fdt, nodeoffset, name, namelen, lenp); - if (! prop) + prop = fdt_get_property_namelen_(fdt, nodeoffset, name, namelen, lenp, + &poffset); + if (!prop) return NULL; + /* Handle realignment */ + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10 && + (poffset + sizeof(*prop)) % 8 && fdt32_ld_(&prop->len) >= 8) + return prop->data + 4; return prop->data; } @@ -304,11 +471,31 @@ const void *fdt_getprop_by_offset(const void *fdt, int offset, { const struct fdt_property *prop; - prop = fdt_get_property_by_offset(fdt, offset, lenp); + prop = fdt_get_property_by_offset_(fdt, offset, lenp); if (!prop) return NULL; - if (namep) - *namep = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); + if (namep) { + const char *name; + int namelen; + + if (!can_assume(VALID_INPUT)) { + name = fdt_get_string(fdt, fdt32_ld_(&prop->nameoff), + &namelen); + if (!name) { + if (lenp) + *lenp = namelen; + return NULL; + } + *namep = name; + } else { + *namep = fdt_string(fdt, fdt32_ld_(&prop->nameoff)); + } + } + + /* Handle realignment */ + if (!can_assume(LATEST) && fdt_version(fdt) < 0x10 && + (offset + sizeof(*prop)) % 8 && fdt32_ld_(&prop->len) >= 8) + return prop->data + 4; return prop->data; } @@ -332,7 +519,7 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset) return 0; } - return fdt32_to_cpu(*php); + return fdt32_ld_(php); } const char *fdt_get_alias_namelen(const void *fdt, @@ -358,7 +545,7 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen) int offset, depth, namelen; const char *name; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); if (buflen < 2) return -FDT_ERR_NOSPACE; @@ -410,7 +597,7 @@ int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset, int offset, depth; int supernodeoffset = -FDT_ERR_INTERNAL; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); if (supernodedepth < 0) return -FDT_ERR_NOTFOUND; @@ -432,10 +619,12 @@ int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset, } } - if ((offset == -FDT_ERR_NOTFOUND) || (offset >= 0)) - return -FDT_ERR_BADOFFSET; - else if (offset == -FDT_ERR_BADOFFSET) - return -FDT_ERR_BADSTRUCTURE; + if (!can_assume(VALID_INPUT)) { + if ((offset == -FDT_ERR_NOTFOUND) || (offset >= 0)) + return -FDT_ERR_BADOFFSET; + else if (offset == -FDT_ERR_BADOFFSET) + return -FDT_ERR_BADSTRUCTURE; + } return offset; /* error from fdt_next_node() */ } @@ -447,7 +636,8 @@ int fdt_node_depth(const void *fdt, int nodeoffset) err = fdt_supernode_atdepth_offset(fdt, nodeoffset, 0, &nodedepth); if (err) - return (err < 0) ? err : -FDT_ERR_INTERNAL; + return (can_assume(LIBFDT_FLAWLESS) || err < 0) ? err : + -FDT_ERR_INTERNAL; return nodedepth; } @@ -469,7 +659,7 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset, const void *val; int len; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* FIXME: The algorithm here is pretty horrible: we scan each * property of a node in fdt_getprop(), then if that didn't @@ -492,10 +682,10 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle) { int offset; - if ((phandle == 0) || (phandle == -1)) + if ((phandle == 0) || (phandle == ~0U)) return -FDT_ERR_BADPHANDLE; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* FIXME: The algorithm here is pretty horrible: we * potentially scan each property of a node in @@ -530,6 +720,106 @@ int fdt_stringlist_contains(const char *strlist, int listlen, const char *str) return 0; } +int fdt_stringlist_count(const void *fdt, int nodeoffset, const char *property) +{ + const char *list, *end; + int length, count = 0; + + list = fdt_getprop(fdt, nodeoffset, property, &length); + if (!list) + return length; + + end = list + length; + + while (list < end) { + length = strnlen(list, end - list) + 1; + + /* Abort if the last string isn't properly NUL-terminated. */ + if (list + length > end) + return -FDT_ERR_BADVALUE; + + list += length; + count++; + } + + return count; +} + +int fdt_stringlist_search(const void *fdt, int nodeoffset, const char *property, + const char *string) +{ + int length, len, idx = 0; + const char *list, *end; + + list = fdt_getprop(fdt, nodeoffset, property, &length); + if (!list) + return length; + + len = strlen(string) + 1; + end = list + length; + + while (list < end) { + length = strnlen(list, end - list) + 1; + + /* Abort if the last string isn't properly NUL-terminated. */ + if (list + length > end) + return -FDT_ERR_BADVALUE; + + if (length == len && memcmp(list, string, length) == 0) + return idx; + + list += length; + idx++; + } + + return -FDT_ERR_NOTFOUND; +} + +const char *fdt_stringlist_get(const void *fdt, int nodeoffset, + const char *property, int idx, + int *lenp) +{ + const char *list, *end; + int length; + + list = fdt_getprop(fdt, nodeoffset, property, &length); + if (!list) { + if (lenp) + *lenp = length; + + return NULL; + } + + end = list + length; + + while (list < end) { + length = strnlen(list, end - list) + 1; + + /* Abort if the last string isn't properly NUL-terminated. */ + if (list + length > end) { + if (lenp) + *lenp = -FDT_ERR_BADVALUE; + + return NULL; + } + + if (idx == 0) { + if (lenp) + *lenp = length - 1; + + return list; + } + + list += length; + idx--; + } + + if (lenp) + *lenp = -FDT_ERR_NOTFOUND; + + return NULL; +} + int fdt_node_check_compatible(const void *fdt, int nodeoffset, const char *compatible) { @@ -539,10 +829,8 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, prop = fdt_getprop(fdt, nodeoffset, "compatible", &len); if (!prop) return len; - if (fdt_stringlist_contains(prop, len, compatible)) - return 0; - else - return 1; + + return !fdt_stringlist_contains(prop, len, compatible); } int fdt_node_offset_by_compatible(const void *fdt, int startoffset, @@ -550,7 +838,7 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset, { int offset, err; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); /* FIXME: The algorithm here is pretty horrible: we scan each * property of a node in fdt_node_check_compatible(), then if diff --git a/xen/common/libfdt/fdt_rw.c b/xen/common/libfdt/fdt_rw.c index 8b8cd25cc2..3621d3651d 100644 --- a/xen/common/libfdt/fdt_rw.c +++ b/xen/common/libfdt/fdt_rw.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,8 +10,8 @@ #include "libfdt_internal.h" -static int _fdt_blocks_misordered(const void *fdt, - int mem_rsv_size, int struct_size) +static int fdt_blocks_misordered_(const void *fdt, + int mem_rsv_size, int struct_size) { return (fdt_off_mem_rsvmap(fdt) < FDT_ALIGN(sizeof(struct fdt_header), 8)) || (fdt_off_dt_struct(fdt) < @@ -65,40 +22,44 @@ static int _fdt_blocks_misordered(const void *fdt, (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt))); } -static int _fdt_rw_check_header(void *fdt) +static int fdt_rw_probe_(void *fdt) { - FDT_CHECK_HEADER(fdt); + if (can_assume(VALID_DTB)) + return 0; + FDT_RO_PROBE(fdt); - if (fdt_version(fdt) < 17) + if (!can_assume(LATEST) && fdt_version(fdt) < 17) return -FDT_ERR_BADVERSION; - if (_fdt_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry), + if (fdt_blocks_misordered_(fdt, sizeof(struct fdt_reserve_entry), fdt_size_dt_struct(fdt))) return -FDT_ERR_BADLAYOUT; - if (fdt_version(fdt) > 17) + if (!can_assume(LATEST) && fdt_version(fdt) > 17) fdt_set_version(fdt, 17); return 0; } -#define FDT_RW_CHECK_HEADER(fdt) \ +#define FDT_RW_PROBE(fdt) \ { \ - int err; \ - if ((err = _fdt_rw_check_header(fdt)) != 0) \ - return err; \ + int err_; \ + if ((err_ = fdt_rw_probe_(fdt)) != 0) \ + return err_; \ } -static inline unsigned int _fdt_data_size(void *fdt) +static inline unsigned int fdt_data_size_(void *fdt) { return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt); } -static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen) +static int fdt_splice_(void *fdt, void *splicepoint, int oldlen, int newlen) { char *p = splicepoint; - unsigned int dsize = _fdt_data_size(fdt); + unsigned int dsize = fdt_data_size_(fdt); size_t soff = p - (char *)fdt; - if (oldlen < 0 || soff + oldlen < soff || soff + oldlen > dsize) + if ((oldlen < 0) || (soff + oldlen < soff) || (soff + oldlen > dsize)) + return -FDT_ERR_BADOFFSET; + if ((p < (char *)fdt) || (dsize + newlen < (unsigned)oldlen)) return -FDT_ERR_BADOFFSET; if (dsize - oldlen + newlen > fdt_totalsize(fdt)) return -FDT_ERR_NOSPACE; @@ -106,12 +67,12 @@ static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen) return 0; } -static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p, +static int fdt_splice_mem_rsv_(void *fdt, struct fdt_reserve_entry *p, int oldn, int newn) { int delta = (newn - oldn) * sizeof(*p); int err; - err = _fdt_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p)); + err = fdt_splice_(fdt, p, oldn * sizeof(*p), newn * sizeof(*p)); if (err) return err; fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta); @@ -119,13 +80,13 @@ static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p, return 0; } -static int _fdt_splice_struct(void *fdt, void *p, +static int fdt_splice_struct_(void *fdt, void *p, int oldlen, int newlen) { int delta = newlen - oldlen; int err; - if ((err = _fdt_splice(fdt, p, oldlen, newlen))) + if ((err = fdt_splice_(fdt, p, oldlen, newlen))) return err; fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta); @@ -133,20 +94,37 @@ static int _fdt_splice_struct(void *fdt, void *p, return 0; } -static int _fdt_splice_string(void *fdt, int newlen) +/* Must only be used to roll back in case of error */ +static void fdt_del_last_string_(void *fdt, const char *s) +{ + int newlen = strlen(s) + 1; + + fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) - newlen); +} + +static int fdt_splice_string_(void *fdt, int newlen) { void *p = (char *)fdt + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt); int err; - if ((err = _fdt_splice(fdt, p, 0, newlen))) + if ((err = fdt_splice_(fdt, p, 0, newlen))) return err; fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen); return 0; } -static int _fdt_find_add_string(void *fdt, const char *s) +/** + * fdt_find_add_string_() - Find or allocate a string + * + * @fdt: pointer to the device tree to check/adjust + * @s: string to find/add + * @allocated: Set to 0 if the string was found, 1 if not found and so + * allocated. Ignored if can_assume(NO_ROLLBACK) + * @return offset of string in the string table (whether found or added) + */ +static int fdt_find_add_string_(void *fdt, const char *s, int *allocated) { char *strtab = (char *)fdt + fdt_off_dt_strings(fdt); const char *p; @@ -154,16 +132,22 @@ static int _fdt_find_add_string(void *fdt, const char *s) int len = strlen(s) + 1; int err; - p = _fdt_find_string(strtab, fdt_size_dt_strings(fdt), s); + if (!can_assume(NO_ROLLBACK)) + *allocated = 0; + + p = fdt_find_string_(strtab, fdt_size_dt_strings(fdt), s); if (p) /* found it */ return (p - strtab); new = strtab + fdt_size_dt_strings(fdt); - err = _fdt_splice_string(fdt, len); + err = fdt_splice_string_(fdt, len); if (err) return err; + if (!can_assume(NO_ROLLBACK)) + *allocated = 1; + memcpy(new, s, len); return (new - strtab); } @@ -173,10 +157,10 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size) struct fdt_reserve_entry *re; int err; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); - re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt)); - err = _fdt_splice_mem_rsv(fdt, re, 0, 1); + re = fdt_mem_rsv_w_(fdt, fdt_num_mem_rsv(fdt)); + err = fdt_splice_mem_rsv_(fdt, re, 0, 1); if (err) return err; @@ -187,31 +171,27 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size) int fdt_del_mem_rsv(void *fdt, int n) { - struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n); - int err; + struct fdt_reserve_entry *re = fdt_mem_rsv_w_(fdt, n); - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); if (n >= fdt_num_mem_rsv(fdt)) return -FDT_ERR_NOTFOUND; - err = _fdt_splice_mem_rsv(fdt, re, 1, 0); - if (err) - return err; - return 0; + return fdt_splice_mem_rsv_(fdt, re, 1, 0); } -static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name, +static int fdt_resize_property_(void *fdt, int nodeoffset, const char *name, int len, struct fdt_property **prop) { int oldlen; int err; *prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); - if (! (*prop)) + if (!*prop) return oldlen; - if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen), + if ((err = fdt_splice_struct_(fdt, (*prop)->data, FDT_TAGALIGN(oldlen), FDT_TAGALIGN(len)))) return err; @@ -219,27 +199,32 @@ static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name, return 0; } -static int _fdt_add_property(void *fdt, int nodeoffset, const char *name, +static int fdt_add_property_(void *fdt, int nodeoffset, const char *name, int len, struct fdt_property **prop) { int proplen; int nextoffset; int namestroff; int err; + int allocated; - if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) < 0) + if ((nextoffset = fdt_check_node_offset_(fdt, nodeoffset)) < 0) return nextoffset; - namestroff = _fdt_find_add_string(fdt, name); + namestroff = fdt_find_add_string_(fdt, name, &allocated); if (namestroff < 0) return namestroff; - *prop = _fdt_offset_ptr_w(fdt, nextoffset); + *prop = fdt_offset_ptr_w_(fdt, nextoffset); proplen = sizeof(**prop) + FDT_TAGALIGN(len); - err = _fdt_splice_struct(fdt, *prop, 0, proplen); - if (err) + err = fdt_splice_struct_(fdt, *prop, 0, proplen); + if (err) { + /* Delete the string if we failed to add it */ + if (!can_assume(NO_ROLLBACK) && allocated) + fdt_del_last_string_(fdt, name); return err; + } (*prop)->tag = cpu_to_fdt32(FDT_PROP); (*prop)->nameoff = cpu_to_fdt32(namestroff); @@ -253,7 +238,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) int oldlen, newlen; int err; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen); if (!namep) @@ -261,7 +246,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) newlen = strlen(name); - err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1), + err = fdt_splice_struct_(fdt, namep, FDT_TAGALIGN(oldlen+1), FDT_TAGALIGN(newlen+1)); if (err) return err; @@ -270,21 +255,36 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) return 0; } -int fdt_setprop(void *fdt, int nodeoffset, const char *name, - const void *val, int len) +int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name, + int len, void **prop_data) { struct fdt_property *prop; int err; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); - err = _fdt_resize_property(fdt, nodeoffset, name, len, &prop); + err = fdt_resize_property_(fdt, nodeoffset, name, len, &prop); if (err == -FDT_ERR_NOTFOUND) - err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + err = fdt_add_property_(fdt, nodeoffset, name, len, &prop); + if (err) + return err; + + *prop_data = prop->data; + return 0; +} + +int fdt_setprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len) +{ + void *prop_data; + int err; + + err = fdt_setprop_placeholder(fdt, nodeoffset, name, len, &prop_data); if (err) return err; - memcpy(prop->data, val, len); + if (len) + memcpy(prop_data, val, len); return 0; } @@ -294,12 +294,12 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name, struct fdt_property *prop; int err, oldlen, newlen; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); if (prop) { newlen = len + oldlen; - err = _fdt_splice_struct(fdt, prop->data, + err = fdt_splice_struct_(fdt, prop->data, FDT_TAGALIGN(oldlen), FDT_TAGALIGN(newlen)); if (err) @@ -307,7 +307,7 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name, prop->len = cpu_to_fdt32(newlen); memcpy(prop->data + oldlen, val, len); } else { - err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + err = fdt_add_property_(fdt, nodeoffset, name, len, &prop); if (err) return err; memcpy(prop->data, val, len); @@ -320,14 +320,14 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name) struct fdt_property *prop; int len, proplen; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); prop = fdt_get_property_w(fdt, nodeoffset, name, &len); - if (! prop) + if (!prop) return len; proplen = sizeof(*prop) + FDT_TAGALIGN(len); - return _fdt_splice_struct(fdt, prop, proplen, 0); + return fdt_splice_struct_(fdt, prop, proplen, 0); } int fdt_add_subnode_namelen(void *fdt, int parentoffset, @@ -340,7 +340,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, uint32_t tag; fdt32_t *endtag; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen); if (offset >= 0) @@ -349,16 +349,19 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, return offset; /* Try to place the new node after the parent's properties */ - fdt_next_tag(fdt, parentoffset, &nextoffset); /* skip the BEGIN_NODE */ + tag = fdt_next_tag(fdt, parentoffset, &nextoffset); + /* the fdt_subnode_offset_namelen() should ensure this never hits */ + if (!can_assume(LIBFDT_FLAWLESS) && (tag != FDT_BEGIN_NODE)) + return -FDT_ERR_INTERNAL; do { offset = nextoffset; tag = fdt_next_tag(fdt, offset, &nextoffset); } while ((tag == FDT_PROP) || (tag == FDT_NOP)); - nh = _fdt_offset_ptr_w(fdt, offset); + nh = fdt_offset_ptr_w_(fdt, offset); nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE; - err = _fdt_splice_struct(fdt, nh, 0, nodelen); + err = fdt_splice_struct_(fdt, nh, 0, nodelen); if (err) return err; @@ -380,18 +383,20 @@ int fdt_del_node(void *fdt, int nodeoffset) { int endoffset; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); - endoffset = _fdt_node_end_offset(fdt, nodeoffset); + endoffset = fdt_node_end_offset_(fdt, nodeoffset); if (endoffset < 0) return endoffset; - return _fdt_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset), + return fdt_splice_struct_(fdt, fdt_offset_ptr_w_(fdt, nodeoffset), endoffset - nodeoffset, 0); } -static void _fdt_packblocks(const char *old, char *new, - int mem_rsv_size, int struct_size) +static void fdt_packblocks_(const char *old, char *new, + int mem_rsv_size, + int struct_size, + int strings_size) { int mem_rsv_off, struct_off, strings_off; @@ -406,8 +411,7 @@ static void _fdt_packblocks(const char *old, char *new, fdt_set_off_dt_struct(new, struct_off); fdt_set_size_dt_struct(new, struct_size); - memmove(new + strings_off, old + fdt_off_dt_strings(old), - fdt_size_dt_strings(old)); + memmove(new + strings_off, old + fdt_off_dt_strings(old), strings_size); fdt_set_off_dt_strings(new, strings_off); fdt_set_size_dt_strings(new, fdt_size_dt_strings(old)); } @@ -421,22 +425,25 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) const char *fdtend = fdtstart + fdt_totalsize(fdt); char *tmp; - FDT_CHECK_HEADER(fdt); + FDT_RO_PROBE(fdt); mem_rsv_size = (fdt_num_mem_rsv(fdt)+1) * sizeof(struct fdt_reserve_entry); - if (fdt_version(fdt) >= 17) { + if (can_assume(LATEST) || fdt_version(fdt) >= 17) { struct_size = fdt_size_dt_struct(fdt); - } else { + } else if (fdt_version(fdt) == 16) { struct_size = 0; while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END) ; if (struct_size < 0) return struct_size; + } else { + return -FDT_ERR_BADVERSION; } - if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) { + if (can_assume(LIBFDT_ORDER) || + !fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) { /* no further work necessary */ err = fdt_move(fdt, buf, bufsize); if (err) @@ -464,7 +471,8 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize) return -FDT_ERR_NOSPACE; } - _fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size); + fdt_packblocks_(fdt, tmp, mem_rsv_size, struct_size, + fdt_size_dt_strings(fdt)); memmove(buf, tmp, newsize); fdt_set_magic(buf, FDT_MAGIC); @@ -480,12 +488,13 @@ int fdt_pack(void *fdt) { int mem_rsv_size; - FDT_RW_CHECK_HEADER(fdt); + FDT_RW_PROBE(fdt); mem_rsv_size = (fdt_num_mem_rsv(fdt)+1) * sizeof(struct fdt_reserve_entry); - _fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt)); - fdt_set_totalsize(fdt, _fdt_data_size(fdt)); + fdt_packblocks_(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt), + fdt_size_dt_strings(fdt)); + fdt_set_totalsize(fdt, fdt_data_size_(fdt)); return 0; } diff --git a/xen/common/libfdt/fdt_strerror.c b/xen/common/libfdt/fdt_strerror.c index 8d0289cb38..b4356931b0 100644 --- a/xen/common/libfdt/fdt_strerror.c +++ b/xen/common/libfdt/fdt_strerror.c @@ -1,49 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -67,6 +25,7 @@ static struct fdt_errtabent fdt_errtable[] = { FDT_ERRTABENT(FDT_ERR_BADOFFSET), FDT_ERRTABENT(FDT_ERR_BADPATH), + FDT_ERRTABENT(FDT_ERR_BADPHANDLE), FDT_ERRTABENT(FDT_ERR_BADSTATE), FDT_ERRTABENT(FDT_ERR_TRUNCATED), @@ -74,8 +33,14 @@ static struct fdt_errtabent fdt_errtable[] = { FDT_ERRTABENT(FDT_ERR_BADVERSION), FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE), FDT_ERRTABENT(FDT_ERR_BADLAYOUT), + FDT_ERRTABENT(FDT_ERR_INTERNAL), + FDT_ERRTABENT(FDT_ERR_BADNCELLS), + FDT_ERRTABENT(FDT_ERR_BADVALUE), + FDT_ERRTABENT(FDT_ERR_BADOVERLAY), + FDT_ERRTABENT(FDT_ERR_NOPHANDLES), + FDT_ERRTABENT(FDT_ERR_BADFLAGS), }; -#define FDT_ERRTABSIZE (sizeof(fdt_errtable) / sizeof(fdt_errtable[0])) +#define FDT_ERRTABSIZE ((int)(sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))) const char *fdt_strerror(int errval) { @@ -83,7 +48,7 @@ const char *fdt_strerror(int errval) return ""; else if (errval == 0) return ""; - else if (errval > -FDT_ERRTABSIZE) { + else if (-errval < FDT_ERRTABSIZE) { const char *s = fdt_errtable[-errval].str; if (s) diff --git a/xen/common/libfdt/fdt_sw.c b/xen/common/libfdt/fdt_sw.c index c7d93d3bba..4c569ee7eb 100644 --- a/xen/common/libfdt/fdt_sw.c +++ b/xen/common/libfdt/fdt_sw.c @@ -1,50 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. - * - * libfdt is dual licensed: you can use it either under the terms of - * the GPL, or the BSD license, at your option. - * - * a) This library 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 library 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 library; If not, see . - * - * Alternatively, - * - * b) Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the following - * disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "libfdt_env.h" @@ -53,25 +10,91 @@ #include "libfdt_internal.h" -static int _fdt_sw_check_header(void *fdt) +static int fdt_sw_probe_(void *fdt) From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240427.416913 (Exim 4.92) (envelope-from ) id 1muPBN-0003vG-Qk; Tue, 07 Dec 2021 01:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240427.416913; Tue, 07 Dec 2021 01:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBN-0003v8-NX; Tue, 07 Dec 2021 01:22:13 +0000 Received: by outflank-mailman (input) for mailman id 240427; Tue, 07 Dec 2021 01:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBM-0003v1-67 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBM-0005QB-5H for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPBM-0007y1-44 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BXIS4ZNwYvpFH1gVZ0atFZGb1HzU6EL289A4r9ULc3w=; b=iEHwwpKDB2JWW6IQb6T4ODoQti hFLjaTqR1mvSmWyFAJbTdPdPHcfEtd5BD/CrN/36ZLjyTVDq98RB+o11Nwo6HRCNaasnkRdeXVfXK TfpnQ5vJ/ylvtVWNeHucBjWRqUv8ftNShoq6vD+ldpqP067w0eDJ3b5bdf+m/FrypFu4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/efi: Improve performance requesting filesystem handle Message-Id: Date: Tue, 07 Dec 2021 01:22:12 +0000 commit 9012687f05adf96440316ce338514db574ebfde0 Author: Luca Fancellu AuthorDate: Tue Nov 16 15:06:24 2021 +0000 Commit: Julien Grall CommitDate: Wed Dec 1 16:40:19 2021 +0000 arm/efi: Improve performance requesting filesystem handle Currently, the code used to handle and possibly load from the filesystem modules defined in the DT is allocating and closing the filesystem handle for each module to be loaded. To improve the performance, the filesystem handle pointer is passed through the call stack, requested when it's needed only once and closed if it was allocated. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/arch/arm/efi/efi-boot.h | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 458cfbbed4..c4ed412845 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -45,14 +45,17 @@ void __flush_dcache_area(const void *vaddr, unsigned long size); static int get_module_file_index(const char *name, unsigned int name_len); static void PrintMessage(const CHAR16 *s); static int allocate_module_file(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, const char *name, unsigned int name_len); static int handle_module_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int module_node_offset, int reg_addr_cells, int reg_size_cells, bool is_domu_module); static int handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int domain_node); static int efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image); @@ -648,10 +651,10 @@ static void __init PrintMessage(const CHAR16 *s) * index of the file in the modules array or a negative number on error. */ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, const char *name, unsigned int name_len) { - EFI_FILE_HANDLE dir_handle; module_name *file_name; CHAR16 *fname; union string module_name; @@ -686,12 +689,11 @@ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, file_name->name_len = name_len; /* Get the file system interface. */ - dir_handle = get_parent_handle(loaded_image, &fname); + if ( !*dir_handle ) + *dir_handle = get_parent_handle(loaded_image, &fname); /* Load the binary in memory */ - read_file(dir_handle, s2w(&module_name), &module_binary, NULL); - - dir_handle->Close(dir_handle); + read_file(*dir_handle, s2w(&module_name), &module_binary, NULL); /* Save address and size */ file_name->addr = module_binary.addr; @@ -712,6 +714,7 @@ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, * Returns 1 if module is multiboot,module, 0 if not, < 0 on error */ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int module_node_offset, int reg_addr_cells, int reg_size_cells, @@ -744,8 +747,8 @@ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, file_idx = get_module_file_index(uefi_name_prop, uefi_name_len); if ( file_idx < 0 ) { - file_idx = allocate_module_file(loaded_image, uefi_name_prop, - uefi_name_len); + file_idx = allocate_module_file(loaded_image, dir_handle, + uefi_name_prop, uefi_name_len); if ( file_idx < 0 ) return file_idx; } @@ -812,6 +815,7 @@ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, * Returns number of multiboot,module found or negative number on error. */ static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, + EFI_FILE_HANDLE *dir_handle, int domain_node) { int module_node, addr_cells, size_cells, len; @@ -842,8 +846,8 @@ static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, module_node > 0; module_node = fdt_next_subnode(fdt, module_node) ) { - int ret = handle_module_node(loaded_image, module_node, addr_cells, - size_cells, true); + int ret = handle_module_node(loaded_image, dir_handle, module_node, + addr_cells, size_cells, true); if ( ret < 0 ) return ret; @@ -862,6 +866,7 @@ static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) { int chosen, node, addr_len, size_len; unsigned int i = 0, modules_found = 0; + EFI_FILE_HANDLE dir_handle = NULL; /* Check for the chosen node in the current DTB */ chosen = setup_chosen_node(fdt, &addr_len, &size_len); @@ -881,20 +886,24 @@ static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) if ( !fdt_node_check_compatible(fdt, node, "xen,domain") ) { /* Found a node with compatible xen,domain; handle this node. */ - ret = handle_dom0less_domain_node(loaded_image, node); + ret = handle_dom0less_domain_node(loaded_image, &dir_handle, node); if ( ret < 0 ) return ERROR_DT_MODULE_DOMU; } else { - ret = handle_module_node(loaded_image, node, addr_len, size_len, - false); + ret = handle_module_node(loaded_image, &dir_handle, node, addr_len, + size_len, false); if ( ret < 0 ) return ERROR_DT_MODULE_DOM0; } modules_found += ret; } + /* dir_handle can be allocated in allocate_module_file, free it if exists */ + if ( dir_handle ) + dir_handle->Close(dir_handle); + /* Free boot modules file names if any */ for ( ; i < modules_idx; i++ ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:22:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240428.416918 (Exim 4.92) (envelope-from ) id 1muPBX-00040K-SH; Tue, 07 Dec 2021 01:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240428.416918; Tue, 07 Dec 2021 01:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBX-00040C-PC; Tue, 07 Dec 2021 01:22:23 +0000 Received: by outflank-mailman (input) for mailman id 240428; Tue, 07 Dec 2021 01:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBW-0003zp-9y for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBW-0005Qc-88 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPBW-00080g-7S for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vCQvIuT+aPFnizB0YZDEO8x35sENPOoIiDjWW3yx0Ls=; b=EKB+zHZdn1bNWV7lgeEF/ucisW oKt6L+o4ZbGrdqw1h8UyUm4+UdCB/JRNJbXWZnuspKmfPkC/JDG936EIotItiLGDpUH0CHVrAmFRg PBGn4by8mbMIk0MLJ0AUDeQ9jrjffgnbP9aAp6cqQfIGg7m7c3vkmOqBXqGMuJGZIbK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG: add missing entries for work during the 4.16 release cycle Message-Id: Date: Tue, 07 Dec 2021 01:22:22 +0000 commit e058b2d4e5e2ad7ad03941d36ef9243291b35671 Author: Roger Pau Monne AuthorDate: Wed Nov 24 12:24:03 2021 +0100 Commit: Ian Jackson CommitDate: Wed Dec 1 18:06:16 2021 +0000 CHANGELOG: add missing entries for work during the 4.16 release cycle Document some of the relevant changes during the 4.16 release cycle. Signed-off-by: Roger Pau Monné Release-Acked-by: Ian Jackson (cherry picked from commit e2544a28beacd854f295095d102a8773743ac917) --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad1a8c2bc2..1fe52da7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - qemu-traditional based device models (both, qemu-traditional and ioemu-stubdom) will no longer be built per default. In order to be able to use those, configure needs to be called with "--enable-qemu-traditional" as parameter. + - Fixes for credit2 scheduler stability in corner case conditions. + - Ongoing improvements in the hypervisor build system. + - vtpmmgr miscellaneous fixes in preparation for TPM 2.0 support. + - 32bit PV guests only supported in shim mode. + - Improved PVH dom0 debug key handling. + - Fix booting on some Intel systems without a PIT (i8254). + - Cleanup of the xenstore library interface. + - Fix truncation of return value from xencall2 by introducing a new helper + that returns a long instead. + - Fix system register accesses on Arm to use the proper 32/64bit access size. + - Various fixes for Arm OP-TEE mediator. + - Switch to domheap for Xen page tables. + +### Added + - 32bit Arm builds to the gitlab-ci automated tests. + - x86 full system tests to the gitlab-ci automated tests. + - Arm limited vPMU support for guests. + - Static physical memory allocation for dom0less on arm64. + - dom0less EFI support on arm64. + - GICD_ICPENDR register handling in vGIC emulation to support Zephyr OS. + - CPU feature leveling on arm64 platform with heterogeneous cores. + - Report unpopulated memory regions safe to use for external mappings, Arm and + device tree only. + - Support of generic DT IOMMU bindings for Arm SMMU v2. + - Limit grant table version on a per-domain basis. ## [4.15.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - 2021-04-08 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:22:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240429.416922 (Exim 4.92) (envelope-from ) id 1muPBh-00043X-TS; Tue, 07 Dec 2021 01:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240429.416922; Tue, 07 Dec 2021 01:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBh-00043P-Qh; Tue, 07 Dec 2021 01:22:33 +0000 Received: by outflank-mailman (input) for mailman id 240429; Tue, 07 Dec 2021 01:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBg-00043G-Bx for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBg-0005Qn-BL for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPBg-00081S-AN for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D89ucMoWlOGTN2/D3l92BPkZZ98mYhQ6XnvXbEvuqSU=; b=0RNvGvBii+QuwR68joeKUb0jde RH19OZN4wLCPQ2R6Q1lGuZVrSr9UiqIpI5mYRSjMNhpe6xsOmKv9ET6ingSLILelqyXyHtmo0Rf+d c/AT8oTY3rk8lncrd0nCu4GfiV+VZ2EfD64eKMLFvOhHjQeDLfTf6PEZ85bZbbeDP5AI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG.md: Set 4.16 version and date Message-Id: Date: Tue, 07 Dec 2021 01:22:32 +0000 commit eef266eb770128db0d5258009b744f0e0c31c9bd Author: Ian Jackson AuthorDate: Tue Nov 30 11:40:21 2021 +0000 Commit: Ian Jackson CommitDate: Wed Dec 1 18:06:21 2021 +0000 CHANGELOG.md: Set 4.16 version and date Signed-off-by: Ian Jackson (cherry picked from commit 36aa64095d0419d52d2466405ac13b9858463f48) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe52da7db..731db3590e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) -## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD +## [4.16.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - 2021-12-02 ### Removed - XENSTORED_ROOTDIR environment variable from configuartion files and -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:22:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240430.416926 (Exim 4.92) (envelope-from ) id 1muPBr-00046l-VJ; Tue, 07 Dec 2021 01:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240430.416926; Tue, 07 Dec 2021 01:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBr-00046d-SA; Tue, 07 Dec 2021 01:22:43 +0000 Received: by outflank-mailman (input) for mailman id 240430; Tue, 07 Dec 2021 01:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBq-00046T-FF for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPBq-0005R0-EV for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPBq-00082O-DX for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=n2upRVQOQxa+W8384D7XONrbia9Bkfrf0ujPiYJUcIs=; b=AWO7wKfVtlzR9ybS5kozDdSIt4 I/l8279aRueb2lOsbThoDou5MQpv38nx0VEQ2dVxt+cRXIVPd8H03pLM+Lr3bqp4TeCY5koMrEuNP ZI9Yjo/UU9UGC7oblHCACFRAjRJJi00pq2PzJfLMYZ29E9BkU7l5Gw+FconxVmazRs7s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CHANGELOG.md: Start new "unstable" section Message-Id: Date: Tue, 07 Dec 2021 01:22:42 +0000 commit 6c1c97e24f830a921a23e3b9694e20493c9986ee Author: Ian Jackson AuthorDate: Wed Dec 1 18:07:40 2021 +0000 Commit: Ian Jackson CommitDate: Wed Dec 1 18:07:40 2021 +0000 CHANGELOG.md: Start new "unstable" section I have just forward-ported the CHANGELOG.md updates from the stable-4.16 branch. But we need a new section for work in this release cycle. Signed-off-by: Ian Jackson --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 731db3590e..6c0cd88cdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Notable changes to Xen will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD + ## [4.16.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - 2021-12-02 ### Removed -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:22:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240431.416930 (Exim 4.92) (envelope-from ) id 1muPC2-00049W-0V; Tue, 07 Dec 2021 01:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240431.416930; Tue, 07 Dec 2021 01:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPC1-00049O-To; Tue, 07 Dec 2021 01:22:53 +0000 Received: by outflank-mailman (input) for mailman id 240431; Tue, 07 Dec 2021 01:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPC0-000490-IZ for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPC0-0005RA-Hp for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPC0-0008Cb-Go for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2AzJLSvw8O1c5yuvlheJS6C0da7DuATgGdrjeZXf9B4=; b=t0192o56u1LwPlhcbOaxtSh9F3 yvEVAXMStowhS/zVt9WgYfjhONNOVZ8hOo4rqVm1ylLcNuxV9rgmyw9DkF55Ll5HtEx+Stw3vIqum yi+24VfPVZLOAQyIb0NdPH4GZDtVPtGwHUVJISrYhpJKCNzqyeJMvNNA6jdK3ni/mNcI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] bitops: Fix incorrect value in comment Message-Id: Date: Tue, 07 Dec 2021 01:22:52 +0000 commit eb41074692094dff1413efb44fa4928a9140aa41 Author: Ayan Kumar Halder AuthorDate: Tue Nov 30 18:12:38 2021 +0000 Commit: Andrew Cooper CommitDate: Wed Dec 1 21:35:23 2021 +0000 bitops: Fix incorrect value in comment GENMASK(30, 21) should be 0x7fe00000. Fixed this in the comment in bitops.h. Signed-off-by: Ayan Kumar Halder Acked-by: Andrew Cooper [Tweak text, to put an end to any further bikeshedding] Signed-off-by: Andrew Cooper --- xen/include/xen/bitops.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h index a64595f68e..33619a0873 100644 --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -4,8 +4,7 @@ /* * Create a contiguous bitmask starting at bit position @l and ending at - * position @h. For example - * GENMASK(30, 21) gives us the 32bit vector 0x01fe00000. + * position @h. For example GENMASK(30, 21) gives us 0x7fe00000ul. */ #define GENMASK(h, l) \ (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:23:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240432.416934 (Exim 4.92) (envelope-from ) id 1muPCC-0004CB-2M; Tue, 07 Dec 2021 01:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240432.416934; Tue, 07 Dec 2021 01:23:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCB-0004C1-VM; Tue, 07 Dec 2021 01:23:03 +0000 Received: by outflank-mailman (input) for mailman id 240432; Tue, 07 Dec 2021 01:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCA-0004Bp-Lm for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCA-0005Rf-L1 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPCA-0008Dq-KD for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I6AotzpQvqM7PxQabdAUsRgBhcx+ubf0NNIZnLmJHx8=; b=1VJNa6Psvak8s0WiIoJLy9wO+J 8FMzb62/pWgHwYTGGA8RDKXGKBA+5BsAHf+AZqHOHFjV2KCegvRbaBWufhQ98pTfn65S5RdmWyNBr RrE5z6h3wEyWupUwBAITCatnl6nv18QAzrwDg5eoARIe+QBGuZfCc11D1QiKeUS/3s38=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Drop incorrect mapping at l2_xenmap[0] Message-Id: Date: Tue, 07 Dec 2021 01:23:02 +0000 commit a15b143a5f1c20dc6893bc3e50873e308ef61d87 Author: Andrew Cooper AuthorDate: Mon Nov 29 16:09:08 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Drop incorrect mapping at l2_xenmap[0] It has been 4 years since the default load address changed from 1M to 2M, and _stext ceased residing in l2_xenmap[0]. We should not be inserting an unused mapping. To ensure we don't create mappings accidentally, loop from 0 and obey _PAGE_PRESENT on all entries. Fixes: 7ed93f3a0dff ("x86: change default load address from 1 MiB to 2 MiB") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index da47cdea14..6f24104842 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1279,16 +1279,12 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* The only data mappings to be relocated are in the Xen area. */ pl2e = __va(__pa(l2_xenmap)); - /* - * Undo the temporary-hooking of the l1_directmap. __2M_text_start - * is contained in this PTE. - */ + BUG_ON(using_2M_mapping() && l2_table_offset((unsigned long)_erodata) == l2_table_offset((unsigned long)_stext)); - *pl2e++ = l2e_from_pfn(xen_phys_start >> PAGE_SHIFT, - PAGE_HYPERVISOR_RX | _PAGE_PSE); - for ( i = 1; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) + + for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { unsigned int flags; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:23:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240433.416938 (Exim 4.92) (envelope-from ) id 1muPCM-0004Ez-3f; Tue, 07 Dec 2021 01:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240433.416938; Tue, 07 Dec 2021 01:23:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCM-0004Eq-0Y; Tue, 07 Dec 2021 01:23:14 +0000 Received: by outflank-mailman (input) for mailman id 240433; Tue, 07 Dec 2021 01:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCK-0004Eb-P5 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCK-0005Sq-OK for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPCK-0008Eq-NR for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tS3YWOUQzoaw2aOezNyr05bU/sPNiEHZeTiOd/wqQPE=; b=s+MKGU9snXLlzp80V+8zXUwWFf VbL27HbSTMHYgAN6Q/afowfl5YVIFpqR5BwEkLXq17lfhUH3FBgkuR+xJzgAkOfMWINe7/dAJLMIq +r3tqQOiPxZXbIzj58J5THicWGl2C/vDV6jv2M+qtHNQ5ftesBdm022zDVjJ2gp3gh6U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Better describe the pagetable relocation loops Message-Id: Date: Tue, 07 Dec 2021 01:23:12 +0000 commit 3099ff3ce15481b4f1536470cb87ac0ebf82b7bb Author: Andrew Cooper AuthorDate: Mon Nov 29 19:19:43 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Better describe the pagetable relocation loops The first loop relocates all reachable non-leaf entries in idle_pg_table[], which includes l2_xenmap[511]'s reference to l1_fixmap_x[]. The second loop relocates only leaf mappings in l2_xenmap[], so update the skip condition to be opposite to the first loop. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6f24104842..495b4b7d51 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1245,7 +1245,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) barrier(); move_memory(e, XEN_IMG_OFFSET, _end - _start, 1); - /* Walk initial pagetables, relocating page directory entries. */ + /* Walk idle_pg_table, relocating non-leaf entries. */ pl4e = __va(__pa(idle_pg_table)); for ( i = 0 ; i < L4_PAGETABLE_ENTRIES; i++, pl4e++ ) { @@ -1277,18 +1277,18 @@ void __init noreturn __start_xen(unsigned long mbi_p) } } - /* The only data mappings to be relocated are in the Xen area. */ - pl2e = __va(__pa(l2_xenmap)); - BUG_ON(using_2M_mapping() && l2_table_offset((unsigned long)_erodata) == l2_table_offset((unsigned long)_stext)); + /* Walk l2_xenmap[], relocating 2M superpage leaves. */ + pl2e = __va(__pa(l2_xenmap)); for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { unsigned int flags; if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) || + !(l2e_get_flags(*pl2e) & _PAGE_PSE) || (l2e_get_pfn(*pl2e) >= pte_update_limit) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:23:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240434.416942 (Exim 4.92) (envelope-from ) id 1muPCW-0004IF-6a; Tue, 07 Dec 2021 01:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240434.416942; Tue, 07 Dec 2021 01:23:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCW-0004I5-3A; Tue, 07 Dec 2021 01:23:24 +0000 Received: by outflank-mailman (input) for mailman id 240434; Tue, 07 Dec 2021 01:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCU-0004Hr-SU for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCU-0005Tj-Rr for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPCU-0008Fj-Qx for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=McJmIEan6jSPn+NBr2jzf4esNXhonPM806S5viniZFI=; b=WiGHLBQB7sCAofJvaOsdBtiB3v WfU+16qV3mOTtxzk4VKaMZj4QQC2jDLG58iJliMMVDpXqL0dTNJcnY59v/UiRZZpyfiVyZ59qCBQK Jt891XeUr9YhRaVCwlfGL2aezvGDma5uKSOfBABrNCy0B1xQeYR0xuranHFUQtrLndSA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Fix data placement around __high_start() Message-Id: Date: Tue, 07 Dec 2021 01:23:22 +0000 commit ffa5d037c78fe175f31373deec0759ff8cc8d66c Author: Andrew Cooper AuthorDate: Mon Nov 29 19:52:05 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Fix data placement around __high_start() multiboot_ptr should be in __initdata - it is only used on the BSP path. Furthermore, the .align 8 then .long means that stack_start is misaligned. Move both into setup.c, which lets the compiler handle the details correctly, as well as providing proper debug information for them. Declare stack_start in setup.h and avoid extern-ing it locally in smpboot.c. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/boot/x86_64.S | 8 -------- xen/arch/x86/setup.c | 6 ++++++ xen/arch/x86/smpboot.c | 3 +-- xen/include/asm-x86/setup.h | 2 ++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index d61048c583..27f52e7a77 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -67,14 +67,6 @@ ENTRY(__high_start) call __start_xen BUG /* __start_xen() shouldn't return. */ - .data - .align 8 -multiboot_ptr: - .long 0 - -GLOBAL(stack_start) - .quad cpu0_stack + STACK_SIZE - CPUINFO_sizeof - .section .data.page_aligned, "aw", @progbits .align PAGE_SIZE, 0 /* diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 495b4b7d51..6613e56a21 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -141,6 +141,12 @@ unsigned long __read_mostly xen_virt_end; char __section(".bss.stack_aligned") __aligned(STACK_SIZE) cpu0_stack[STACK_SIZE]; +/* Used by the BSP/AP paths to find the higher half stack mapping to use. */ +void *stack_start = cpu0_stack + STACK_SIZE - sizeof(struct cpu_info); + +/* Used by the boot asm to stash the relocated multiboot info pointer. */ +unsigned int __initdata multiboot_ptr; + struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; unsigned long __read_mostly mmu_cr4_features = XEN_MINIMAL_CR4; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 329cfdb6c9..08c0f2d9df 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -419,8 +420,6 @@ void start_secondary(void *unused) startup_cpu_idle_loop(); } -extern void *stack_start; - static int wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) { unsigned long send_status = 0, accept_status = 0; diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 24be46115d..eb9d7b433c 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -12,6 +12,8 @@ extern char __2M_rwdata_start[], __2M_rwdata_end[]; extern unsigned long xenheap_initial_phys_start; extern uint64_t boot_tsc_stamp; +extern void *stack_start; + void early_cpu_init(void); void early_time_init(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:23:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240435.416946 (Exim 4.92) (envelope-from ) id 1muPCg-0004L8-7g; Tue, 07 Dec 2021 01:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240435.416946; Tue, 07 Dec 2021 01:23:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCg-0004Kz-4f; Tue, 07 Dec 2021 01:23:34 +0000 Received: by outflank-mailman (input) for mailman id 240435; Tue, 07 Dec 2021 01:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCe-0004Kp-W4 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCe-0005Tu-VS for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPCe-0008Gf-Uc for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZlIL1mQLtbN19c5dv02tsr/kMjUktGeIWVRFX/XzRd4=; b=dx4m34zzGW+bcGRnv+oj4nXbE2 odp9HoUHs7lI1wYaiT6QednlD7wPnL8ygSEyU6vcyyrpPbrWP8buLP/EI9zDt1UEDu0dKAF40hk4E zftUaxq3tRFDfwwn1iwsc7P39rMcOtjTYP6niFZ3nsz2DFSv7njWReTw+TLR90V7UUoc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Drop xen_virt_end Message-Id: Date: Tue, 07 Dec 2021 01:23:32 +0000 commit c182e89d0b341d2efc930c2e1211d3e866c0effb Author: Andrew Cooper AuthorDate: Mon Nov 29 19:01:50 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Drop xen_virt_end The calculation in __start_xen() for xen_virt_end is an opencoding of ROUNDUP(_end, 2M). This is __2M_rwdata_end as provided by the linker script. This corrects the bound calculations in arch_livepatch_init() and update_xen_mappings() to not enforce 2M alignment when Xen is not compiled with CONFIG_XEN_ALIGN_2M. Furthermore, since 52975142d154 ("x86/boot: Create the l2_xenmap[] mappings dynamically"), there have not been extraneous mappings to delete, meaning that the call to destroy_xen_mappings() has been a no-op. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/livepatch.c | 3 ++- xen/arch/x86/mm.c | 3 ++- xen/arch/x86/setup.c | 6 ------ xen/include/asm-x86/x86_64/page.h | 2 -- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/livepatch.c b/xen/arch/x86/livepatch.c index 49f0d902e5..d056b1ed8b 100644 --- a/xen/arch/x86/livepatch.c +++ b/xen/arch/x86/livepatch.c @@ -17,6 +17,7 @@ #include #include #include +#include static bool has_active_waitqueue(const struct vm_event_domain *ved) { @@ -343,7 +344,7 @@ void __init arch_livepatch_init(void) { void *start, *end; - start = (void *)xen_virt_end; + start = (void *)__2M_rwdata_end; end = (void *)(XEN_VIRT_END - FIXADDR_X_SIZE - NR_CPUS * PAGE_SIZE); BUG_ON(end <= start); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4d799032dc..4a9ac8d5e6 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -787,7 +787,8 @@ static int update_xen_mappings(unsigned long mfn, unsigned int cacheattr) { int err = 0; bool alias = mfn >= PFN_DOWN(xen_phys_start) && - mfn < PFN_UP(xen_phys_start + xen_virt_end - XEN_VIRT_START); + mfn < PFN_UP(xen_phys_start + (unsigned long)__2M_rwdata_end - + XEN_VIRT_START); unsigned long xen_va = XEN_VIRT_START + ((mfn - PFN_DOWN(xen_phys_start)) << PAGE_SHIFT); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6613e56a21..0e0e706404 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -136,8 +136,6 @@ cpumask_t __read_mostly cpu_present_map; unsigned long __read_mostly xen_phys_start; -unsigned long __read_mostly xen_virt_end; - char __section(".bss.stack_aligned") __aligned(STACK_SIZE) cpu0_stack[STACK_SIZE]; @@ -1573,10 +1571,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) } #endif - xen_virt_end = ((unsigned long)_end + (1UL << L2_PAGETABLE_SHIFT) - 1) & - ~((1UL << L2_PAGETABLE_SHIFT) - 1); - destroy_xen_mappings(xen_virt_end, XEN_VIRT_START + BOOTSTRAP_MAP_BASE); - /* * If not using 2M mappings to gain suitable pagetable permissions * directly from the relocation above, remap the code/data diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index f9faf7f383..cb1db107c4 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -23,8 +23,6 @@ static inline unsigned long canonicalise_addr(unsigned long addr) #include -extern unsigned long xen_virt_end; - /* * Note: These are solely for the use by page_{get,set}_owner(), and * therefore don't need to handle the XEN_VIRT_{START,END} range. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:23:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240436.416950 (Exim 4.92) (envelope-from ) id 1muPCq-0004Nx-9L; Tue, 07 Dec 2021 01:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240436.416950; Tue, 07 Dec 2021 01:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCq-0004Np-6D; Tue, 07 Dec 2021 01:23:44 +0000 Received: by outflank-mailman (input) for mailman id 240436; Tue, 07 Dec 2021 01:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCp-0004Nd-3C for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCp-0005Ty-2U for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPCp-0008Hc-1b for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Xrw1ttPG2s8hMTHdRVNA6vgW1itPi0Lz9m8J1g6k8Rc=; b=o5sRk+1ltg5nuRHK4IiTNCvDVD nFrQ2Jjczy2DjEchQSCR8MYopWUCIaCTQCrslYINqEoY3sixtHpOQ6JraVvE0QqNctUn8ZBBTSI/l 8O0jRC1ymrqULtovCbbVqgEj9q7aGBdzXYlifJFwm17fJkiNaaJGuWqFMcfEuackFMy4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Adjust .text/.rodata/etc permissions in one place Message-Id: Date: Tue, 07 Dec 2021 01:23:43 +0000 commit 8de86b5cd4353bf2cc415e4563f973f071b4e8a3 Author: Andrew Cooper AuthorDate: Mon Nov 29 20:04:11 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Adjust .text/.rodata/etc permissions in one place At the moment, we have two locations selecting restricted permissions, not very far apart on boot, dependent on opposite answers from using_2M_mapping(). The later location however can shatter superpages if needed, while the former cannot. Collect together all the permission adjustments at the slightly later point in boot, as we likely need to shatter a superpage to support __ro_after_init. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 74 ++++++++++++---------------------------------------- 1 file changed, 16 insertions(+), 58 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0e0e706404..f5c15e45d6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1281,55 +1281,16 @@ void __init noreturn __start_xen(unsigned long mbi_p) } } - BUG_ON(using_2M_mapping() && - l2_table_offset((unsigned long)_erodata) == - l2_table_offset((unsigned long)_stext)); - /* Walk l2_xenmap[], relocating 2M superpage leaves. */ pl2e = __va(__pa(l2_xenmap)); for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { - unsigned int flags; - if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) || !(l2e_get_flags(*pl2e) & _PAGE_PSE) || (l2e_get_pfn(*pl2e) >= pte_update_limit) ) continue; - if ( !using_2M_mapping() ) - { - *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + - xen_phys_start); - continue; - } - - if ( i < l2_table_offset((unsigned long)&__2M_text_end) ) - { - flags = PAGE_HYPERVISOR_RX | _PAGE_PSE; - } - else if ( i >= l2_table_offset((unsigned long)&__2M_rodata_start) && - i < l2_table_offset((unsigned long)&__2M_rodata_end) ) - { - flags = PAGE_HYPERVISOR_RO | _PAGE_PSE; - } - else if ( i >= l2_table_offset((unsigned long)&__2M_init_start) && - i < l2_table_offset((unsigned long)&__2M_init_end) ) - { - flags = PAGE_HYPERVISOR_RWX | _PAGE_PSE; - } - else if ( (i >= l2_table_offset((unsigned long)&__2M_rwdata_start) && - i < l2_table_offset((unsigned long)&__2M_rwdata_end)) ) - { - flags = PAGE_HYPERVISOR_RW | _PAGE_PSE; - } - else - { - *pl2e = l2e_empty(); - continue; - } - - *pl2e = l2e_from_paddr( - l2e_get_paddr(*pl2e) + xen_phys_start, flags); + *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + xen_phys_start); } /* Re-sync the stack and then switch to relocated pagetables. */ @@ -1572,31 +1533,28 @@ void __init noreturn __start_xen(unsigned long mbi_p) #endif /* - * If not using 2M mappings to gain suitable pagetable permissions - * directly from the relocation above, remap the code/data - * sections with decreased permissions. + * All Xen mappings are currently RWX 2M superpages. Restrict to: + * text - RX + * rodata - RO + * init - keep RWX, discarded entirely later + * data/bss - RW */ - if ( !using_2M_mapping() ) - { - /* Mark .text as RX (avoiding the first 2M superpage). */ - modify_xen_mappings(XEN_VIRT_START + MB(2), - (unsigned long)&__2M_text_end, - PAGE_HYPERVISOR_RX); + modify_xen_mappings((unsigned long)&_start, + (unsigned long)&__2M_text_end, + PAGE_HYPERVISOR_RX); - /* Mark .rodata as RO. */ - modify_xen_mappings((unsigned long)&__2M_rodata_start, - (unsigned long)&__2M_rodata_end, - PAGE_HYPERVISOR_RO); + modify_xen_mappings((unsigned long)&__2M_rodata_start, + (unsigned long)&__2M_rodata_end, + PAGE_HYPERVISOR_RO); - /* Mark .data and .bss as RW. */ - modify_xen_mappings((unsigned long)&__2M_rwdata_start, - (unsigned long)&__2M_rwdata_end, - PAGE_HYPERVISOR_RW); + modify_xen_mappings((unsigned long)&__2M_rwdata_start, + (unsigned long)&__2M_rwdata_end, + PAGE_HYPERVISOR_RW); + if ( !using_2M_mapping() ) /* Drop the remaining mappings in the shattered superpage. */ destroy_xen_mappings((unsigned long)&__2M_rwdata_end, ROUNDUP((unsigned long)&__2M_rwdata_end, MB(2))); - } nr_pages = 0; for ( i = 0; i < e820.nr_map; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:23:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240437.416954 (Exim 4.92) (envelope-from ) id 1muPD0-0004Qe-Al; Tue, 07 Dec 2021 01:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240437.416954; Tue, 07 Dec 2021 01:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPD0-0004QW-7v; Tue, 07 Dec 2021 01:23:54 +0000 Received: by outflank-mailman (input) for mailman id 240437; Tue, 07 Dec 2021 01:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCz-0004QM-6Z for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPCz-0005U8-5q for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPCz-0008IZ-52 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:23:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1aGCcARVJ1iIcg5xfz3JkGqTRePZX4/6WBDdKwpImIM=; b=omEoYuZ1+5BID5IeYYnN3OCuqe fJQpJMl7+ya9545FmzrA6IZz//86gZaJz8iS8kGfZvvSiRv6fDloFYqGlRKysJEdosLJO9I/6XDVT U1+HZWCu6KT4G47sfd28Z+WZPk3vDpfSYdc/n5bfb1qIkY0eCfizEhCDxt1RZdpOJ/0U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Support __ro_after_init Message-Id: Date: Tue, 07 Dec 2021 01:23:53 +0000 commit 05657c6d1821dfc4e9a618767a942b3555406046 Author: Andrew Cooper AuthorDate: Mon Nov 29 20:11:01 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 2 20:02:55 2021 +0000 x86/boot: Support __ro_after_init For security hardening reasons, it advantageous to make setup-once data immutable after boot. Borrow __ro_after_init from Linux. On x86, place .data.ro_after_init at the start of .rodata, excluding it from the early permission restrictions. Re-apply RO restrictions to the whole of .rodata in init_done(), attempting to reform the superpage if possible. For architectures which don't implement __ro_after_init explicitly, variables merges into .data. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/setup.c | 12 +++++++++++- xen/arch/x86/xen.lds.S | 6 ++++++ xen/include/asm-x86/setup.h | 1 + xen/include/xen/cache.h | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f5c15e45d6..723bd49c76 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -663,6 +663,11 @@ static void noreturn init_done(void) init_xenheap_pages(__pa(start), __pa(end)); printk("Freed %lukB init memory\n", (end - start) >> 10); + /* Mark .rodata/ro_after_init as RO. Maybe reform the superpage. */ + modify_xen_mappings((unsigned long)&__2M_rodata_start, + (unsigned long)&__2M_rodata_end, + PAGE_HYPERVISOR_RO); + startup_cpu_idle_loop(); } @@ -1535,6 +1540,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* * All Xen mappings are currently RWX 2M superpages. Restrict to: * text - RX + * ro_after_init - RW for now, RO later * rodata - RO * init - keep RWX, discarded entirely later * data/bss - RW @@ -1543,7 +1549,11 @@ void __init noreturn __start_xen(unsigned long mbi_p) (unsigned long)&__2M_text_end, PAGE_HYPERVISOR_RX); - modify_xen_mappings((unsigned long)&__2M_rodata_start, + modify_xen_mappings((unsigned long)&__ro_after_init_start, + (unsigned long)&__ro_after_init_end, + PAGE_HYPERVISOR_RW); + + modify_xen_mappings((unsigned long)&__ro_after_init_end, (unsigned long)&__2M_rodata_end, PAGE_HYPERVISOR_RO); diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 87e344d4dd..4db5b404e0 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -97,6 +97,12 @@ SECTIONS __2M_rodata_start = .; /* Start of 2M superpages, mapped RO. */ DECL_SECTION(.rodata) { _srodata = .; + + __ro_after_init_start = .; + *(.data.ro_after_init) + . = ALIGN(PAGE_SIZE); + __ro_after_init_end = .; + /* Bug frames table */ __start_bug_frames = .; *(.bug_frames.0) diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index eb9d7b433c..7dc03b6b8d 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -5,6 +5,7 @@ #include extern const char __2M_text_start[], __2M_text_end[]; +extern const char __ro_after_init_start[], __ro_after_init_end[]; extern const char __2M_rodata_start[], __2M_rodata_end[]; extern char __2M_init_start[], __2M_init_end[]; extern char __2M_rwdata_start[], __2M_rwdata_end[]; diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h index 6ee174efa4..f52a0aedf7 100644 --- a/xen/include/xen/cache.h +++ b/xen/include/xen/cache.h @@ -15,4 +15,6 @@ #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif +#define __ro_after_init __section(".data.ro_after_init") + #endif /* __LINUX_CACHE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:24:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:24:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240438.416957 (Exim 4.92) (envelope-from ) id 1muPDA-0004TI-CJ; Tue, 07 Dec 2021 01:24:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240438.416957; Tue, 07 Dec 2021 01:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDA-0004TA-9P; Tue, 07 Dec 2021 01:24:04 +0000 Received: by outflank-mailman (input) for mailman id 240438; Tue, 07 Dec 2021 01:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPD9-0004T1-9z for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPD9-0005UV-9H for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPD9-0008JQ-8N for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TqgkBcUivryWdyMoN2w41hPONueK1Hk2IhixEsHNHpE=; b=p8SBv58kMakYpb/Qf50OtSrhhR WuLckKHwim/TapUjTHm+VnNpHpJRHXsUNvZbr67cF2qRUQZaCHB6LKcrF8u4r5kGhDPav6AekBJyS Grn4JtBnhFf43EWwPV05nCT2RRXFrBpFoRw2GeBqO7nD1FQG6y2b2vLhdpbuO4MxpA8w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PV: properly set shadow allocation for Dom0 Message-Id: Date: Tue, 07 Dec 2021 01:24:03 +0000 commit c037dfb909406de6febaaa2c2e05743186e1e07e Author: Jan Beulich AuthorDate: Fri Dec 3 11:14:24 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:14:24 2021 +0100 x86/PV: properly set shadow allocation for Dom0 Leaving shadow setup just to the L1TF tasklet means running Dom0 on a minimally acceptable shadow memory pool, rather than what normally would be used (also, for example, for PVH). Populate the pool before triggering the tasklet (or in preparation for L1TF checking logic to trigger it), on a best effort basis (again like done for PVH). Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/pv/dom0_build.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index de09ef5cae..6221630fc2 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1298,7 +1298,7 @@ int shadow_set_allocation(struct domain *d, unsigned int pages, bool *preempted) { struct page_info *sp; - ASSERT(paging_locked_by_me(d)); + ASSERT(paging_locked_by_me(d) || system_state < SYS_STATE_active); if ( pages > 0 ) { diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index cb68da75c1..e501979a86 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Allow ring-3 access in long mode as guest cannot use ring 1 ... */ #define BASE_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_USER) @@ -928,8 +929,22 @@ int __init dom0_construct_pv(struct domain *d, if ( d->domain_id == hardware_domid ) iommu_hwdom_init(d); - /* Activate shadow mode, if requested. Reuse the pv_l1tf tasklet. */ #ifdef CONFIG_SHADOW_PAGING + /* Fill the shadow pool if necessary. */ + if ( opt_dom0_shadow || opt_pv_l1tf_hwdom ) + { + bool preempted; + + nr_pt_pages = dom0_paging_pages(d, nr_pages); + + do { + preempted = false; + shadow_set_allocation(d, nr_pt_pages, &preempted); + process_pending_softirqs(); + } while ( preempted ); + } + + /* Activate shadow mode, if requested. Reuse the pv_l1tf tasklet. */ if ( opt_dom0_shadow ) { printk("Switching dom0 to using shadow paging\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:24:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:24:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240439.416962 (Exim 4.92) (envelope-from ) id 1muPDL-0004WG-E4; Tue, 07 Dec 2021 01:24:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240439.416962; Tue, 07 Dec 2021 01:24:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDL-0004W8-Av; Tue, 07 Dec 2021 01:24:15 +0000 Received: by outflank-mailman (input) for mailman id 240439; Tue, 07 Dec 2021 01:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDJ-0004Vw-De for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDJ-0005Us-Cv for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPDJ-0008Jx-Bx for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gnQLctqS2F40VAa0bGhuLNSzyWRia/Fl8pPedBeeowU=; b=340KHWuxCdwsOxwOrKcDc3hPrm as7m55LYWG/a4gs3RPtHPhIc12JdbFHTm14UJEFwGj8BXQQfBzaRBOK1Fti7KeTQmh6lPCIZndUsB kzkw5ZL9vioYycoQB65cJaIo5EHpRQV0oK1ikMiNSdbCd9rR1jt4mZVY2rGA5Z/epzf8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: also dump stacks from show_execution_state() Message-Id: Date: Tue, 07 Dec 2021 01:24:13 +0000 commit adb715db698bc8ec3b88c24eb88b21e9da5b6c07 Author: Jan Beulich AuthorDate: Fri Dec 3 11:15:57 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:15:57 2021 +0100 x86/HVM: also dump stacks from show_execution_state() Wire up show_hvm_stack() also on this path. Move the show_guest_stack() invocation out of show_stack(), rendering dead the is-HVM check there. While separating guest and host paths, also move the show_code() invocation - the function bails immediately when guest_mode() returns "true". Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/traps.c | 35 +++++++++++++++++++++++++---------- xen/include/asm-x86/processor.h | 1 - 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 6d7d88c3c4..2ddcd95dce 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -306,10 +306,6 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) unsigned long mask = STACK_SIZE; void *stack_page = NULL; - /* Avoid HVM as we don't know what the stack looks like. */ - if ( is_hvm_vcpu(v) ) - return; - if ( is_pv_32bit_vcpu(v) ) { compat_show_guest_stack(v, regs, debug_stack_lines); @@ -618,14 +614,11 @@ static void show_trace(const struct cpu_user_regs *regs) printk("\n"); } -void show_stack(const struct cpu_user_regs *regs) +static void show_stack(const struct cpu_user_regs *regs) { unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), *stack_bottom, addr; int i; - if ( guest_mode(regs) ) - return show_guest_stack(current, regs); - printk("Xen stack trace from "__OP"sp=%p:\n ", stack); stack_bottom = _p(get_stack_dump_bottom(regs->rsp)); @@ -694,8 +687,30 @@ void show_execution_state(const struct cpu_user_regs *regs) unsigned long flags = console_lock_recursive_irqsave(); show_registers(regs); - show_code(regs); - show_stack(regs); + + if ( guest_mode(regs) ) + { + struct vcpu *curr = current; + + if ( is_hvm_vcpu(curr) ) + { + /* + * Stop interleaving prevention: The necessary P2M lookups + * involve locking, which has to occur with IRQs enabled. + */ + console_unlock_recursive_irqrestore(flags); + + show_hvm_stack(curr, regs); + return; + } + + show_guest_stack(curr, regs); + } + else + { + show_code(regs); + show_stack(regs); + } console_unlock_recursive_irqrestore(flags); } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index bc4dc69253..400b4fac5e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -493,7 +493,6 @@ static always_inline void rep_nop(void) #define cpu_relax() rep_nop() void show_code(const struct cpu_user_regs *regs); -void show_stack(const struct cpu_user_regs *regs); void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs); void show_registers(const struct cpu_user_regs *regs); void show_execution_state(const struct cpu_user_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:24:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240440.416966 (Exim 4.92) (envelope-from ) id 1muPDV-0004ZL-Gf; Tue, 07 Dec 2021 01:24:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240440.416966; Tue, 07 Dec 2021 01:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDV-0004ZD-Dj; Tue, 07 Dec 2021 01:24:25 +0000 Received: by outflank-mailman (input) for mailman id 240440; Tue, 07 Dec 2021 01:24:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDT-0004Yx-HA for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDT-0005Uy-GS for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPDT-0008Kb-Fb for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ai33JLX/MBCQvGLo41fyJhm9H5Z7TsuauZbvqrMa/BE=; b=hVXRh/6sQsNR+QPgMAgth8WMu/ qVzifD8fiL02z7wp9rt7ypSGGGQM6cyVBOVDitWb5cvOt3kUhwQz6pf5Jsn2nuAYoSBDkd0/Gq6jI cnvHYvreczpK6XEmEJkuFTWUhGZdwzR6CaspZ1c5YVSMSxLOlp5TOg11364n3u2gHtuY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: skip offline vCPU-s when dumping VMCBs/VMCSes Message-Id: Date: Tue, 07 Dec 2021 01:24:23 +0000 commit 3c42cc803c2163daa199021852224b9ca476e9c5 Author: Jan Beulich AuthorDate: Fri Dec 3 11:17:50 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:17:50 2021 +0100 x86/HVM: skip offline vCPU-s when dumping VMCBs/VMCSes There's not really any register state associated with vCPU-s that haven't been initialized yet, so avoid spamming the log with largely useless information while still leaving an indication of the fact. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/svm/vmcb.c | 5 +++++ xen/arch/x86/hvm/vmx/vmcs.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 565e997155..efa085032b 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -242,6 +242,11 @@ static void vmcb_dump(unsigned char ch) printk("\n>>> Domain %d <<<\n", d->domain_id); for_each_vcpu ( d, v ) { + if ( !v->is_initialised ) + { + printk("\tVCPU %u: not initialized\n", v->vcpu_id); + continue; + } printk("\tVCPU %d\n", v->vcpu_id); svm_vmcb_dump("key_handler", v->arch.hvm.svm.vmcb); } diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index f9f9bc18cd..7ab15e07a0 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -2133,6 +2133,11 @@ static void vmcs_dump(unsigned char ch) printk("\n>>> Domain %d <<<\n", d->domain_id); for_each_vcpu ( d, v ) { + if ( !v->is_initialised ) + { + printk("\tVCPU %u: not initialized\n", v->vcpu_id); + continue; + } printk("\tVCPU %d\n", v->vcpu_id); vmcs_dump_vcpu(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:24:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:24:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240442.416970 (Exim 4.92) (envelope-from ) id 1muPDf-0004cW-IL; Tue, 07 Dec 2021 01:24:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240442.416970; Tue, 07 Dec 2021 01:24:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDf-0004cO-FH; Tue, 07 Dec 2021 01:24:35 +0000 Received: by outflank-mailman (input) for mailman id 240442; Tue, 07 Dec 2021 01:24:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDd-0004cA-KE for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDd-0005V9-Jb for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPDd-0008LR-Iq for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YaaECTOVcG7if4R6hXDvpZoZl1STMWl04BI/LJfl570=; b=4VFsOkDDspj4NAPfFFglvQTMAN MytZODZyeFZfMFr78UsuPghfDouAjnIY1rHiosLQsd6nfaOdYycxjccIM+Aj2s4aWnsBFFCQpy4mO iJiU+ipbY7UlJsHBA8qQHB5NYOKj5SE0yYbfpbSxHnKT+17I5uc/AQLhOOhyc87B65zw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: limit number of hypercall parameters to 5 Message-Id: Date: Tue, 07 Dec 2021 01:24:33 +0000 commit 2f531c122e957d56d214b4ba04856e6172772309 Author: Juergen Gross AuthorDate: Fri Dec 3 11:18:38 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:18:38 2021 +0100 x86: limit number of hypercall parameters to 5 Today there is no hypercall with more than 5 parameters, while the ABI allows up to 6 parameters. Especially for the X86 32-bit case using 6 parameters would require to run without frame pointer, which isn't very fortunate. Note that for Arm the limit is 5 parameters already. So limit the maximum number of parameters to 5 for x86, too. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hypercall.c | 28 ++++++++++------------------ xen/arch/x86/pv/hypercall.c | 22 ++++++++-------------- xen/common/trace.c | 2 +- xen/include/asm-x86/hypercall.h | 2 +- 4 files changed, 20 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 63bed52e40..1f04ffb272 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -239,10 +239,9 @@ int hvm_hypercall(struct cpu_user_regs *regs) unsigned long rdx = regs->rdx; unsigned long r10 = regs->r10; unsigned long r8 = regs->r8; - unsigned long r9 = regs->r9; - HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%lx, %lx, %lx, %lx, %lx, %lx)", - eax, rdi, rsi, rdx, r10, r8, r9); + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%lx, %lx, %lx, %lx, %lx)", + eax, rdi, rsi, rdx, r10, r8); #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -252,13 +251,11 @@ int hvm_hypercall(struct cpu_user_regs *regs) case 1: rsi = 0xdeadbeefdeadf00dUL; fallthrough; case 2: rdx = 0xdeadbeefdeadf00dUL; fallthrough; case 3: r10 = 0xdeadbeefdeadf00dUL; fallthrough; - case 4: r8 = 0xdeadbeefdeadf00dUL; fallthrough; - case 5: r9 = 0xdeadbeefdeadf00dUL; + case 4: r8 = 0xdeadbeefdeadf00dUL; } #endif - regs->rax = hvm_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8, - r9); + regs->rax = hvm_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8); #ifndef NDEBUG if ( !curr->hcall_preempted ) @@ -266,7 +263,6 @@ int hvm_hypercall(struct cpu_user_regs *regs) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].native ) { - case 6: regs->r9 = 0xdeadbeefdeadf00dUL; fallthrough; case 5: regs->r8 = 0xdeadbeefdeadf00dUL; fallthrough; case 4: regs->r10 = 0xdeadbeefdeadf00dUL; fallthrough; case 3: regs->rdx = 0xdeadbeefdeadf00dUL; fallthrough; @@ -283,10 +279,9 @@ int hvm_hypercall(struct cpu_user_regs *regs) unsigned int edx = regs->edx; unsigned int esi = regs->esi; unsigned int edi = regs->edi; - unsigned int ebp = regs->ebp; - HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%x, %x, %x, %x, %x, %x)", eax, - ebx, ecx, edx, esi, edi, ebp); + HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu(%x, %x, %x, %x, %x)", eax, + ebx, ecx, edx, esi, edi); #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -296,14 +291,12 @@ int hvm_hypercall(struct cpu_user_regs *regs) case 1: ecx = 0xdeadf00d; fallthrough; case 2: edx = 0xdeadf00d; fallthrough; case 3: esi = 0xdeadf00d; fallthrough; - case 4: edi = 0xdeadf00d; fallthrough; - case 5: ebp = 0xdeadf00d; + case 4: edi = 0xdeadf00d; } #endif curr->hcall_compat = true; - regs->rax = hvm_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi, - ebp); + regs->rax = hvm_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi); curr->hcall_compat = false; #ifndef NDEBUG @@ -312,7 +305,6 @@ int hvm_hypercall(struct cpu_user_regs *regs) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].compat ) { - case 6: regs->rbp = 0xdeadf00d; fallthrough; case 5: regs->rdi = 0xdeadf00d; fallthrough; case 4: regs->rsi = 0xdeadf00d; fallthrough; case 3: regs->rdx = 0xdeadf00d; fallthrough; @@ -349,7 +341,7 @@ enum mc_disposition hvm_do_multicall_call(struct mc_state *state) func = array_access_nospec(hvm_hypercall_table, call->op).native; if ( func ) call->result = func(call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } @@ -361,7 +353,7 @@ enum mc_disposition hvm_do_multicall_call(struct mc_state *state) func = array_access_nospec(hvm_hypercall_table, call->op).compat; if ( func ) call->result = func(call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 3579ba905c..16a77e3a35 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -145,7 +145,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) unsigned long rdx = regs->rdx; unsigned long r10 = regs->r10; unsigned long r8 = regs->r8; - unsigned long r9 = regs->r9; #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -155,18 +154,17 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) case 1: rsi = 0xdeadbeefdeadf00dUL; fallthrough; case 2: rdx = 0xdeadbeefdeadf00dUL; fallthrough; case 3: r10 = 0xdeadbeefdeadf00dUL; fallthrough; - case 4: r8 = 0xdeadbeefdeadf00dUL; fallthrough; - case 5: r9 = 0xdeadbeefdeadf00dUL; + case 4: r8 = 0xdeadbeefdeadf00dUL; } #endif if ( unlikely(tb_init_done) ) { - unsigned long args[6] = { rdi, rsi, rdx, r10, r8, r9 }; + unsigned long args[5] = { rdi, rsi, rdx, r10, r8 }; __trace_hypercall(TRC_PV_HYPERCALL_V2, eax, args); } - regs->rax = pv_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8, r9); + regs->rax = pv_hypercall_table[eax].native(rdi, rsi, rdx, r10, r8); #ifndef NDEBUG if ( !curr->hcall_preempted ) @@ -174,7 +172,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].native ) { - case 6: regs->r9 = 0xdeadbeefdeadf00dUL; fallthrough; case 5: regs->r8 = 0xdeadbeefdeadf00dUL; fallthrough; case 4: regs->r10 = 0xdeadbeefdeadf00dUL; fallthrough; case 3: regs->rdx = 0xdeadbeefdeadf00dUL; fallthrough; @@ -192,7 +189,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) unsigned int edx = regs->edx; unsigned int esi = regs->esi; unsigned int edi = regs->edi; - unsigned int ebp = regs->ebp; #ifndef NDEBUG /* Deliberately corrupt parameter regs not used by this hypercall. */ @@ -202,20 +198,19 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) case 1: ecx = 0xdeadf00d; fallthrough; case 2: edx = 0xdeadf00d; fallthrough; case 3: esi = 0xdeadf00d; fallthrough; - case 4: edi = 0xdeadf00d; fallthrough; - case 5: ebp = 0xdeadf00d; + case 4: edi = 0xdeadf00d; } #endif if ( unlikely(tb_init_done) ) { - unsigned long args[6] = { ebx, ecx, edx, esi, edi, ebp }; + unsigned long args[5] = { ebx, ecx, edx, esi, edi }; __trace_hypercall(TRC_PV_HYPERCALL_V2, eax, args); } curr->hcall_compat = true; - regs->eax = pv_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi, ebp); + regs->eax = pv_hypercall_table[eax].compat(ebx, ecx, edx, esi, edi); curr->hcall_compat = false; #ifndef NDEBUG @@ -224,7 +219,6 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) /* Deliberately corrupt parameter regs used by this hypercall. */ switch ( hypercall_args_table[eax].compat ) { - case 6: regs->ebp = 0xdeadf00d; fallthrough; case 5: regs->edi = 0xdeadf00d; fallthrough; case 4: regs->esi = 0xdeadf00d; fallthrough; case 3: regs->edx = 0xdeadf00d; fallthrough; @@ -262,7 +256,7 @@ enum mc_disposition pv_do_multicall_call(struct mc_state *state) pv_hypercall_table[op].compat ) call->result = pv_hypercall_table[op].compat( call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } @@ -276,7 +270,7 @@ enum mc_disposition pv_do_multicall_call(struct mc_state *state) pv_hypercall_table[op].native ) call->result = pv_hypercall_table[op].native( call->args[0], call->args[1], call->args[2], - call->args[3], call->args[4], call->args[5]); + call->args[3], call->args[4]); else call->result = -ENOSYS; } diff --git a/xen/common/trace.c b/xen/common/trace.c index a2a389a1c7..61fecc2b2b 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -822,7 +822,7 @@ void __trace_hypercall(uint32_t event, unsigned long op, { struct { uint32_t op; - uint32_t args[6]; + uint32_t args[5]; } d; uint32_t *a = d.args; diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h index 0ae3b8b043..5d394d4923 100644 --- a/xen/include/asm-x86/hypercall.h +++ b/xen/include/asm-x86/hypercall.h @@ -13,7 +13,7 @@ typedef unsigned long hypercall_fn_t( unsigned long, unsigned long, unsigned long, - unsigned long, unsigned long, unsigned long); + unsigned long, unsigned long); typedef struct { hypercall_fn_t *native; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:24:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:24:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240443.416974 (Exim 4.92) (envelope-from ) id 1muPDp-0004f5-Jj; Tue, 07 Dec 2021 01:24:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240443.416974; Tue, 07 Dec 2021 01:24:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDp-0004ex-Gt; Tue, 07 Dec 2021 01:24:45 +0000 Received: by outflank-mailman (input) for mailman id 240443; Tue, 07 Dec 2021 01:24:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDn-0004eZ-Np for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDn-0005VM-N4 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPDn-0008M7-MK for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=h1g90UCfydN143I8OWAz+9NtseRrczTlNQbDiGqdyjY=; b=iJSdDAjZhHhrl84TEmD/PSVRTb HIjWT1UpiwajWCR892GI5cXQoWttVB9FHNRoPbhXd7ZZ67oCVeDJ7OySx+2td75/19Ajqfi/qgaNP JuqqkPt972ixQNu5YXH1HhStRwho/GSMabyr1iUvJmhhim4cSkkE4l/l4bofCix0e1E8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Revert "domctl: improve locking during domain destruction" Message-Id: Date: Tue, 07 Dec 2021 01:24:43 +0000 commit d0887cc6b16e72829ac7e117bd65697463aabfe7 Author: Roger Pau Monné AuthorDate: Fri Dec 3 11:19:16 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:19:16 2021 +0100 Revert "domctl: improve locking during domain destruction" This reverts commit 228ab9992ffb1d8f9d2475f2581e68b2913acb88. Performance analysis has shown that dropping the domctl lock during domain destruction greatly increases the contention in the heap_lock, thus making parallel destruction of domains slower. The following lockperf data shows the difference between the current code and the reverted one: lock: 3342357(2.268295505s), block: 3263853(18.556650797s) lock: 2788704(0.362311723s), block: 222681( 0.091152276s) Those figures are from Dmitry Isaikin, and are gathered after destroying 5 2GB HVM guests in parallel: https://lists.xenproject.org/archives/html/xen-devel/2021-09/msg01515.html Given the current point in the release, revert the commit and reinstate holding the domctl lock during domain destruction. Further work should be done in order to re-add more fine grained locking to the domain destruction path once a proper solution to avoid the heap_lock contention is found. Reported-by: Hongyan Xia Reported-by: Dmitry Isaikin Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Acked-by: Julien Grall --- xen/common/domain.c | 12 ++---------- xen/common/domctl.c | 5 +---- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 56d47dd664..093bb4403f 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -917,21 +917,13 @@ int domain_kill(struct domain *d) if ( d == current->domain ) return -EINVAL; - /* Protected by d->domain_lock. */ + /* Protected by domctl_lock. */ switch ( d->is_dying ) { case DOMDYING_alive: - domain_unlock(d); domain_pause(d); - domain_lock(d); - /* - * With the domain lock dropped, d->is_dying may have changed. Call - * ourselves recursively if so, which is safe as then we won't come - * back here. - */ - if ( d->is_dying != DOMDYING_alive ) - return domain_kill(d); d->is_dying = DOMDYING_dying; + spin_barrier(&d->domain_lock); argo_destroy(d); vnuma_destroy(d->vnuma); domain_set_outstanding_pages(d, 0); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 271862ae58..879a2adcbe 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -497,14 +497,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_destroydomain: - domctl_lock_release(); - domain_lock(d); ret = domain_kill(d); - domain_unlock(d); if ( ret == -ERESTART ) ret = hypercall_create_continuation( __HYPERVISOR_domctl, "h", u_domctl); - goto domctl_out_unlock_domonly; + break; case XEN_DOMCTL_setnodeaffinity: { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:24:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:24:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240444.416977 (Exim 4.92) (envelope-from ) id 1muPDz-0004hx-LC; Tue, 07 Dec 2021 01:24:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240444.416977; Tue, 07 Dec 2021 01:24:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDz-0004hp-IP; Tue, 07 Dec 2021 01:24:55 +0000 Received: by outflank-mailman (input) for mailman id 240444; Tue, 07 Dec 2021 01:24:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDx-0004hb-R1 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPDx-0005VQ-QG for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPDx-0008N1-PP for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:24:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5usleOTf7xfpPsADYCZzUQli7El900zCS7kSmOiK7YM=; b=G40UO4TIUGYYN6N+WZLouQyvQx eN6XPpeZ458gpYN7gjbYS/wkN9OQLvZNvbKOPnS7nJxoxJFexBlqAQedy4v7iJIiFGkBh0YF6Xj+2 Kx5OdBtT2qIT3E7c73xm3ZTTiHSm/8KQrMvNcSNaGUHXKE9i1Cy6S42pIn8CH7iW2I5E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: remove Josh from ARINC 653 maintainers Message-Id: Date: Tue, 07 Dec 2021 01:24:53 +0000 commit 5ecc5c30ef16bfed5e13e775adb8f59649d26e1a Author: Stewart Hildebrand AuthorDate: Fri Dec 3 11:19:49 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:19:49 2021 +0100 MAINTAINERS: remove Josh from ARINC 653 maintainers Josh works at another company now Signed-off-by: Stewart Hildebrand --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f67f70aed3..136f51ad5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,7 +221,6 @@ F: xen/include/xen/argo.h F: xen/common/argo.c ARINC653 SCHEDULER -M: Josh Whitehead M: Stewart Hildebrand S: Supported L: xen-devel@dornerworks.com -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:25:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:25:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240445.416982 (Exim 4.92) (envelope-from ) id 1muPE9-0004km-N9; Tue, 07 Dec 2021 01:25:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240445.416982; Tue, 07 Dec 2021 01:25:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPE9-0004ke-Jv; Tue, 07 Dec 2021 01:25:05 +0000 Received: by outflank-mailman (input) for mailman id 240445; Tue, 07 Dec 2021 01:25:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPE7-0004kK-U5 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPE7-0005Vh-TK for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPE7-0008OK-Sf for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Mt5uGubW6eLGtblhCVvGGVGX1fAj6bikd6vkwXIi6us=; b=hqJxGwlekL+JScSN4d6cSeQfH6 4a1fpoJfVqGuWCSnMjXDYVoJMBG0QHXCLdZDm4NqDc8sqm2yEGkAhZHH6wRYRlITLkNAFA+GuMSZh lXFAqmHjoWFRDg0+UxsnQfp6Bbm6SVkMxUW9hMnnqSE98auBorv+OMkIwyzjh8dU98J0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPMU: convert vendor hook invocations to altcall Message-Id: Date: Tue, 07 Dec 2021 01:25:03 +0000 commit d95cf9d6057cf3c65192fbc0bf6d334602ecb34b Author: Jan Beulich AuthorDate: Fri Dec 3 11:20:24 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:20:24 2021 +0100 x86/vPMU: convert vendor hook invocations to altcall At least some vPMU functions will be invoked (and hence can further be speculated into) even in the vPMU-disabled case. Convert vpmu_ops to the standard single-instance model being a prerequisite to engaging the alternative_call() machinery, and convert all respective calls. Note that this requires vpmu_init() to become a pre-SMP initcall. This change then also helps performance. To replace a few vpmu->arch_vpmu_ops NULL checks, introduce a new VPMU_INITIALIZED state, such that in the absence of any other suitable vmpu_is_set() checks this state can be checked for. While adding the inclusion of xen/err.h, also prune other xen/*.h inclusions. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/vpmu.c | 71 +++++++++++++++++++++---------------------- xen/arch/x86/cpu/vpmu_amd.c | 21 ++++++------- xen/arch/x86/cpu/vpmu_intel.c | 16 +++++----- xen/include/asm-x86/vpmu.h | 28 ++++++++--------- 4 files changed, 66 insertions(+), 70 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 16e91a3694..eacf12c480 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -17,12 +17,12 @@ * * Author: Haitao Shan */ -#include -#include -#include -#include #include +#include #include +#include +#include +#include #include #include #include @@ -49,6 +49,7 @@ CHECK_pmu_params; static unsigned int __read_mostly opt_vpmu_enabled; unsigned int __read_mostly vpmu_mode = XENPMU_MODE_OFF; unsigned int __read_mostly vpmu_features = 0; +static struct arch_vpmu_ops __read_mostly vpmu_ops; static DEFINE_SPINLOCK(vpmu_lock); static unsigned vpmu_count; @@ -120,7 +121,6 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, { struct vcpu *curr = current; struct vpmu_struct *vpmu; - const struct arch_vpmu_ops *ops; int ret = 0; /* @@ -133,14 +133,13 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, goto nop; vpmu = vcpu_vpmu(curr); - ops = vpmu->arch_vpmu_ops; - if ( !ops ) + if ( !vpmu_is_set(vpmu, VPMU_INITIALIZED) ) goto nop; - if ( is_write && ops->do_wrmsr ) - ret = ops->do_wrmsr(msr, *msr_content, supported); - else if ( !is_write && ops->do_rdmsr ) - ret = ops->do_rdmsr(msr, msr_content); + if ( is_write && vpmu_ops.do_wrmsr ) + ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content, supported); + else if ( !is_write && vpmu_ops.do_rdmsr ) + ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); else goto nop; @@ -153,7 +152,7 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, vpmu_is_set(vpmu, VPMU_CACHED) ) { vpmu_set(vpmu, VPMU_CONTEXT_SAVE); - ops->arch_vpmu_save(curr, 0); + alternative_vcall(vpmu_ops.arch_vpmu_save, curr, 0); vpmu_reset(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); } @@ -202,7 +201,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) sampling = sampled; vpmu = vcpu_vpmu(sampling); - if ( !vpmu->arch_vpmu_ops ) + if ( !vpmu_is_set(vpmu, VPMU_INITIALIZED) ) return; /* PV(H) guest */ @@ -220,7 +219,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) /* PV guest will be reading PMU MSRs from xenpmu_data */ vpmu_set(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); - vpmu->arch_vpmu_ops->arch_vpmu_save(sampling, 1); + alternative_vcall(vpmu_ops.arch_vpmu_save, sampling, 1); vpmu_reset(vpmu, VPMU_CONTEXT_SAVE | VPMU_CONTEXT_LOADED); if ( is_hvm_vcpu(sampled) ) @@ -321,7 +320,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) /* We don't support (yet) HVM dom0 */ ASSERT(sampling == sampled); - if ( !vpmu->arch_vpmu_ops->do_interrupt(regs) || + if ( !alternative_call(vpmu_ops.do_interrupt, regs) || !is_vlapic_lvtpc_enabled(vlapic) ) return; @@ -349,8 +348,7 @@ static void vpmu_save_force(void *arg) vpmu_set(vpmu, VPMU_CONTEXT_SAVE); - if ( vpmu->arch_vpmu_ops ) - (void)vpmu->arch_vpmu_ops->arch_vpmu_save(v, 0); + alternative_vcall(vpmu_ops.arch_vpmu_save, v, 0); vpmu_reset(vpmu, VPMU_CONTEXT_SAVE); @@ -368,9 +366,8 @@ void vpmu_save(struct vcpu *v) vpmu->last_pcpu = pcpu; per_cpu(last_vcpu, pcpu) = v; - if ( vpmu->arch_vpmu_ops ) - if ( vpmu->arch_vpmu_ops->arch_vpmu_save(v, 0) ) - vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); + if ( alternative_call(vpmu_ops.arch_vpmu_save, v, 0) ) + vpmu_reset(vpmu, VPMU_CONTEXT_LOADED); apic_write(APIC_LVTPC, PMU_APIC_VECTOR | APIC_LVT_MASKED); } @@ -426,13 +423,13 @@ int vpmu_load(struct vcpu *v, bool_t from_guest) vpmu_is_set(vpmu, VPMU_CACHED)) ) return 0; - if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_load ) + if ( vpmu_ops.arch_vpmu_load ) { int ret; apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); /* Arch code needs to set VPMU_CONTEXT_LOADED */ - ret = vpmu->arch_vpmu_ops->arch_vpmu_load(v, from_guest); + ret = alternative_call(vpmu_ops.arch_vpmu_load, v, from_guest); if ( ret ) { apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); @@ -572,7 +569,7 @@ static void vpmu_arch_destroy(struct vcpu *v) on_selected_cpus(cpumask_of(vpmu->last_pcpu), vpmu_clear_last, v, 1); - if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_destroy ) + if ( vpmu_ops.arch_vpmu_destroy ) { /* * Unload VPMU first if VPMU_CONTEXT_LOADED being set. @@ -582,7 +579,7 @@ static void vpmu_arch_destroy(struct vcpu *v) on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), vpmu_save_force, v, 1); - vpmu->arch_vpmu_ops->arch_vpmu_destroy(v); + alternative_vcall(vpmu_ops.arch_vpmu_destroy, v); } vpmu_reset(vpmu, VPMU_CONTEXT_ALLOCATED); @@ -689,10 +686,9 @@ static void pvpmu_finish(struct domain *d, xen_pmu_params_t *params) /* Dump some vpmu information to console. Used in keyhandler dump_domains(). */ void vpmu_dump(struct vcpu *v) { - struct vpmu_struct *vpmu = vcpu_vpmu(v); - - if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_dump ) - vpmu->arch_vpmu_ops->arch_vpmu_dump(v); + if ( vpmu_is_set(vcpu_vpmu(v), VPMU_INITIALIZED) && + vpmu_ops.arch_vpmu_dump ) + alternative_vcall(vpmu_ops.arch_vpmu_dump, v); } long do_xenpmu_op(unsigned int op, XEN_GUEST_HANDLE_PARAM(xen_pmu_params_t) arg) @@ -870,6 +866,7 @@ static struct notifier_block cpu_nfb = { static int __init vpmu_init(void) { int vendor = current_cpu_data.x86_vendor; + const struct arch_vpmu_ops *ops = NULL; if ( !opt_vpmu_enabled ) return 0; @@ -886,36 +883,36 @@ static int __init vpmu_init(void) switch ( vendor ) { case X86_VENDOR_AMD: - if ( amd_vpmu_init() ) - vpmu_mode = XENPMU_MODE_OFF; + ops = amd_vpmu_init(); break; case X86_VENDOR_HYGON: - if ( hygon_vpmu_init() ) - vpmu_mode = XENPMU_MODE_OFF; + ops = hygon_vpmu_init(); break; case X86_VENDOR_INTEL: - if ( core2_vpmu_init() ) - vpmu_mode = XENPMU_MODE_OFF; + ops = core2_vpmu_init(); break; default: printk(XENLOG_WARNING "VPMU: Unknown CPU vendor: %d. " "Turning VPMU off.\n", vendor); - vpmu_mode = XENPMU_MODE_OFF; break; } - if ( vpmu_mode != XENPMU_MODE_OFF ) + if ( !IS_ERR_OR_NULL(ops) ) { + vpmu_ops = *ops; register_cpu_notifier(&cpu_nfb); printk(XENLOG_INFO "VPMU: version " __stringify(XENPMU_VER_MAJ) "." __stringify(XENPMU_VER_MIN) "\n"); } else + { + vpmu_mode = XENPMU_MODE_OFF; opt_vpmu_enabled = 0; + } return 0; } -__initcall(vpmu_init); +presmp_initcall(vpmu_init); diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 38972089ab..629a55f411 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -21,9 +21,9 @@ * */ -#include +#include #include -#include +#include #include #include #include @@ -483,7 +483,7 @@ static void amd_vpmu_dump(const struct vcpu *v) } } -static const struct arch_vpmu_ops amd_vpmu_ops = { +static const struct arch_vpmu_ops __initconstrel amd_vpmu_ops = { .do_wrmsr = amd_vpmu_do_wrmsr, .do_rdmsr = amd_vpmu_do_rdmsr, .do_interrupt = amd_vpmu_do_interrupt, @@ -529,13 +529,12 @@ int svm_vpmu_initialise(struct vcpu *v) offsetof(struct xen_pmu_amd_ctxt, regs)); } - vpmu->arch_vpmu_ops = &amd_vpmu_ops; + vpmu_set(vpmu, VPMU_INITIALIZED | VPMU_CONTEXT_ALLOCATED); - vpmu_set(vpmu, VPMU_CONTEXT_ALLOCATED); return 0; } -static int __init common_init(void) +static const struct arch_vpmu_ops *__init common_init(void) { unsigned int i; @@ -543,7 +542,7 @@ static int __init common_init(void) { printk(XENLOG_WARNING "VPMU: Unsupported CPU family %#x\n", current_cpu_data.x86); - return -EINVAL; + return ERR_PTR(-EINVAL); } if ( sizeof(struct xen_pmu_data) + @@ -553,7 +552,7 @@ static int __init common_init(void) "VPMU: Register bank does not fit into VPMU shared page\n"); counters = ctrls = NULL; num_counters = 0; - return -ENOSPC; + return ERR_PTR(-ENOSPC); } for ( i = 0; i < num_counters; i++ ) @@ -562,10 +561,10 @@ static int __init common_init(void) ctrl_rsvd[i] &= CTRL_RSVD_MASK; } - return 0; + return &amd_vpmu_ops; } -int __init amd_vpmu_init(void) +const struct arch_vpmu_ops *__init amd_vpmu_init(void) { switch ( current_cpu_data.x86 ) { @@ -592,7 +591,7 @@ int __init amd_vpmu_init(void) return common_init(); } -int __init hygon_vpmu_init(void) +const struct arch_vpmu_ops *__init hygon_vpmu_init(void) { switch ( current_cpu_data.x86 ) { diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index f59cae5438..75d6689984 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -18,9 +18,9 @@ * Author: Haitao Shan */ +#include #include #include -#include #include #include #include @@ -819,7 +819,7 @@ static void core2_vpmu_destroy(struct vcpu *v) vpmu_clear(vpmu); } -static const struct arch_vpmu_ops core2_vpmu_ops = { +static const struct arch_vpmu_ops __initconstrel core2_vpmu_ops = { .do_wrmsr = core2_vpmu_do_wrmsr, .do_rdmsr = core2_vpmu_do_rdmsr, .do_interrupt = core2_vpmu_do_interrupt, @@ -893,12 +893,12 @@ int vmx_vpmu_initialise(struct vcpu *v) if ( is_pv_vcpu(v) && !core2_vpmu_alloc_resource(v) ) return -EIO; - vpmu->arch_vpmu_ops = &core2_vpmu_ops; + vpmu_set(vpmu, VPMU_INITIALIZED); return 0; } -int __init core2_vpmu_init(void) +const struct arch_vpmu_ops *__init core2_vpmu_init(void) { unsigned int version = 0; unsigned int i; @@ -921,13 +921,13 @@ int __init core2_vpmu_init(void) default: printk(XENLOG_WARNING "VPMU: PMU version %u is not supported\n", version); - return -EINVAL; + return ERR_PTR(-EINVAL); } if ( current_cpu_data.x86 != 6 ) { printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); - return -EINVAL; + return ERR_PTR(-EINVAL); } arch_pmc_cnt = core2_get_arch_pmc_count(); @@ -972,9 +972,9 @@ int __init core2_vpmu_init(void) printk(XENLOG_WARNING "VPMU: Register bank does not fit into VPMU share page\n"); arch_pmc_cnt = fixed_pmc_cnt = 0; - return -ENOSPC; + return ERR_PTR(-ENOSPC); } - return 0; + return &core2_vpmu_ops; } diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h index 4b0a6ba3da..aca143c151 100644 --- a/xen/include/asm-x86/vpmu.h +++ b/xen/include/asm-x86/vpmu.h @@ -49,10 +49,10 @@ struct arch_vpmu_ops { void (*arch_vpmu_dump)(const struct vcpu *); }; -int core2_vpmu_init(void); +const struct arch_vpmu_ops *core2_vpmu_init(void); int vmx_vpmu_initialise(struct vcpu *); -int amd_vpmu_init(void); -int hygon_vpmu_init(void); +const struct arch_vpmu_ops *amd_vpmu_init(void); +const struct arch_vpmu_ops *hygon_vpmu_init(void); int svm_vpmu_initialise(struct vcpu *); struct vpmu_struct { @@ -61,25 +61,25 @@ struct vpmu_struct { u32 hw_lapic_lvtpc; void *context; /* May be shared with PV guest */ void *priv_context; /* hypervisor-only */ - const struct arch_vpmu_ops *arch_vpmu_ops; struct xen_pmu_data *xenpmu_data; spinlock_t vpmu_lock; }; /* VPMU states */ -#define VPMU_CONTEXT_ALLOCATED 0x1 -#define VPMU_CONTEXT_LOADED 0x2 -#define VPMU_RUNNING 0x4 -#define VPMU_CONTEXT_SAVE 0x8 /* Force context save */ -#define VPMU_FROZEN 0x10 /* Stop counters while VCPU is not running */ -#define VPMU_PASSIVE_DOMAIN_ALLOCATED 0x20 +#define VPMU_INITIALIZED 0x0001 +#define VPMU_CONTEXT_ALLOCATED 0x0002 +#define VPMU_CONTEXT_LOADED 0x0004 +#define VPMU_RUNNING 0x0008 +#define VPMU_CONTEXT_SAVE 0x0010 /* Force context save */ +#define VPMU_FROZEN 0x0020 /* Stop counters while VCPU is not running */ +#define VPMU_PASSIVE_DOMAIN_ALLOCATED 0x0040 /* PV(H) guests: VPMU registers are accessed by guest from shared page */ -#define VPMU_CACHED 0x40 -#define VPMU_AVAILABLE 0x80 +#define VPMU_CACHED 0x0080 +#define VPMU_AVAILABLE 0x0100 /* Intel-specific VPMU features */ -#define VPMU_CPU_HAS_DS 0x100 /* Has Debug Store */ -#define VPMU_CPU_HAS_BTS 0x200 /* Has Branch Trace Store */ +#define VPMU_CPU_HAS_DS 0x1000 /* Has Debug Store */ +#define VPMU_CPU_HAS_BTS 0x2000 /* Has Branch Trace Store */ static inline void vpmu_set(struct vpmu_struct *vpmu, const u32 mask) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:25:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:25:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240446.416986 (Exim 4.92) (envelope-from ) id 1muPEI-0004nf-Qm; Tue, 07 Dec 2021 01:25:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240446.416986; Tue, 07 Dec 2021 01:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEI-0004nX-Ng; Tue, 07 Dec 2021 01:25:14 +0000 Received: by outflank-mailman (input) for mailman id 240446; Tue, 07 Dec 2021 01:25:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEI-0004nP-1F for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEI-0005W1-0U for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPEH-0008Pn-Vt for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=M7P99X1dURJm6aguMKbOVXuHepuuyAe6098A10sSPFE=; b=K3KCiywSVpe6PIXAWaoEnB1fQD Dq3KbL9VdbOMfFKCurbGfajotiw/cfvxY2/SXs6tl7h238yfkcWF3QXseYt7OMDwkhagY/yjLnMng RawLwrr9oCKbyho2AgPRDsxDzYERCWFWDoF2n8M0RyC69xBQ5HdmbdvM5wkMq/eRKLdA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPMU: invoke _vpmu_initialise() through a hook as well Message-Id: Date: Tue, 07 Dec 2021 01:25:13 +0000 commit 8c20aca6751bf40f2d385f79d702813eb6a3cb27 Author: Jan Beulich AuthorDate: Fri Dec 3 11:21:14 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:21:14 2021 +0100 x86/vPMU: invoke _vpmu_initialise() through a hook as well I see little point in having an open-coded switch() statement to achieve the same; like other vendor-specific operations the function can be supplied in the respective ops structure instances. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/vpmu.c | 25 ++++++++++--------------- xen/arch/x86/cpu/vpmu_amd.c | 28 +++++++++++++--------------- xen/arch/x86/cpu/vpmu_intel.c | 28 ++++++++++++---------------- xen/include/asm-x86/vpmu.h | 3 +-- 4 files changed, 36 insertions(+), 48 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index eacf12c480..64a8f45c16 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -455,21 +455,11 @@ static int vpmu_arch_initialise(struct vcpu *v) ASSERT(!(vpmu->flags & ~VPMU_AVAILABLE) && !vpmu->context); - if ( !vpmu_available(v) ) + if ( !vpmu_available(v) || vpmu_mode == XENPMU_MODE_OFF ) return 0; - switch ( vendor ) + if ( !vpmu_ops.initialise ) { - case X86_VENDOR_AMD: - case X86_VENDOR_HYGON: - ret = svm_vpmu_initialise(v); - break; - - case X86_VENDOR_INTEL: - ret = vmx_vpmu_initialise(v); - break; - - default: if ( vpmu_mode != XENPMU_MODE_OFF ) { printk(XENLOG_G_WARNING "VPMU: Unknown CPU vendor %d. " @@ -480,12 +470,17 @@ static int vpmu_arch_initialise(struct vcpu *v) return -EINVAL; } - vpmu->hw_lapic_lvtpc = PMU_APIC_VECTOR | APIC_LVT_MASKED; - + ret = alternative_call(vpmu_ops.initialise, v); if ( ret ) + { printk(XENLOG_G_WARNING "VPMU: Initialization failed for %pv\n", v); + return ret; + } - return ret; + vpmu->hw_lapic_lvtpc = PMU_APIC_VECTOR | APIC_LVT_MASKED; + vpmu_set(vpmu, VPMU_INITIALIZED); + + return 0; } static void get_vpmu(struct vcpu *v) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 629a55f411..5bb4227662 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -483,24 +483,11 @@ static void amd_vpmu_dump(const struct vcpu *v) } } -static const struct arch_vpmu_ops __initconstrel amd_vpmu_ops = { - .do_wrmsr = amd_vpmu_do_wrmsr, - .do_rdmsr = amd_vpmu_do_rdmsr, - .do_interrupt = amd_vpmu_do_interrupt, - .arch_vpmu_destroy = amd_vpmu_destroy, - .arch_vpmu_save = amd_vpmu_save, - .arch_vpmu_load = amd_vpmu_load, - .arch_vpmu_dump = amd_vpmu_dump -}; - -int svm_vpmu_initialise(struct vcpu *v) +static int svm_vpmu_initialise(struct vcpu *v) { struct xen_pmu_amd_ctxt *ctxt; struct vpmu_struct *vpmu = vcpu_vpmu(v); - if ( vpmu_mode == XENPMU_MODE_OFF ) - return 0; - if ( !counters ) return -EINVAL; @@ -529,11 +516,22 @@ int svm_vpmu_initialise(struct vcpu *v) offsetof(struct xen_pmu_amd_ctxt, regs)); } - vpmu_set(vpmu, VPMU_INITIALIZED | VPMU_CONTEXT_ALLOCATED); + vpmu_set(vpmu, VPMU_CONTEXT_ALLOCATED); return 0; } +static const struct arch_vpmu_ops __initconstrel amd_vpmu_ops = { + .initialise = svm_vpmu_initialise, + .do_wrmsr = amd_vpmu_do_wrmsr, + .do_rdmsr = amd_vpmu_do_rdmsr, + .do_interrupt = amd_vpmu_do_interrupt, + .arch_vpmu_destroy = amd_vpmu_destroy, + .arch_vpmu_save = amd_vpmu_save, + .arch_vpmu_load = amd_vpmu_load, + .arch_vpmu_dump = amd_vpmu_dump, +}; + static const struct arch_vpmu_ops *__init common_init(void) { unsigned int i; diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 75d6689984..c44e81c756 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -819,25 +819,12 @@ static void core2_vpmu_destroy(struct vcpu *v) vpmu_clear(vpmu); } -static const struct arch_vpmu_ops __initconstrel core2_vpmu_ops = { - .do_wrmsr = core2_vpmu_do_wrmsr, - .do_rdmsr = core2_vpmu_do_rdmsr, - .do_interrupt = core2_vpmu_do_interrupt, - .arch_vpmu_destroy = core2_vpmu_destroy, - .arch_vpmu_save = core2_vpmu_save, - .arch_vpmu_load = core2_vpmu_load, - .arch_vpmu_dump = core2_vpmu_dump -}; - -int vmx_vpmu_initialise(struct vcpu *v) +static int vmx_vpmu_initialise(struct vcpu *v) { struct vpmu_struct *vpmu = vcpu_vpmu(v); u64 msr_content; static bool_t ds_warned; - if ( vpmu_mode == XENPMU_MODE_OFF ) - return 0; - if ( v->domain->arch.cpuid->basic.pmu_version <= 1 || v->domain->arch.cpuid->basic.pmu_version >= 6 ) return -EINVAL; @@ -893,11 +880,20 @@ int vmx_vpmu_initialise(struct vcpu *v) if ( is_pv_vcpu(v) && !core2_vpmu_alloc_resource(v) ) return -EIO; - vpmu_set(vpmu, VPMU_INITIALIZED); - return 0; } +static const struct arch_vpmu_ops __initconstrel core2_vpmu_ops = { + .initialise = vmx_vpmu_initialise, + .do_wrmsr = core2_vpmu_do_wrmsr, + .do_rdmsr = core2_vpmu_do_rdmsr, + .do_interrupt = core2_vpmu_do_interrupt, + .arch_vpmu_destroy = core2_vpmu_destroy, + .arch_vpmu_save = core2_vpmu_save, + .arch_vpmu_load = core2_vpmu_load, + .arch_vpmu_dump = core2_vpmu_dump, +}; + const struct arch_vpmu_ops *__init core2_vpmu_init(void) { unsigned int version = 0; diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h index aca143c151..8cfa2cf599 100644 --- a/xen/include/asm-x86/vpmu.h +++ b/xen/include/asm-x86/vpmu.h @@ -39,6 +39,7 @@ /* Arch specific operations shared by all vpmus */ struct arch_vpmu_ops { + int (*initialise)(struct vcpu *v); int (*do_wrmsr)(unsigned int msr, uint64_t msr_content, uint64_t supported); int (*do_rdmsr)(unsigned int msr, uint64_t *msr_content); @@ -50,10 +51,8 @@ struct arch_vpmu_ops { }; const struct arch_vpmu_ops *core2_vpmu_init(void); -int vmx_vpmu_initialise(struct vcpu *); const struct arch_vpmu_ops *amd_vpmu_init(void); const struct arch_vpmu_ops *hygon_vpmu_init(void); -int svm_vpmu_initialise(struct vcpu *); struct vpmu_struct { u32 flags; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:25:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:25:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240447.416991 (Exim 4.92) (envelope-from ) id 1muPES-0004r0-SY; Tue, 07 Dec 2021 01:25:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240447.416991; Tue, 07 Dec 2021 01:25:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPES-0004qs-PH; Tue, 07 Dec 2021 01:25:24 +0000 Received: by outflank-mailman (input) for mailman id 240447; Tue, 07 Dec 2021 01:25:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPES-0004qk-4O for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPES-0005W8-3c for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPES-0008QN-2p for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Nlp6TOtn0GtfDERC/tYQDKWGPwGKFlzXRCmZBJDCu+g=; b=OVM3IRnqza8sbQn9+AZB0ewh+J YlzIJ85o5g2OxAI7mUD1GM6JSIP+IuBr1dYpxnUCPMz6R7MBMhCWk90LPiiGgSzmAGxIHVaZBcWF/ rhfzY+BndK3fGNF3jqs4Cq021OjrL/8IS9FFs+vbD+DoTvLK4vQqu62a+Le/o8Wd013g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPMU: move vpmu_ops to .init.data Message-Id: Date: Tue, 07 Dec 2021 01:25:24 +0000 commit 75a16d4c5f16c611687a4460dfae23909588f3fa Author: Jan Beulich AuthorDate: Fri Dec 3 11:22:03 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:22:03 2021 +0100 x86/vPMU: move vpmu_ops to .init.data Both vendors' code populates all hooks, so there's no need to have any NULL checks before invoking the hook functions. With that the only remaining uses of the object are in alternative_{,v}call(), i.e. none after alternatives patching. In vpmu_arch_initialise() the check gets replaced by an opt_vpmu_enabled one, as I couldn't convince myself that the pre-existing checks would be sufficient to cover all possible cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/vpmu.c | 54 ++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 64a8f45c16..7fd69a2a58 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -49,7 +49,7 @@ CHECK_pmu_params; static unsigned int __read_mostly opt_vpmu_enabled; unsigned int __read_mostly vpmu_mode = XENPMU_MODE_OFF; unsigned int __read_mostly vpmu_features = 0; -static struct arch_vpmu_ops __read_mostly vpmu_ops; +static struct arch_vpmu_ops __initdata vpmu_ops; static DEFINE_SPINLOCK(vpmu_lock); static unsigned vpmu_count; @@ -136,12 +136,10 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, if ( !vpmu_is_set(vpmu, VPMU_INITIALIZED) ) goto nop; - if ( is_write && vpmu_ops.do_wrmsr ) + if ( is_write ) ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content, supported); - else if ( !is_write && vpmu_ops.do_rdmsr ) - ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); else - goto nop; + ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); /* * We may have received a PMU interrupt while handling MSR access @@ -375,7 +373,7 @@ void vpmu_save(struct vcpu *v) int vpmu_load(struct vcpu *v, bool_t from_guest) { struct vpmu_struct *vpmu = vcpu_vpmu(v); - int pcpu = smp_processor_id(); + int pcpu = smp_processor_id(), ret; struct vcpu *prev = NULL; if ( !vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) @@ -423,21 +421,13 @@ int vpmu_load(struct vcpu *v, bool_t from_guest) vpmu_is_set(vpmu, VPMU_CACHED)) ) return 0; - if ( vpmu_ops.arch_vpmu_load ) - { - int ret; - - apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); - /* Arch code needs to set VPMU_CONTEXT_LOADED */ - ret = alternative_call(vpmu_ops.arch_vpmu_load, v, from_guest); - if ( ret ) - { - apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); - return ret; - } - } + apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); + /* Arch code needs to set VPMU_CONTEXT_LOADED */ + ret = alternative_call(vpmu_ops.arch_vpmu_load, v, from_guest); + if ( ret ) + apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc | APIC_LVT_MASKED); - return 0; + return ret; } static int vpmu_arch_initialise(struct vcpu *v) @@ -458,7 +448,7 @@ static int vpmu_arch_initialise(struct vcpu *v) if ( !vpmu_available(v) || vpmu_mode == XENPMU_MODE_OFF ) return 0; - if ( !vpmu_ops.initialise ) + if ( !opt_vpmu_enabled ) { if ( vpmu_mode != XENPMU_MODE_OFF ) { @@ -564,18 +554,15 @@ static void vpmu_arch_destroy(struct vcpu *v) on_selected_cpus(cpumask_of(vpmu->last_pcpu), vpmu_clear_last, v, 1); - if ( vpmu_ops.arch_vpmu_destroy ) - { - /* - * Unload VPMU first if VPMU_CONTEXT_LOADED being set. - * This will stop counters. - */ - if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) - on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), - vpmu_save_force, v, 1); + /* + * Unload VPMU first if VPMU_CONTEXT_LOADED being set. + * This will stop counters. + */ + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_LOADED) ) + on_selected_cpus(cpumask_of(vcpu_vpmu(v)->last_pcpu), + vpmu_save_force, v, 1); - alternative_vcall(vpmu_ops.arch_vpmu_destroy, v); - } + alternative_vcall(vpmu_ops.arch_vpmu_destroy, v); vpmu_reset(vpmu, VPMU_CONTEXT_ALLOCATED); } @@ -681,8 +668,7 @@ static void pvpmu_finish(struct domain *d, xen_pmu_params_t *params) /* Dump some vpmu information to console. Used in keyhandler dump_domains(). */ void vpmu_dump(struct vcpu *v) { - if ( vpmu_is_set(vcpu_vpmu(v), VPMU_INITIALIZED) && - vpmu_ops.arch_vpmu_dump ) + if ( vpmu_is_set(vcpu_vpmu(v), VPMU_INITIALIZED) ) alternative_vcall(vpmu_ops.arch_vpmu_dump, v); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:25:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:25:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240448.416994 (Exim 4.92) (envelope-from ) id 1muPEc-0004u5-Tj; Tue, 07 Dec 2021 01:25:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240448.416994; Tue, 07 Dec 2021 01:25:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEc-0004tx-Qu; Tue, 07 Dec 2021 01:25:34 +0000 Received: by outflank-mailman (input) for mailman id 240448; Tue, 07 Dec 2021 01:25:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEc-0004tn-7V for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEc-0005WJ-6n for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPEc-0008Qw-62 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NGR4+ysK7BVtEJRkJmS9iMcJA7Z9BgcugTl09/FBXkc=; b=QUfSKKF918GrDXjBOujPJnAgNn BnUoETDdxsdMP0TOeRhyVkA64OuYkSRwsmr5KBMLrwSVBH9PuevGzhHQMQ2W3yvfpdUZqiklZnk5w 6fUAI8j1IaNytVpiRc497ZPFL12SghBFj02cDnLiYLySpi7+BzdgQQoAEXwYYm3V2/CM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: tidy domid map handling Message-Id: Date: Tue, 07 Dec 2021 01:25:34 +0000 commit bbcea43d830bdc85bf5a6c1b6b8041bd2b607454 Author: Jan Beulich AuthorDate: Fri Dec 3 11:33:43 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:33:43 2021 +0100 VT-d: tidy domid map handling - Correct struct field type. - Use unsigned int when that suffices. - Eliminate a (badly typed) local variable from context_set_domain_id(). - Don't use -EFAULT inappropriately. - Move set_bit() such that it won't be done redundantly. - Constification. - Reduce scope of some variables. - Coding style. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 52 ++++++++++++++++--------------------- xen/drivers/passthrough/vtd/iommu.h | 2 +- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index b33697e36b..2ddee7357b 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -62,10 +62,10 @@ static struct tasklet vtd_fault_tasklet; static int setup_hwdom_device(u8 devfn, struct pci_dev *); static void setup_hwdom_rmrr(struct domain *d); -static int domain_iommu_domid(struct domain *d, - struct vtd_iommu *iommu) +static int domain_iommu_domid(const struct domain *d, + const struct vtd_iommu *iommu) { - unsigned long nr_dom, i; + unsigned int nr_dom, i; nr_dom = cap_ndoms(iommu->cap); i = find_first_bit(iommu->domid_bitmap, nr_dom); @@ -74,7 +74,7 @@ static int domain_iommu_domid(struct domain *d, if ( iommu->domid_map[i] == d->domain_id ) return i; - i = find_next_bit(iommu->domid_bitmap, nr_dom, i+1); + i = find_next_bit(iommu->domid_bitmap, nr_dom, i + 1); } if ( !d->is_dying ) @@ -88,61 +88,52 @@ static int domain_iommu_domid(struct domain *d, #define DID_FIELD_WIDTH 16 #define DID_HIGH_OFFSET 8 static int context_set_domain_id(struct context_entry *context, - struct domain *d, + const struct domain *d, struct vtd_iommu *iommu) { - unsigned long nr_dom, i; - int found = 0; + unsigned int nr_dom, i; ASSERT(spin_is_locked(&iommu->lock)); nr_dom = cap_ndoms(iommu->cap); i = find_first_bit(iommu->domid_bitmap, nr_dom); - while ( i < nr_dom ) - { - if ( iommu->domid_map[i] == d->domain_id ) - { - found = 1; - break; - } - i = find_next_bit(iommu->domid_bitmap, nr_dom, i+1); - } + while ( i < nr_dom && iommu->domid_map[i] != d->domain_id ) + i = find_next_bit(iommu->domid_bitmap, nr_dom, i + 1); - if ( found == 0 ) + if ( i >= nr_dom ) { i = find_first_zero_bit(iommu->domid_bitmap, nr_dom); if ( i >= nr_dom ) { dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: no free domain ids\n"); - return -EFAULT; + return -EBUSY; } iommu->domid_map[i] = d->domain_id; + set_bit(i, iommu->domid_bitmap); } - set_bit(i, iommu->domid_bitmap); context->hi |= (i & ((1 << DID_FIELD_WIDTH) - 1)) << DID_HIGH_OFFSET; return 0; } -static int context_get_domain_id(struct context_entry *context, - struct vtd_iommu *iommu) +static int context_get_domain_id(const struct context_entry *context, + const struct vtd_iommu *iommu) { - unsigned long dom_index, nr_dom; int domid = -1; - if (iommu && context) + if ( iommu && context ) { - nr_dom = cap_ndoms(iommu->cap); - - dom_index = context_domain_id(*context); + unsigned int nr_dom = cap_ndoms(iommu->cap); + unsigned int dom_index = context_domain_id(*context); if ( dom_index < nr_dom && iommu->domid_map ) domid = iommu->domid_map[dom_index]; else dprintk(XENLOG_DEBUG VTDPREFIX, - "dom_index %lu exceeds nr_dom %lu or iommu has no domid_map\n", + "dom_index %u exceeds nr_dom %u or iommu has no domid_map\n", dom_index, nr_dom); } + return domid; } @@ -1303,7 +1294,7 @@ int __init iommu_alloc(struct acpi_drhd_unit *drhd) if ( !iommu->domid_bitmap ) return -ENOMEM; - iommu->domid_map = xzalloc_array(u16, nr_dom); + iommu->domid_map = xzalloc_array(domid_t, nr_dom); if ( !iommu->domid_map ) return -ENOMEM; @@ -1478,11 +1469,12 @@ int domain_context_mapping_one( spin_unlock(&hd->arch.mapping_lock); } - if ( context_set_domain_id(context, domain, iommu) ) + rc = context_set_domain_id(context, domain, iommu); + if ( rc ) { spin_unlock(&iommu->lock); unmap_vtd_domain_page(context_entries); - return -EFAULT; + return rc; } context_set_address_width(*context, level_to_agaw(iommu->nr_pt_levels)); diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index b993f0cf08..07501dda4e 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -500,7 +500,7 @@ struct vtd_iommu { struct list_head ats_devices; unsigned long *domid_bitmap; /* domain id bitmap */ - u16 *domid_map; /* domain id mapping array */ + domid_t *domid_map; /* domain id mapping array */ uint32_t version; }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:25:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:25:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240449.416998 (Exim 4.92) (envelope-from ) id 1muPEm-0004wu-VK; Tue, 07 Dec 2021 01:25:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240449.416998; Tue, 07 Dec 2021 01:25:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEm-0004wm-SP; Tue, 07 Dec 2021 01:25:44 +0000 Received: by outflank-mailman (input) for mailman id 240449; Tue, 07 Dec 2021 01:25:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEm-0004wg-Ap for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEm-0005WT-A0 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPEm-0008RW-9F for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DVnAdzAUbd9zUzQcIESxaUBW2xOqVC7c03WDE3Rw7FA=; b=T1URko2G98/vahok1K4dimYxFZ V49/MGRonzM+Bxx3ssTDrD2widIZihFfCfXDKtdJ9fWczF2T8WXa0uPEfp8pyIB+TqJ4OMmJAZWU4 H9ssvUUOeoK/mpCWCkesgZ0VUifkxhtyaI3BQdkEeDXiUXvJ0P7s75L4o2RCerWva8oY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] VT-d: introduce helper to convert DID to domid_t Message-Id: Date: Tue, 07 Dec 2021 01:25:44 +0000 commit d159edac73cf887fc899326edddd00133c1d206c Author: Jan Beulich AuthorDate: Fri Dec 3 11:34:24 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:34:24 2021 +0100 VT-d: introduce helper to convert DID to domid_t This is in preparation of adding another "translation" method. Take the combination of the extra validation both previously open-coded have been doing: Bounds check and bitmap check. But don't propagate the previous pointless check of whether ->domid_map[] was actually allocated, as failure there would lead to overall failure of IOMMU initialization anyway. Signed-off-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/extern.h | 2 ++ xen/drivers/passthrough/vtd/iommu.c | 21 +++++++++++++++------ xen/drivers/passthrough/vtd/qinval.c | 5 +---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 6fb00a25c3..f97883a780 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -45,6 +45,8 @@ void disable_intremap(struct vtd_iommu *iommu); int iommu_alloc(struct acpi_drhd_unit *drhd); void iommu_free(struct acpi_drhd_unit *drhd); +domid_t did_to_domain_id(const struct vtd_iommu *iommu, unsigned int did); + int iommu_flush_iec_global(struct vtd_iommu *iommu); int iommu_flush_iec_index(struct vtd_iommu *iommu, u8 im, u16 iidx); void clear_fault_bits(struct vtd_iommu *iommu); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2ddee7357b..b329b5d14f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -123,15 +123,16 @@ static int context_get_domain_id(const struct context_entry *context, if ( iommu && context ) { - unsigned int nr_dom = cap_ndoms(iommu->cap); unsigned int dom_index = context_domain_id(*context); - if ( dom_index < nr_dom && iommu->domid_map ) - domid = iommu->domid_map[dom_index]; - else + domid = did_to_domain_id(iommu, dom_index); + if ( domid == DOMID_INVALID ) + { dprintk(XENLOG_DEBUG VTDPREFIX, - "dom_index %u exceeds nr_dom %u or iommu has no domid_map\n", - dom_index, nr_dom); + "no domid for did %u (nr_dom %u)\n", + dom_index, cap_ndoms(iommu->cap)); + domid = -1; + } } return domid; @@ -193,6 +194,14 @@ static void check_cleanup_domid_map(struct domain *d, } } +domid_t did_to_domain_id(const struct vtd_iommu *iommu, unsigned int did) +{ + if ( did >= cap_ndoms(iommu->cap) || !test_bit(did, iommu->domid_bitmap) ) + return DOMID_INVALID; + + return iommu->domid_map[did]; +} + static void sync_cache(const void *addr, unsigned int size) { static unsigned long clflush_size = 0; diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c index b16153e298..9f291f47e5 100644 --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -229,10 +229,7 @@ static int __must_check dev_invalidate_sync(struct vtd_iommu *iommu, rc = queue_invalidate_wait(iommu, 0, 1, 1, 1); if ( rc == -ETIMEDOUT ) { - struct domain *d = NULL; - - if ( test_bit(did, iommu->domid_bitmap) ) - d = rcu_lock_domain_by_id(iommu->domid_map[did]); + struct domain *d = rcu_lock_domain_by_id(did_to_domain_id(iommu, did)); /* * In case the domain has been freed or the IOMMU domid bitmap is -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:25:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:25:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240450.417002 (Exim 4.92) (envelope-from ) id 1muPEx-0004zY-0o; Tue, 07 Dec 2021 01:25:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240450.417002; Tue, 07 Dec 2021 01:25:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEw-0004zQ-Tz; Tue, 07 Dec 2021 01:25:54 +0000 Received: by outflank-mailman (input) for mailman id 240450; Tue, 07 Dec 2021 01:25:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEw-0004zJ-Dv for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPEw-0005Wa-DH for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPEw-0008S7-CX for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:25:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9bENGVY/MrHPNkaeJ3aYyuPV37z0TsybQLAuWIvEs4o=; b=au0TlGbSSKez6IWFg0slQ9eVsR 05p56P5Uq5zlBCA9sJ7icctlvzHkkrvjC1hWwjyV75q7Bqz9lTf1UZ+TItiMBaIv2db23topzAbRE 5szB6VBFrHN88RF6XoFEZrlmUqo3aRbN9vdlvd5nZbOpQ6jITTC//2ijGJmOPtXsR5A8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/x2APIC: defer probe until after IOMMU ACPI table parsing Message-Id: Date: Tue, 07 Dec 2021 01:25:54 +0000 commit 3950f2485bbc983c5c9f66ef9637395e975a2bec Author: Jan Beulich AuthorDate: Fri Dec 3 11:36:10 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:36:10 2021 +0100 x86/x2APIC: defer probe until after IOMMU ACPI table parsing While commit 46c4061cd2bf ("x86/IOMMU: mark IOMMU / intremap not in use when ACPI tables are missing") deals with apic_x2apic_probe() as called from x2apic_bsp_setup(), the check_x2apic_preenabled() path is similarly affected: The call needs to occur after acpi_iommu_init(), such that iommu_intremap getting disabled there can be properly taken into account by apic_x2apic_probe(). Note that, for the time being (further cleanup patches following), reversing the order of the calls to generic_apic_probe() and acpi_boot_init() is not an option: - acpi_process_madt() calls clustered_apic_check() and hence relies on genapic to have got filled before, - generic_bigsmp_probe() (called from acpi_process_madt()) needs to occur after generic_apic_probe(), - acpi_parse_madt() (called from acpi_process_madt()) calls acpi_madt_oem_check(), which wants to be after generic_apic_probe(). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/acpi/boot.c | 2 -- xen/arch/x86/setup.c | 19 +++++++++++++++++-- xen/drivers/passthrough/x86/iommu.c | 11 +++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 24702d041c..cc4bbc0284 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -742,8 +742,6 @@ int __init acpi_boot_init(void) acpi_mmcfg_init(); - acpi_iommu_init(); - erst_init(); acpi_hest_init(); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 723bd49c76..f40a9fe5d3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1664,15 +1664,30 @@ void __init noreturn __start_xen(unsigned long mbi_p) dmi_scan_machine(); - generic_apic_probe(); - mmio_ro_ranges = rangeset_new(NULL, "r/o mmio ranges", RANGESETF_prettyprint_hex); xsm_multiboot_init(module_map, mbi); + /* + * IOMMU-related ACPI table parsing may require some of the system domains + * to be usable, e.g. for pci_hide_device()'s use of dom_xen. + */ setup_system_domains(); + /* + * IOMMU-related ACPI table parsing has to happen before APIC probing, for + * check_x2apic_preenabled() to be able to observe respective findings, in + * particular iommu_intremap having got turned off. + */ + acpi_iommu_init(); + + /* + * APIC probing needs to happen before general ACPI table parsing, as e.g. + * generic_bigsmp_probe() may occur only afterwards. + */ + generic_apic_probe(); + acpi_boot_init(); if ( smp_found_config ) diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index b2284ae001..f11280f4b2 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -43,14 +43,17 @@ bool __read_mostly iommu_intpost; void __init acpi_iommu_init(void) { - int ret; + int ret = -ENODEV; if ( !iommu_enable && !iommu_intremap ) return; - ret = acpi_dmar_init(); - if ( ret == -ENODEV ) - ret = acpi_ivrs_init(); + if ( !acpi_disabled ) + { + ret = acpi_dmar_init(); + if ( ret == -ENODEV ) + ret = acpi_ivrs_init(); + } if ( ret ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:26:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:26:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240451.417006 (Exim 4.92) (envelope-from ) id 1muPF7-00052u-3k; Tue, 07 Dec 2021 01:26:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240451.417006; Tue, 07 Dec 2021 01:26:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPF7-00052m-0m; Tue, 07 Dec 2021 01:26:05 +0000 Received: by outflank-mailman (input) for mailman id 240451; Tue, 07 Dec 2021 01:26:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPF6-00052f-H0 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPF6-0005Wr-GJ for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPF6-0008T3-Fd for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4XMO74Az3nHsy1dUqhHz4idYgpPBjX6abxOG520bQLw=; b=xulcNFwD2RQMPkqQUjeeBROSIg mUTyDZcgrNIRPyurkAaWt8sikwHzJchzkOHp5MkkrX4w+FCM5X+JCGgAAnNdzcI92GbJCPsknyIbW cUPaTVwSKqXdCVErgeoo1nxquHYC/oGx4shS1cAsLnJ81dzmYmNk9YN9cqUGWvvpyR0M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/alternatives: adjust alternative_vcall0() Message-Id: Date: Tue, 07 Dec 2021 01:26:04 +0000 commit 1f1179c619f6b82d3f193a9da7a24c359f79fb67 Author: Jan Beulich AuthorDate: Fri Dec 3 11:36:46 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:36:46 2021 +0100 x86/alternatives: adjust alternative_vcall0() I'm puzzled about two inconsistencies with other alternative_vcall() here: There's a check missing that the supplied function pointer is actually pointing to a function taking no args. And there's a pointless pair of parentheses. Correct both. Fixes: 67d01cdb5518 ("x86: infrastructure to allow converting certain indirect calls to direct ones") Signed-off-by: Jan Beulich Reviewed-by: Wei Chen --- xen/include/asm-x86/alternative.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h index 8bc59b02af..a7a82c2c03 100644 --- a/xen/include/asm-x86/alternative.h +++ b/xen/include/asm-x86/alternative.h @@ -218,7 +218,8 @@ extern void alternative_branches(void); #define alternative_vcall0(func) ({ \ ALT_CALL_NO_ARG1; \ - ((void)alternative_callN(0, int, func)); \ + (void)sizeof(func()); \ + (void)alternative_callN(0, int, func); \ }) #define alternative_call0(func) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:26:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:26:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240452.417010 (Exim 4.92) (envelope-from ) id 1muPFI-00055T-5F; Tue, 07 Dec 2021 01:26:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240452.417010; Tue, 07 Dec 2021 01:26:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFI-00055L-2E; Tue, 07 Dec 2021 01:26:16 +0000 Received: by outflank-mailman (input) for mailman id 240452; Tue, 07 Dec 2021 01:26:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFG-00055B-KA for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFG-0005XM-JT for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPFG-0008Td-Ib for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0I9GwILvklYaqoqp6m0h//iYnnvnTwlpMm3k78XXwEg=; b=iSZXOAC5GxidyG93Ap2/dcZT27 L6BAxgnmnH+MGvGEOs380MXbw69Kq6kLJABP/lI2nTqVlzEqqT4kJwtoNCCiINFi/soHUhxM+/0ny 6NrNisgdBpcu0nktguQAgkMz7G5YEYcK76vE9b3XaqF5W/vzUgtfwkbMCQligec+zAdU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/Viridian: fold duplicate vpset retrieval code Message-Id: Date: Tue, 07 Dec 2021 01:26:14 +0000 commit 6a6ab829b6defb4165a65225fbbb9c1703845676 Author: Jan Beulich AuthorDate: Fri Dec 3 11:37:45 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 11:37:45 2021 +0100 x86/Viridian: fold duplicate vpset retrieval code hvcall_{flush,ipi}_ex() use more almost identical code than what was isolated into hv_vpset_to_vpmask(). Move that code there as well, to have just one instance of it. This way all of HV_GENERIC_SET_SPARSE_4K processing now happens in a single place. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/viridian.c | 73 +++++++++++++----------------------- 1 file changed, 26 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index 9e1363207f..8986b8e03c 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -621,10 +621,14 @@ static unsigned int hv_vpset_nr_banks(struct hv_vpset *vpset) return hweight64(vpset->valid_bank_mask); } -static int hv_vpset_to_vpmask(const struct hv_vpset *set, +static int hv_vpset_to_vpmask(const struct hv_vpset *in, paddr_t bank_gpa, struct hypercall_vpmask *vpmask) { #define NR_VPS_PER_BANK (HV_VPSET_BANK_SIZE * 8) + union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); + struct hv_vpset *set = &vpset->set; + + *set = *in; switch ( set->format ) { @@ -636,6 +640,18 @@ static int hv_vpset_to_vpmask(const struct hv_vpset *set, { uint64_t bank_mask; unsigned int vp, bank = 0; + size_t size = sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); + + if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > + sizeof(*vpset) ) + { + ASSERT_UNREACHABLE(); + return -EINVAL; + } + + if ( hvm_copy_from_guest_phys(&set->bank_contents, bank_gpa, + size) != HVMTRANS_okay ) + return -EINVAL; vpmask_empty(vpmask); for ( vp = 0, bank_mask = set->valid_bank_mask; @@ -760,31 +776,13 @@ static int hvcall_flush_ex(const union hypercall_input *input, vcpu_bitmap = NULL; else { - union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); - struct hv_vpset *set = &vpset->set; - int rc; - - *set = input_params.set; - if ( set->format == HV_GENERIC_SET_SPARSE_4K ) - { - unsigned long offset = offsetof(typeof(input_params), + unsigned int bank_offset = offsetof(typeof(input_params), set.bank_contents); - size_t size = sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); - - if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > - sizeof(*vpset) ) - { - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( hvm_copy_from_guest_phys(&set->bank_contents[0], - input_params_gpa + offset, - size) != HVMTRANS_okay) - return -EINVAL; - } + int rc; - rc = hv_vpset_to_vpmask(set, vpmask); + rc = hv_vpset_to_vpmask(&input_params.set, + input_params_gpa + bank_offset, + vpmask); if ( rc ) return rc; @@ -883,8 +881,8 @@ static int hvcall_ipi_ex(const union hypercall_input *input, uint8_t reserved_zero[3]; struct hv_vpset set; } input_params; - union hypercall_vpset *vpset = &this_cpu(hypercall_vpset); - struct hv_vpset *set = &vpset->set; + unsigned int bank_offset = offsetof(typeof(input_params), + set.bank_contents); int rc; /* These hypercalls should never use the fast-call convention. */ @@ -905,27 +903,8 @@ static int hvcall_ipi_ex(const union hypercall_input *input, if ( input_params.vector < 0x10 || input_params.vector > 0xff ) return -EINVAL; - *set = input_params.set; - if ( set->format == HV_GENERIC_SET_SPARSE_4K ) - { - unsigned long offset = offsetof(typeof(input_params), - set.bank_contents); - size_t size = sizeof(*set->bank_contents) * hv_vpset_nr_banks(set); - - if ( offsetof(typeof(*vpset), set.bank_contents[0]) + size > - sizeof(*vpset) ) - { - ASSERT_UNREACHABLE(); - return -EINVAL; - } - - if ( hvm_copy_from_guest_phys(&set->bank_contents, - input_params_gpa + offset, - size) != HVMTRANS_okay) - return -EINVAL; - } - - rc = hv_vpset_to_vpmask(set, vpmask); + rc = hv_vpset_to_vpmask(&input_params.set, input_params_gpa + bank_offset, + vpmask); if ( rc ) return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:26:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:26:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240453.417014 (Exim 4.92) (envelope-from ) id 1muPFS-00058K-6T; Tue, 07 Dec 2021 01:26:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240453.417014; Tue, 07 Dec 2021 01:26:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFS-00058C-3i; Tue, 07 Dec 2021 01:26:26 +0000 Received: by outflank-mailman (input) for mailman id 240453; Tue, 07 Dec 2021 01:26:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFQ-000583-ND for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFQ-0005XW-MZ for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPFQ-0008UC-Lq for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4oeFYPpLhEW6kpP358HoYrPfJT1+kfznm+Eqw/oZbms=; b=Jb6TtHCX3qzPfsH+mWYAwQGSbh wqioEfgMZT4Ld2ig8SlI3WOAbFzxm3oB3/TgwptjxhkTl7beJMh7BuGYa51IdAmQvxZS78ie2ngKK +fDSVebUW/mzK09zQWFE+i3ek54jwksP5Gt8Gv0+yKhWdvwMUK2Q0aeVGofB06r93cd8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/vgic: Fix reference to a non-existing function Message-Id: Date: Tue, 07 Dec 2021 01:26:24 +0000 commit a44d428158ba84144f0dca9d98bfef7e7b3ff26d Author: Michal Orzel AuthorDate: Fri Dec 3 10:58:37 2021 +0100 Commit: Julien Grall CommitDate: Fri Dec 3 12:10:50 2021 +0000 arm/vgic: Fix reference to a non-existing function Commit 68dcdf942326ad90ca527831afbee9cd4a867f84 (xen/arm: s/gic_set_guest_irq/gic_raise_guest_irq) forgot to modify a comment about lr_pending list, referring to a function that has been renamed. Fix that. Fixes: 68dcdf942326 ("xen/arm: s/gic_set_guest_irq/gic_raise_guest_irq") Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/include/asm-arm/vgic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index e69a59063a..ade427a808 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -195,7 +195,7 @@ struct vgic_cpu { * corresponding LR it is also removed from this list. */ struct list_head inflight_irqs; /* lr_pending is used to queue IRQs (struct pending_irq) that the - * vgic tried to inject in the guest (calling gic_set_guest_irq) but + * vgic tried to inject in the guest (calling gic_raise_guest_irq) but * no LRs were available at the time. * As soon as an LR is freed we remove the first IRQ from this * list and write it to the LR register. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:26:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:26:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240454.417017 (Exim 4.92) (envelope-from ) id 1muPFc-0005BY-86; Tue, 07 Dec 2021 01:26:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240454.417017; Tue, 07 Dec 2021 01:26:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFc-0005BQ-57; Tue, 07 Dec 2021 01:26:36 +0000 Received: by outflank-mailman (input) for mailman id 240454; Tue, 07 Dec 2021 01:26:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFa-0005BB-QD for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFa-0005Xg-PX for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPFa-0008Uf-Oq for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iN7xJvMOhMmPBL1AstaBNlUsEVHpgFt9XmZjzyA22sI=; b=rtWViSEnYRcFcq/SdzLH/r/S23 F85FzHoxjPhQ87/ntk9uwS26m6YnPifOgIsCfHPXDOCAhYF235vkQGspAet0GPeSSEC2bBbwRxew0 mP6mjqgrH3pb7jGtG1woPQI/ECMsBo7oZdtw7SlHlz4dr3Kqikw1MYnczlLqNE5pZMpA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/efi: Fix wrong compatible in dts example Message-Id: Date: Tue, 07 Dec 2021 01:26:34 +0000 commit 620ed2c8c777282154a91abca69083a40c9d918d Author: Luca Fancellu AuthorDate: Thu Dec 2 15:05:17 2021 +0000 Commit: Julien Grall CommitDate: Fri Dec 3 12:39:20 2021 +0000 docs/efi: Fix wrong compatible in dts example The example in section "UEFI boot and dom0less on ARM" has a wrong compatible for the DTB passthrough, it is "ramdisk" instead of "device-tree". This patch fixes the example. Fixes: a1743fc3a9fe ("arm/efi: Use dom0less configuration when using EFI boot") Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- docs/misc/efi.pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index 4abbb5bb82..abafb34527 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -222,7 +222,7 @@ domU1 { xen,uefi-binary = "initrd-3.0.31-0.4-xen"; }; module@3 { - compatible = "multiboot,ramdisk", "multiboot,module"; + compatible = "multiboot,device-tree", "multiboot,module"; xen,uefi-binary = "passthrough.dtb"; }; }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:26:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:26:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240455.417022 (Exim 4.92) (envelope-from ) id 1muPFm-0005EK-9Z; Tue, 07 Dec 2021 01:26:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240455.417022; Tue, 07 Dec 2021 01:26:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFm-0005EC-6Y; Tue, 07 Dec 2021 01:26:46 +0000 Received: by outflank-mailman (input) for mailman id 240455; Tue, 07 Dec 2021 01:26:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFk-0005E2-TE for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFk-0005Xq-Sa for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPFk-0008VE-Rw for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O6WR4V0mhxptdv+THQzI2gHMj4p6AQXhICeNHJJuSXY=; b=wkEJOdOhZniAkKAyilhCJx+qIr eS2MOdFTrNVIlslg16aUSL4wN/IliJFpOhVjhxZJnC1xZA802UlE5p5znhumpaaVehMAuVbt9e8tx ly0H4oV3jAczobn7jZ7P5iE0VO3dF3MDzNQeeJ2LJe7szEQuYHdtM4JawT4MCj6nI3UQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] gnttab: remove guest_physmap_remove_page() call from gnttab_map_frame() Message-Id: Date: Tue, 07 Dec 2021 01:26:44 +0000 commit 1b78d4c63687fbcd0baacb13a7bd97605ffe3b88 Author: Jan Beulich AuthorDate: Fri Dec 3 13:54:28 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 3 13:54:28 2021 +0100 gnttab: remove guest_physmap_remove_page() call from gnttab_map_frame() Without holding appropriate locks, attempting to remove a prior mapping of the underlying page is pointless, as the same (or another) mapping could be re-established by a parallel request on another vCPU. Move the code to Arm's gnttab_set_frame_gfn(); it cannot be dropped there since xenmem_add_to_physmap_one() doesn't call it either (unlike on x86). Of course this new placement doesn't improve things in any way as far as the security of grant status frame mappings goes (see XSA-379). Proper locking would be needed here to allow status frames to be mapped securely. In turn this then requires replacing the other use in gnttab_unpopulate_status_frames(), which yet in turn requires adjusting x86's gnttab_set_frame_gfn(). Note that with proper locking inside guest_physmap_remove_page() combined with checking the GFN's mapping there against the passed in MFN, there then is no issue with the involved multiple gnttab_set_frame_gfn()-s potentially returning varying values (due to a racing XENMAPSPACE_grant_table request). This, as a side effect, does away with gnttab_map_frame() having a local variable "gfn" which shadows a function parameter of the same name. Together with XSA-379 this points out that XSA-255's addition to gnttab_map_frame() was really useless. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Acked-by: Julien Grall --- xen/common/grant_table.c | 26 +++++++++++--------------- xen/include/asm-arm/grant_table.h | 16 +++++++++++----- xen/include/asm-x86/grant_table.h | 7 ++++++- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 012a74455b..0262f2c48a 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -93,7 +93,7 @@ struct grant_table { struct radix_tree_root maptrack_tree; /* Domain to which this struct grant_table belongs. */ - const struct domain *domain; + struct domain *domain; struct grant_table_arch arch; }; @@ -1796,8 +1796,8 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) { int rc = gfn_eq(gfn, INVALID_GFN) ? 0 - : guest_physmap_remove_page(d, gfn, - page_to_mfn(pg), 0); + : gnttab_set_frame_gfn(gt, true, i, INVALID_GFN, + page_to_mfn(pg)); if ( rc ) { @@ -1807,7 +1807,6 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) domain_crash(d); return rc; } - gnttab_set_frame_gfn(gt, true, i, INVALID_GFN); } BUG_ON(page_get_owner(pg) != d); @@ -4150,6 +4149,9 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, mfn_t *mfn) struct grant_table *gt = d->grant_table; bool status = false; + if ( gfn_eq(gfn, INVALID_GFN) ) + return -EINVAL; + grant_write_lock(gt); if ( evaluate_nospec(gt->gt_version == 2) && (idx & XENMAPIDX_grant_table_status) ) @@ -4162,24 +4164,18 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, mfn_t *mfn) else rc = gnttab_get_shared_frame_mfn(d, idx, mfn); - if ( !rc && paging_mode_translate(d) ) - { - gfn_t gfn = gnttab_get_frame_gfn(gt, status, idx); - - if ( !gfn_eq(gfn, INVALID_GFN) ) - rc = guest_physmap_remove_page(d, gfn, *mfn, 0); - } - if ( !rc ) { + struct page_info *pg = mfn_to_page(*mfn); + /* * Make sure gnttab_unpopulate_status_frames() won't (successfully) * free the page until our caller has completed its operation. */ - if ( get_page(mfn_to_page(*mfn), d) ) - gnttab_set_frame_gfn(gt, status, idx, gfn); - else + if ( !get_page(pg, d) ) rc = -EBUSY; + else if ( (rc = gnttab_set_frame_gfn(gt, status, idx, gfn, *mfn)) ) + put_page(pg); } grant_write_unlock(gt); diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 0ce77f9a1c..d31a4d6805 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -71,11 +71,17 @@ int replace_grant_host_mapping(unsigned long gpaddr, mfn_t mfn, XFREE((gt)->arch.status_gfn); \ } while ( 0 ) -#define gnttab_set_frame_gfn(gt, st, idx, gfn) \ - do { \ - ((st) ? (gt)->arch.status_gfn : (gt)->arch.shared_gfn)[idx] = \ - (gfn); \ - } while ( 0 ) +#define gnttab_set_frame_gfn(gt, st, idx, gfn, mfn) \ + ({ \ + int rc_ = 0; \ + gfn_t ogfn = gnttab_get_frame_gfn(gt, st, idx); \ + if ( gfn_eq(ogfn, INVALID_GFN) || gfn_eq(ogfn, gfn) || \ + (rc_ = guest_physmap_remove_page((gt)->domain, ogfn, mfn, \ + 0)) == 0 ) \ + ((st) ? (gt)->arch.status_gfn \ + : (gt)->arch.shared_gfn)[idx] = (gfn); \ + rc_; \ + }) #define gnttab_get_frame_gfn(gt, st, idx) ({ \ (st) ? gnttab_status_gfn(NULL, gt, idx) \ diff --git a/xen/include/asm-x86/grant_table.h b/xen/include/asm-x86/grant_table.h index 84e32960c0..a8a21439a4 100644 --- a/xen/include/asm-x86/grant_table.h +++ b/xen/include/asm-x86/grant_table.h @@ -37,7 +37,12 @@ static inline int replace_grant_host_mapping(uint64_t addr, mfn_t frame, #define gnttab_init_arch(gt) 0 #define gnttab_destroy_arch(gt) do {} while ( 0 ) -#define gnttab_set_frame_gfn(gt, st, idx, gfn) do {} while ( 0 ) +#define gnttab_set_frame_gfn(gt, st, idx, gfn, mfn) \ + (gfn_eq(gfn, INVALID_GFN) \ + ? guest_physmap_remove_page((gt)->domain, \ + gnttab_get_frame_gfn(gt, st, idx), \ + mfn, 0) \ + : 0 /* Handled in add_to_physmap_one(). */) #define gnttab_get_frame_gfn(gt, st, idx) ({ \ mfn_t mfn_ = (st) ? gnttab_status_mfn(gt, idx) \ : gnttab_shared_mfn(gt, idx); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:26:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:26:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240456.417026 (Exim 4.92) (envelope-from ) id 1muPFw-0005J8-BE; Tue, 07 Dec 2021 01:26:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240456.417026; Tue, 07 Dec 2021 01:26:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFw-0005Iz-84; Tue, 07 Dec 2021 01:26:56 +0000 Received: by outflank-mailman (input) for mailman id 240456; Tue, 07 Dec 2021 01:26:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFv-0005Ie-07 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPFu-0005Y3-Vi for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPFu-0008Vl-Us for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:26:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=l8z5p4xDMl65g2I91aPD/0CPO9tOibrNVstn3GKr+po=; b=J5d0flZJgDdzs5kZ0unLzWblf3 b7F7ZxoeDeK/e+l5BVunAgfHF3Z8y4brAW6FnNxiIiJY6Qr0Vh9zDZbXLaBPXObzViJ9cQ8N6QpIl RWYkBx5f0QfJNiur57rOGaUJsGX4HhScCji2GEXSS8DPTIKrMSM9kJYiLYPDG/3zUy7o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE Message-Id: Date: Tue, 07 Dec 2021 01:26:54 +0000 commit 7cfe450be3f590b8c65d52a3e513d47cdd07bf44 Author: Oleksandr Andrushchenko AuthorDate: Wed Nov 24 09:59:36 2021 +0200 Commit: Julien Grall CommitDate: Fri Dec 3 12:59:18 2021 +0000 xen/arm: rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE To better reflect the nature of the device type and not to make any confusion rename DEVICE_PCI to DEVICE_PCI_HOSTBRIDGE which it really is. Suggested-by: Julien Grall Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Jiamei xie Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- xen/arch/arm/pci/pci.c | 2 +- xen/include/asm-arm/device.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index 33457fbe96..46de6e43cc 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -32,7 +32,7 @@ static int __init pci_host_generic_probe(struct dt_device_node *dev, return pci_host_common_probe(dev, &pci_generic_ecam_ops); } -DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI) +DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) .dt_match = gen_pci_dt_match, .init = pci_host_generic_probe, DT_DEVICE_END diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 61a9807d3d..516982bca8 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -49,7 +49,7 @@ static int __init pci_host_generic_probe(struct dt_device_node *dev, return pci_host_common_probe(dev, &nwl_pcie_ops); } -DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI) +DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE) .dt_match = nwl_pcie_dt_match, .init = pci_host_generic_probe, DT_DEVICE_END diff --git a/xen/arch/arm/pci/pci.c b/xen/arch/arm/pci/pci.c index 082c14e127..78b97beaef 100644 --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -46,7 +46,7 @@ static int __init dt_pci_init(void) dt_for_each_device_node(dt_host, np) { - rc = device_init(np, DEVICE_PCI, NULL); + rc = device_init(np, DEVICE_PCI_HOSTBRIDGE, NULL); /* * Ignore the following error codes: * - EBADF: Indicate the current device is not a pci device. diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 7bf0405603..b5d451e087 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -34,7 +34,7 @@ enum device_class DEVICE_SERIAL, DEVICE_IOMMU, DEVICE_GIC, - DEVICE_PCI, + DEVICE_PCI_HOSTBRIDGE, /* Use for error */ DEVICE_UNKNOWN, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:27:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:27:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240457.417030 (Exim 4.92) (envelope-from ) id 1muPG6-0005Qk-Do; Tue, 07 Dec 2021 01:27:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240457.417030; Tue, 07 Dec 2021 01:27:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPG6-0005Qc-Av; Tue, 07 Dec 2021 01:27:06 +0000 Received: by outflank-mailman (input) for mailman id 240457; Tue, 07 Dec 2021 01:27:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPG5-0005Q1-3Q for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPG5-0005Ya-2X for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPG5-0008WP-1n for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HQLOM4UBgjXHJfY3sf7KGLlVCg4NXylI1l51pff4MCg=; b=ThcfW1ziZ2ybgLJgIbZMaTgW/x 7GxeYSmKUskBGYnoHroASVWVpYbweZxvC315XP3XM0VtKXMpfcrUnWZc93B9SjaxfZMJVe90n7cyy RowcbuwD0bgduaTT5Tqka/ZJwGcpMVzxTZfa+i93yxtKYhv/QdlxdZibnEjuJzamqlxQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: do not use void pointer in pci_host_common_probe Message-Id: Date: Tue, 07 Dec 2021 01:27:05 +0000 commit 7b57956b20d90f47dafb7ba1eb52d23e42efd786 Author: Oleksandr Andrushchenko AuthorDate: Wed Nov 24 09:59:42 2021 +0200 Commit: Julien Grall CommitDate: Fri Dec 3 12:59:18 2021 +0000 xen/arm: do not use void pointer in pci_host_common_probe There is no reason to use void pointer while passing ECAM ops to the pci_host_common_probe function as it is anyway casted to struct pci_ecam_ops inside. For that reason remove the void pointer and pass struct pci_ecam_ops pointer as is. Signed-off-by: Oleksandr Andrushchenko Acked-by: Julien Grall Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/pci/ecam.c | 4 ++-- xen/arch/arm/pci/pci-host-common.c | 6 ++---- xen/include/asm-arm/pci.h | 5 +++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c index 602d00799c..2855dea213 100644 --- a/xen/arch/arm/pci/ecam.c +++ b/xen/arch/arm/pci/ecam.c @@ -24,8 +24,8 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where) { const struct pci_config_window *cfg = bridge->cfg; - struct pci_ecam_ops *ops = - container_of(bridge->ops, struct pci_ecam_ops, pci_ops); + const struct pci_ecam_ops *ops = + container_of(bridge->ops, const struct pci_ecam_ops, pci_ops); unsigned int devfn_shift = ops->bus_shift - 8; void __iomem *base; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index cdeb3a283a..ae79a0c19b 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -192,18 +192,16 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -int pci_host_common_probe(struct dt_device_node *dev, const void *data) +int pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; - struct pci_ecam_ops *ops; int err; if ( dt_device_for_passthrough(dev) ) return 0; - ops = (struct pci_ecam_ops *) data; - bridge = pci_alloc_host_bridge(); if ( !bridge ) return -ENOMEM; diff --git a/xen/include/asm-arm/pci.h b/xen/include/asm-arm/pci.h index 81273e0d87..9736d6816d 100644 --- a/xen/include/asm-arm/pci.h +++ b/xen/include/asm-arm/pci.h @@ -63,7 +63,7 @@ struct pci_host_bridge { struct list_head node; /* Node in list of host bridges */ uint16_t segment; /* Segment number */ struct pci_config_window* cfg; /* Pointer to the bridge config window */ - struct pci_ops *ops; + const struct pci_ops *ops; }; struct pci_ops { @@ -89,7 +89,8 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -int pci_host_common_probe(struct dt_device_node *dev, const void *data); +int pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:27:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:27:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240458.417035 (Exim 4.92) (envelope-from ) id 1muPGG-0005WZ-FV; Tue, 07 Dec 2021 01:27:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240458.417035; Tue, 07 Dec 2021 01:27:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGG-0005WP-CN; Tue, 07 Dec 2021 01:27:16 +0000 Received: by outflank-mailman (input) for mailman id 240458; Tue, 07 Dec 2021 01:27:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGF-0005W2-6H for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGF-0005Z0-5g for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPGF-00005c-4m for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RX6yez5vz9gSgp+dt24UYClJox7/YuYRxvO/VRkeBrQ=; b=G3NbgoahQaxErZeLy1av6pZuVQ 0567/S5Yz863TQPJxtRxSa8/1BdaskUXHwJrpLiJXCkNHPTYdBIHrK7VGhXRFsmEQUltLUef8eNzC 6QwTrOUQ9i+6B/Dhe5GKWJfWEent+v5KN2K1r27ITMTFJMLUrFIL5vTriGQW+UnVdHRs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: Switch xsm_ops to __alt_call_maybe_initdata Message-Id: Date: Tue, 07 Dec 2021 01:27:15 +0000 commit d6385ea15f7089ca6fb554249f6717c69016c8bd Author: Andrew Cooper AuthorDate: Wed Dec 1 10:34:00 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Dec 3 15:52:24 2021 +0000 xsm: Switch xsm_ops to __alt_call_maybe_initdata This should have been done at the point xsm_ops became fully altcall'd. This puts the xsm_ops structure in .init on architectures where it is no longer referenced at runtime. Fixes: d868feb95a8a ("xen/xsm: Complete altcall conversion of xsm interface") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis Reviewed-by: Daniel P. Smith --- xen/xsm/xsm_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 21fffbcb41..14d98f1f72 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -30,7 +30,7 @@ #define XSM_FRAMEWORK_VERSION "1.0.1" -struct xsm_ops __read_mostly xsm_ops; +struct xsm_ops __alt_call_maybe_initdata xsm_ops; enum xsm_ops_state { XSM_OPS_UNREGISTERED, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:27:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:27:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240459.417038 (Exim 4.92) (envelope-from ) id 1muPGQ-0005eM-H3; Tue, 07 Dec 2021 01:27:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240459.417038; Tue, 07 Dec 2021 01:27:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGQ-0005eE-Dk; Tue, 07 Dec 2021 01:27:26 +0000 Received: by outflank-mailman (input) for mailman id 240459; Tue, 07 Dec 2021 01:27:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGP-0005bu-Ax for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGP-0005ZC-8e for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPGP-00007h-7w for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BA6ml+l3Qux3ZJ7A9g3Pq89fsn9xBfSEcdZh7IufHEM=; b=bCJODJfnKctjXCLsLIIx+KpW2f 35Bh4YVkg522KlPEeCkVGvr+o3ZRQvsMCW+4zWFwTo3eW/lBiOe4qkrnKyp1IMtMumFjLjYLPOCXc pOhUYIVfRhKKrVHQZ100Y03t0Ak60D9MbHTzy/gRZXAa/yM9WA5Cbb1NZDXeeBihNT6o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xsm: Drop extern of non-existent variable Message-Id: Date: Tue, 07 Dec 2021 01:27:25 +0000 commit 5f4f6c51045b1ce311f21285653cd1516ce8c419 Author: Andrew Cooper AuthorDate: Wed Dec 1 10:35:20 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Dec 3 15:52:24 2021 +0000 xsm: Drop extern of non-existent variable dummy_xsm_ops was dropped as part of organising XSM to be altcall compatible, but the extern was accidentally left around. A later change reintroduced dummy_ops which is logically the same thing, but is private to xsm/dummy.c Fixes: 164a0b9653f4 ("xsm: refactor xsm_ops handling") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis Reviewed-by: Daniel P. Smith --- xen/include/xsm/xsm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 5aa4dd588d..3e2b7fe3db 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -789,8 +789,6 @@ int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size); bool has_xsm_magic(paddr_t); #endif -extern struct xsm_ops dummy_xsm_ops; - void xsm_fixup_ops(struct xsm_ops *ops); #ifdef CONFIG_XSM_FLASK -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 01:27:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 01:27:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240460.417042 (Exim 4.92) (envelope-from ) id 1muPGa-0005pl-IN; Tue, 07 Dec 2021 01:27:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240460.417042; Tue, 07 Dec 2021 01:27:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGa-0005pd-FG; Tue, 07 Dec 2021 01:27:36 +0000 Received: by outflank-mailman (input) for mailman id 240460; Tue, 07 Dec 2021 01:27:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGZ-0005ou-Cx for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muPGZ-0005ZH-CI for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muPGZ-00008H-BT for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 01:27:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7aSUd+Th61Va1SYSecDAQG0IB3DAwixiBkBPJoofZ9Y=; b=TzWlrpBY7zVc2bQb5J9Bl0dCSO ftuZtXeTBrDaFD0G+H9CHLXXP/5JS10kyBppZhUok8PG1CT0bSpnci/UGR3CNR7EqOkzlHHSvJYjf Yf5Nyacq+Th7Y8VwKbqbtT+6SdLB4pq+0pC19P0/+KmgWxw4m/iMPto1gXSfM3er7Oa4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPMU: Drop supported parameter from the wrmsr path Message-Id: Date: Tue, 07 Dec 2021 01:27:35 +0000 commit ea0c08bc77fe7bd7e4e65c648e17752e91912d01 Author: Andrew Cooper AuthorDate: Tue Nov 30 21:28:48 2021 +0000 Commit: Andrew Cooper CommitDate: Fri Dec 3 17:22:44 2021 +0000 x86/vPMU: Drop supported parameter from the wrmsr path The supported parameter was added in 2d9b91f1aeaa ("VMX/vPMU: fix DebugCtl MSR handling"). It unfortunately laid the groundwork for XSA-269, and the fix 2a8a8e99feb9 ("x86/vtx: Fix the checking for unknown/invalid MSR_DEBUGCTL bits") totally rewrote MSR_DEBUGCTL handling. Strip out the parameter again. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/vpmu.c | 5 ++--- xen/arch/x86/cpu/vpmu_amd.c | 5 +---- xen/arch/x86/cpu/vpmu_intel.c | 5 +---- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/pv/emul-priv-op.c | 2 +- xen/include/asm-x86/vpmu.h | 13 +++++-------- 7 files changed, 12 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 7fd69a2a58..8ec4547bed 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -116,8 +116,7 @@ void vpmu_lvtpc_update(uint32_t val) apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); } -int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, - uint64_t supported, bool_t is_write) +int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, bool is_write) { struct vcpu *curr = current; struct vpmu_struct *vpmu; @@ -137,7 +136,7 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, goto nop; if ( is_write ) - ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content, supported); + ret = alternative_call(vpmu_ops.do_wrmsr, msr, *msr_content); else ret = alternative_call(vpmu_ops.do_rdmsr, msr, msr_content); diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 5bb4227662..25ad4ecf48 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -348,16 +348,13 @@ static void context_update(unsigned int msr, u64 msr_content) } } -static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, - uint64_t supported) +static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) { struct vcpu *v = current; struct vpmu_struct *vpmu = vcpu_vpmu(v); unsigned int idx = 0; int type = get_pmu_reg_type(msr, &idx); - ASSERT(!supported); - if ( (type == MSR_TYPE_CTRL ) && ((msr_content & CTRL_RSVD_MASK) != ctrl_rsvd[idx]) ) return -EINVAL; diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index c44e81c756..22dd4469d9 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -522,8 +522,7 @@ static int core2_vpmu_msr_common_check(u32 msr_index, int *type, int *index) return 1; } -static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, - uint64_t supported) +static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) { int i, tmp; int type = -1, index = -1; @@ -535,8 +534,6 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, if ( !core2_vpmu_msr_common_check(msr, &type, &index) ) return -EINVAL; - ASSERT(!supported); - if ( (type == MSR_TYPE_COUNTER) && (msr_content & fixed_counters_mask) ) /* Writing unsupported bits to a fixed counter */ return -EINVAL; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index f0e10dec04..fae39c4b4c 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2113,7 +2113,7 @@ static int svm_msr_write_intercept(unsigned int msr, uint64_t msr_content) case MSR_AMD_FAM15H_EVNTSEL3: case MSR_AMD_FAM15H_EVNTSEL4: case MSR_AMD_FAM15H_EVNTSEL5: - if ( vpmu_do_wrmsr(msr, msr_content, 0) ) + if ( vpmu_do_wrmsr(msr, msr_content) ) goto gpf; break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 37c31c08b9..a7a0d66234 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3487,7 +3487,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) case MSR_CORE_PERF_FIXED_CTR_CTRL...MSR_CORE_PERF_GLOBAL_OVF_CTRL: case MSR_IA32_PEBS_ENABLE: case MSR_IA32_DS_AREA: - if ( vpmu_do_wrmsr(msr, msr_content, 0) ) + if ( vpmu_do_wrmsr(msr, msr_content) ) goto gp_fault; break; diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 7f4279a051..8ba65178e9 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1163,7 +1163,7 @@ static int write_msr(unsigned int reg, uint64_t val, !is_hardware_domain(currd) ) return X86EMUL_OKAY; - if ( vpmu_do_wrmsr(reg, val, 0) ) + if ( vpmu_do_wrmsr(reg, val) ) break; return X86EMUL_OKAY; } diff --git a/xen/include/asm-x86/vpmu.h b/xen/include/asm-x86/vpmu.h index 8cfa2cf599..e5709bd44a 100644 --- a/xen/include/asm-x86/vpmu.h +++ b/xen/include/asm-x86/vpmu.h @@ -40,8 +40,7 @@ /* Arch specific operations shared by all vpmus */ struct arch_vpmu_ops { int (*initialise)(struct vcpu *v); - int (*do_wrmsr)(unsigned int msr, uint64_t msr_content, - uint64_t supported); + int (*do_wrmsr)(unsigned int msr, uint64_t msr_content); int (*do_rdmsr)(unsigned int msr, uint64_t *msr_content); int (*do_interrupt)(struct cpu_user_regs *regs); void (*arch_vpmu_destroy)(struct vcpu *v); @@ -104,8 +103,7 @@ static inline bool_t vpmu_are_all_set(const struct vpmu_struct *vpmu, } void vpmu_lvtpc_update(uint32_t val); -int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, - uint64_t supported, bool_t is_write); +int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, bool is_write); void vpmu_do_interrupt(struct cpu_user_regs *regs); void vpmu_initialise(struct vcpu *v); void vpmu_destroy(struct vcpu *v); @@ -113,14 +111,13 @@ void vpmu_save(struct vcpu *v); int vpmu_load(struct vcpu *v, bool_t from_guest); void vpmu_dump(struct vcpu *v); -static inline int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, - uint64_t supported) +static inline int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) { - return vpmu_do_msr(msr, &msr_content, supported, 1); + return vpmu_do_msr(msr, &msr_content, true /* write */); } static inline int vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content) { - return vpmu_do_msr(msr, msr_content, 0, 0); + return vpmu_do_msr(msr, msr_content, false /* read */); } extern unsigned int vpmu_mode; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 03:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 03:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240508.417062 (Exim 4.92) (envelope-from ) id 1muRDz-0007Sc-Jt; Tue, 07 Dec 2021 03:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240508.417062; Tue, 07 Dec 2021 03:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muRDz-0007SU-GG; Tue, 07 Dec 2021 03:33:03 +0000 Received: by outflank-mailman (input) for mailman id 240508; Tue, 07 Dec 2021 03:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muRDy-0007SO-BK for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 03:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muRDy-00084D-8m for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 03:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muRDy-000832-7g for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 03:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sKSQDAIl94UG32w2qJdJ4mN2ZsUf35jqoqaug0KB6Xk=; b=u0FxoFKCPjFW83PSoTAmrYp+UN Nh0APAAJWsOIc0AAaRTqAMk70pn4xurCAg6ZeBzHCqqUxDkmyM+i2mk8O9ryvvdHw18iLKbN44NHG JFbW1d6rtr3lOYMc2a0WNaQqP7Bw0p0QXJEYtLN5c8u3i6DpkpfB096UuwYKGX7vpdB4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.12] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Tue, 07 Dec 2021 03:33:02 +0000 commit b9aa1635b38a7bc092d60123b87c545f25db31e4 Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:29:33 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson (cherry picked from commit c623a84c2a4fda1cd25f5347a6298706218eb5fb) (cherry picked from commit c4cf5388652e8434652e30c73aa79635b4253675) (cherry picked from commit d0e2c2762b981abd984af66a844ac12d8bf8f813) --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a084275e79..adae750e45 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -58,7 +58,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 07:55:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 07:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240655.417337 (Exim 4.92) (envelope-from ) id 1muVJX-00070x-2F; Tue, 07 Dec 2021 07:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240655.417337; Tue, 07 Dec 2021 07:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muVJW-00070k-VB; Tue, 07 Dec 2021 07:55:02 +0000 Received: by outflank-mailman (input) for mailman id 240655; Tue, 07 Dec 2021 07:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muVJV-0006z3-St for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 07:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muVJV-0004fE-S0 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 07:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muVJV-0008N7-R9 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 07:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4fDi+BQTq66G1tATQ7NTndSkSnK/h5GE+IFmLt4Cb2U=; b=wTdlAclXCIMRy/xMMWgcFLvn8+ lNEqBnMX5duqqAciLRv8O6i0MZT7k/AT6XGx/MvI1rqTExbObncdQUROdROBqA+bJwHrOCW1OGACi 4XQ6hPioLMdE3/4qhZi7iyAbhtjqvxBL8ukB+BRcT+0jYyMIEpRdximG+3rA4BGiCZDE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.13] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Tue, 07 Dec 2021 07:55:01 +0000 commit d0e2c2762b981abd984af66a844ac12d8bf8f813 Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:29:04 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson (cherry picked from commit c623a84c2a4fda1cd25f5347a6298706218eb5fb) (cherry picked from commit c4cf5388652e8434652e30c73aa79635b4253675) --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 806e02b4f8..bdd885ddff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,7 +60,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 11:11:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 11:11:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.240927.417714 (Exim 4.92) (envelope-from ) id 1muYND-0006wN-7z; Tue, 07 Dec 2021 11:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 240927.417714; Tue, 07 Dec 2021 11:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muYND-0006wF-4m; Tue, 07 Dec 2021 11:11:03 +0000 Received: by outflank-mailman (input) for mailman id 240927; Tue, 07 Dec 2021 11:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muYNC-0006vu-93 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 11:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muYNC-0000Kv-86 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 11:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muYNC-0006FV-76 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 11:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=M4zQL3sYk8NQ0paKI0JTSoiujv3Ql6CZsLMR3Q6xEhk=; b=PCk+zYUmCvagRasjlvoGK4OEaH r203mebeoyGa+D/4Lm/FKWYiLUbmW6Ogo3oPvxpDK0/Rpfx7qpLI0Y6bXdd4xwXKUz6dZonbP6rvZ QkU5Am2b8sjDG6ir5fd7yb8ucSojV1zVbYyp6y4o19fgTu34GRxBW8eFDlHEbOvc4G3U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Tue, 07 Dec 2021 11:11:02 +0000 commit c4cf5388652e8434652e30c73aa79635b4253675 Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:27:49 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson (cherry picked from commit c623a84c2a4fda1cd25f5347a6298706218eb5fb) --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4b72a6adae..04eb361222 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,7 +60,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 17:33:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 17:33:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.241740.418204 (Exim 4.92) (envelope-from ) id 1mueKt-00075g-Nu; Tue, 07 Dec 2021 17:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 241740.418204; Tue, 07 Dec 2021 17:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mueKt-00075Y-L5; Tue, 07 Dec 2021 17:33:03 +0000 Received: by outflank-mailman (input) for mailman id 241740; Tue, 07 Dec 2021 17:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mueKs-00075Q-9s for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 17:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mueKs-0007VG-93 for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 17:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mueKs-0001X9-7v for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 17:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mBsHACUN8OJI2e827HN6XjsmM4y8cXpZprajbKOhze8=; b=UKwIDp5P39wOOte/xGGATHtMOR 8m12M2JlN0pYp2rGQhbE9Hl99h80hs5+IYa5Xvet4HNlosQYnVVCra129QXMgFDKoWBsdFirb63nn S9rc9L5UOsbgBMFp+GPLQePFCq0QRxJPqgIdE1tRKuXcZlQkH7egxlFxM3XsV7vK3xeI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] MAINTAINERS: Resign from tools stable branch maintainership Message-Id: Date: Tue, 07 Dec 2021 17:33:02 +0000 commit c623a84c2a4fda1cd25f5347a6298706218eb5fb Author: Ian Jackson AuthorDate: Mon Dec 6 14:40:24 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 14:41:35 2021 +0000 MAINTAINERS: Resign from tools stable branch maintainership Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 85f660c30f..f4c08d0b19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,7 +60,7 @@ The maintainer for this branch is: Tools backport requests should also be copied to: - Ian Jackson + TODO - Loooking for new tools stable maintainer Unstable Subsystem Maintainers -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 19:55:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 19:55:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.241783.418262 (Exim 4.92) (envelope-from ) id 1mugYI-0002QE-Vh; Tue, 07 Dec 2021 19:55:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 241783.418262; Tue, 07 Dec 2021 19:55:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYI-0002Q6-Sl; Tue, 07 Dec 2021 19:55:02 +0000 Received: by outflank-mailman (input) for mailman id 241783; Tue, 07 Dec 2021 19:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYH-0002Q0-JT for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYH-0001S4-Ia for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mugYH-0002MV-Hj for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lQ4CUTKb3bFZRMX5Xgs8akvGIvAJTe7un97pI1ZJqiY=; b=OAJ4YdWT/buN0W3xFMUELSV+5J qc0Pl/IV2/LtQR6k/ynVOG6jMoia1L7y7S1KG8SjC8I4ixNQ0vG8YYJNHOtGYL0b5vHArGl5oxcbR w7d44+jO2lxr/mOlroznWE0CH8vA/iZrwsbVk4khA89WApZ1hzQUIi8p9fpC/lZwxZss=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] xen/Makefile: Set version to reopen as 4.16 stable branch Message-Id: Date: Tue, 07 Dec 2021 19:55:01 +0000 commit d9faedccd9b70948a7eea76a21daf5814ae44dfb Author: Ian Jackson AuthorDate: Mon Dec 6 15:45:41 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:46:27 2021 +0000 xen/Makefile: Set version to reopen as 4.16 stable branch Signed-off-by: Ian Jackson --- xen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Makefile b/xen/Makefile index dfb0efcc26..e3e281177c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 16 -export XEN_EXTRAVERSION ?= .0$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 19:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 19:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.241784.418267 (Exim 4.92) (envelope-from ) id 1mugYT-0002SI-0y; Tue, 07 Dec 2021 19:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 241784.418267; Tue, 07 Dec 2021 19:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYS-0002SA-UJ; Tue, 07 Dec 2021 19:55:12 +0000 Received: by outflank-mailman (input) for mailman id 241784; Tue, 07 Dec 2021 19:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYR-0002S2-ML for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYR-0001SC-La for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mugYR-0002NC-Kt for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=H4quRwK6I4WaIQxx9lCua7SdQYgXugfSrvCREOtIuew=; b=21IPh7dJ4+aXg78JVyj2WRqOuV 9Tr/6Yaxti+BEcVlXpFc2QoIY72k+5XIU5W+b5p1YIEtmJGf24929iRIsfcrG9wtOnF+VElioj1ds ++Hr9UuZGhRdG8TDCU8zXnIymrTBe+eXT+KB06tLMOyEIOrF1Wq7n0QZfWkrG5r9iPr8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] MAINTAINERS: Update for this being the 4.16 stable branch Message-Id: Date: Tue, 07 Dec 2021 19:55:11 +0000 commit 5974b00dd62ad855af881df23d4b1a1c86ebdb88 Author: Ian Jackson AuthorDate: Mon Dec 6 15:44:16 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:46:27 2021 +0000 MAINTAINERS: Update for this being the 4.16 stable branch Signed-off-by: Ian Jackson --- MAINTAINERS | 92 ++++++------------------------------------------------------- 1 file changed, 9 insertions(+), 83 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4956db1011..fab396b4e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -54,6 +54,15 @@ list. Remember to copy the appropriate stable branch maintainer who will be listed in this section of the MAINTAINERS file in the appropriate branch. +The maintainer for this branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + TODO - Loooking for new tools stable maintainer + + Unstable Subsystem Maintainers ============================== @@ -104,89 +113,6 @@ Descriptions of section entries: xen-maintainers- - Check-in policy - =============== - -In order for a patch to be checked in, in general, several conditions -must be met: - -1. In order to get a change to a given file committed, it must have - the approval of at least one maintainer of that file. - - A patch of course needs Acks from the maintainers of each file that - it changes; so a patch which changes xen/arch/x86/traps.c, - xen/arch/x86/mm/p2m.c, and xen/arch/x86/mm/shadow/multi.c would - require an Ack from each of the three sets of maintainers. - - See below for rules on nested maintainership. - -2. It must have appropriate approval from someone other than the - submitter. This can be either: - - a. An Acked-by from a maintainer of the code being touched (a - co-maintainer if available, or a more general level maintainer if - not available; see the secton on nested maintainership) - - b. A Reviewed-by by anyone of suitable stature in the community - -3. Sufficient time must have been given for anyone to respond. This - depends in large part upon the urgency and nature of the patch. - For a straightforward uncontroversial patch, a day or two may be - sufficient; for a controversial patch, a week or two may be better. - -4. There must be no "open" objections. - -In a case where one person submits a patch and a maintainer gives an -Ack, the Ack stands in for both the approval requirement (#1) and the -Acked-by-non-submitter requirement (#2). - -In a case where a maintainer themselves submits a patch, the -Signed-off-by meets the approval requirement (#1); so a Review -from anyone in the community suffices for requirement #2. - -Before a maintainer checks in their own patch with another community -member's R-b but no co-maintainer Ack, it is especially important to -give their co-maintainer opportunity to give feedback, perhaps -declaring their intention to check it in without their co-maintainers -ack a day before doing so. - -Maintainers may choose to override non-maintainer objections in the -case that consensus can't be reached. - -As always, no policy can cover all possible situations. In -exceptional circumstances, committers may commit a patch in absence of -one or more of the above requirements, if they are reasonably -confident that the other maintainers will approve of their decision in -retrospect. - - The meaning of nesting - ====================== - -Many maintainership areas are "nested": for example, there are entries -for xen/arch/x86 as well as xen/arch/x86/mm, and even -xen/arch/x86/mm/shadow; and there is a section at the end called "THE -REST" which lists all committers. The meaning of nesting is that: - -1. Under normal circumstances, the Ack of the most specific maintainer -is both necessary and sufficient to get a change to a given file -committed. So a change to xen/arch/x86/mm/shadow/multi.c requires the -the Ack of the xen/arch/x86/mm/shadow maintainer for that part of the -patch, but would not require the Ack of the xen/arch/x86 maintainer or -the xen/arch/x86/mm maintainer. - -2. In unusual circumstances, a more general maintainer's Ack can stand -in for or even overrule a specific maintainer's Ack. Unusual -circumstances might include: - - The patch is fixing a high-priority issue causing immediate pain, - and the more specific maintainer is not available. - - The more specific maintainer has not responded either to the - original patch, nor to "pings", within a reasonable amount of time. - - The more general maintainer wants to overrule the more specific - maintainer on some issue. (This should be exceptional.) - - In the case of a disagreement between maintainers, THE REST can - settle the matter by majority vote. (This should be very exceptional - indeed.) - Maintainers List (try to look for most precise areas first) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Dec 07 19:55:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 07 Dec 2021 19:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.241785.418271 (Exim 4.92) (envelope-from ) id 1mugYd-0002VT-2N; Tue, 07 Dec 2021 19:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 241785.418271; Tue, 07 Dec 2021 19:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYc-0002VL-Vl; Tue, 07 Dec 2021 19:55:22 +0000 Received: by outflank-mailman (input) for mailman id 241785; Tue, 07 Dec 2021 19:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYb-0002Uz-PC for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mugYb-0001Si-OS for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mugYb-0002Nl-Ni for xen-changelog@lists.xenproject.org; Tue, 07 Dec 2021 19:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7cILJDTxgHTo4R6iRjli1k9hSqNA7GCMKtd+AmZuGGI=; b=QuqdpR+yfYCTdFuwfF/WJooUeM QmVF+jW8JlUvSMZ3BhNYE2L+Ubia4YzpEaXgik3DrPiKAKQDoMPro0FO4/MwpwcZ5HcCrlKz7+Ghu lXC1KJvvEWe5vlibnTw30C9/P/6CLkFLdBLggNep2DLcv6sJ40UfxbYzntsI9UJ4qfqQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] REAMDE: trim over-long lines around figlet Message-Id: Date: Tue, 07 Dec 2021 19:55:21 +0000 commit 2dcea9c94c59cf2a9c7ee824a573f7c1b864b5d5 Author: Ian Jackson AuthorDate: Mon Dec 6 15:46:04 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 15:46:27 2021 +0000 REAMDE: trim over-long lines around figlet Signed-off-by: Ian Jackson --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 189c749bb0..6edcf0d5c0 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ -############################################################ +################################## __ __ _ _ _ __ \ \/ /___ _ __ | || | / |/ /_ \ // _ \ '_ \ | || |_ | | '_ \ / \ __/ | | | |__ _|| | (_) | /_/\_\___|_| |_| |_|(_)_|\___/ -############################################################ +################################## https://www.xen.org/ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:00:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242223.418970 (Exim 4.92) (envelope-from ) id 1muvcB-00045U-MM; Wed, 08 Dec 2021 12:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242223.418970; Wed, 08 Dec 2021 12:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcB-000455-IF; Wed, 08 Dec 2021 12:00:03 +0000 Received: by outflank-mailman (input) for mailman id 242223; Wed, 08 Dec 2021 12:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcA-0003wx-Gb for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcA-0004Xp-D4 for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvcA-0005ra-Bg for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8k6PAmrFeC8bnArxbcQC8QCjtyORV4Yyq6RPGJR3ksg=; b=K5ggtos08xItHVozQGrnLMtfKM iCFJsJsqvZrafuF1hpWMyHVpOLyagv9d7MZ3Hgmo0djK3hyIiHYI1Tz4Nc9LXQm9Q9JnMK+wA6WR5 Vy4bU7i7qUC1KMDrxLvrARL8+3KYezjnYqSq/d06mv5yIRZFiv0VXPbGx9vwgQgRWQVE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: defer/avoid paging_mfn_is_dirty() invocation Message-Id: Date: Wed, 08 Dec 2021 12:00:02 +0000 commit b4411416fee92cea6cd7a04bfda95bdf377f631e Author: Jan Beulich AuthorDate: Mon Dec 6 14:10:42 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:10:42 2021 +0100 x86/shadow: defer/avoid paging_mfn_is_dirty() invocation paging_mfn_is_dirty() is moderately expensive, so avoid its use unless its result might actually change anything. This means moving the surrounding if() down below all other checks that can result in clearing _PAGE_RW from sflags, in order to then check whether _PAGE_RW is actually still set there before calling the function. While moving the block of code, fold two if()s and make a few style adjustments. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7b8f4dd13b..be617281fc 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -604,23 +604,6 @@ _sh_propagate(struct vcpu *v, && !(gflags & _PAGE_DIRTY)) ) sflags &= ~_PAGE_RW; - // shadow_mode_log_dirty support - // - // Only allow the guest write access to a page a) on a demand fault, - // or b) if the page is already marked as dirty. - // - // (We handle log-dirty entirely inside the shadow code, without using the - // p2m_ram_logdirty p2m type: only HAP uses that.) - if ( unlikely((level == 1) && shadow_mode_log_dirty(d)) ) - { - if ( mfn_valid(target_mfn) ) { - if ( ft & FETCH_TYPE_WRITE ) - paging_mark_dirty(d, target_mfn); - else if ( !paging_mfn_is_dirty(d, target_mfn) ) - sflags &= ~_PAGE_RW; - } - } - #ifdef CONFIG_HVM if ( unlikely(level == 1) && is_hvm_domain(d) ) { @@ -661,6 +644,25 @@ _sh_propagate(struct vcpu *v, ) ) sflags &= ~_PAGE_RW; + /* + * shadow_mode_log_dirty support + * + * Only allow the guest write access to a page a) on a demand fault, + * or b) if the page is already marked as dirty. + * + * (We handle log-dirty entirely inside the shadow code, without using the + * p2m_ram_logdirty p2m type: only HAP uses that.) + */ + if ( level == 1 && unlikely(shadow_mode_log_dirty(d)) && + mfn_valid(target_mfn) ) + { + if ( ft & FETCH_TYPE_WRITE ) + paging_mark_dirty(d, target_mfn); + else if ( (sflags & _PAGE_RW) && + !paging_mfn_is_dirty(d, target_mfn) ) + sflags &= ~_PAGE_RW; + } + // PV guests in 64-bit mode use two different page tables for user vs // supervisor permissions, making the guest's _PAGE_USER bit irrelevant. // It is always shadowed as present... -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:00:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242224.418974 (Exim 4.92) (envelope-from ) id 1muvcL-0004Y4-Mi; Wed, 08 Dec 2021 12:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242224.418974; Wed, 08 Dec 2021 12:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcL-0004Xw-Jp; Wed, 08 Dec 2021 12:00:13 +0000 Received: by outflank-mailman (input) for mailman id 242224; Wed, 08 Dec 2021 12:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcK-0004Xf-Hh for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcK-0004Xw-Gq for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvcK-0005uR-Fi for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RVV9v0kci89G4j4beP57jqY0HPHcppPsWyvTNvll1oY=; b=AZhmd9m/LVa7H1ziQHWWY13fgf 4ahGBgB5eyVT5gohNVJ/mkNxa8s27HImudC1ENrJjvOazBAW6CraTkKWqV73RYSpkcpFsvp9l1Fb5 xo5tU29bfomJCgSkaL8Q0pbnGq1WwcKs7LV5VcMwUjeBCBIFsRhSrsFHtdvSJseeHv3Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PoD: HVM guests can't pin their pages Message-Id: Date: Wed, 08 Dec 2021 12:00:12 +0000 commit 8553b17cc218046408db0fb96dfe750bce7445b9 Author: Jan Beulich AuthorDate: Mon Dec 6 14:12:09 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:12:09 2021 +0100 x86/PoD: HVM guests can't pin their pages Pinning is a PV concept, used there only for page table pages. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m-pod.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index d8d1a0ce7e..9c4c0caccb 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -271,9 +271,6 @@ p2m_pod_set_cache_target(struct p2m_domain *p2m, unsigned long pod_target, int p goto out; } - if ( test_and_clear_bit(_PGT_pinned, &(page+i)->u.inuse.type_info) ) - put_page_and_type(page + i); - put_page_alloc_ref(page + i); put_page(page + i); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:00:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242226.418977 (Exim 4.92) (envelope-from ) id 1muvcV-0004ar-OE; Wed, 08 Dec 2021 12:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242226.418977; Wed, 08 Dec 2021 12:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcV-0004ak-LL; Wed, 08 Dec 2021 12:00:23 +0000 Received: by outflank-mailman (input) for mailman id 242226; Wed, 08 Dec 2021 12:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcU-0004aS-LN for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcU-0004YD-KW for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvcU-0005vx-Jg for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DnuB0xisUljhBdarwEoQKpAzH0G/vgYRlPnWyuBlOsE=; b=3K7oP82kyA5PVjveKWrRk8KkXz tCYzENYlBvUkwFYCD0h05TmWN+FvMHM6nPnY0jKdOQes6I4IHSbqcJuCc+IuIS0uJqFHUUQeWQsf5 Vzfvf0Ie8ZZADg7WWVIgMOzyWrkjACDZ8BrQ1TSDQIQ3+iL2cwkprMRgYdvciXBRPM8U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/mm: don't open-code p2m_is_pod() Message-Id: Date: Wed, 08 Dec 2021 12:00:22 +0000 commit c80878c3203d6ddb80f6c5ca4f4c83a5fc042ebe Author: Jan Beulich AuthorDate: Mon Dec 6 14:13:03 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:13:03 2021 +0100 x86/mm: don't open-code p2m_is_pod() Replace all comparisons against p2m_populate_on_demand (outside of switch() statements) with the designated predicate. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m-ept.c | 6 +++--- xen/arch/x86/mm/p2m-pod.c | 6 +++--- xen/arch/x86/mm/p2m-pt.c | 11 +++++------ xen/arch/x86/mm/p2m.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 6 +++--- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 1459f66c00..a4f5fc4b0d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -344,7 +344,7 @@ static int ept_next_level(struct p2m_domain *p2m, bool_t read_only, { int rc; - if ( e.sa_p2mt == p2m_populate_on_demand ) + if ( p2m_is_pod(e.sa_p2mt) ) return GUEST_TABLE_POD_PAGE; if ( read_only ) @@ -1071,7 +1071,7 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, index = gfn_remainder >> (i * EPT_TABLE_ORDER); ept_entry = table + index; - if ( ept_entry->sa_p2mt == p2m_populate_on_demand ) + if ( p2m_is_pod(ept_entry->sa_p2mt) ) { if ( !(q & P2M_ALLOC) ) { @@ -1478,7 +1478,7 @@ static void ept_dump_p2m_table(unsigned char key) ept_entry = table + (gfn_remainder >> order); if ( ret != GUEST_TABLE_MAP_FAILED && is_epte_valid(ept_entry) ) { - if ( ept_entry->sa_p2mt == p2m_populate_on_demand ) + if ( p2m_is_pod(ept_entry->sa_p2mt) ) printk("gfn: %13lx order: %2d PoD\n", gfn, order); else printk("gfn: %13lx order: %2d mfn: %13lx %c%c%c %c%c%c\n", diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9c4c0caccb..afee09ab40 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -540,7 +540,7 @@ decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) p2m->get_entry(p2m, gfn_add(gfn, i), &t, &a, 0, &cur_order, NULL); n = 1UL << min(order, cur_order); - if ( t == p2m_populate_on_demand ) + if ( p2m_is_pod(t) ) pod += n; else if ( p2m_is_ram(t) ) ram += n; @@ -615,7 +615,7 @@ decrease_reservation(struct domain *d, gfn_t gfn, unsigned int order) if ( order < cur_order ) cur_order = order; n = 1UL << cur_order; - if ( t == p2m_populate_on_demand ) + if ( p2m_is_pod(t) ) { /* This shouldn't be able to fail */ if ( p2m_set_entry(p2m, gfn_add(gfn, i), INVALID_MFN, cur_order, @@ -1329,7 +1329,7 @@ mark_populate_on_demand(struct domain *d, unsigned long gfn_l, p2m->get_entry(p2m, gfn_add(gfn, i), &ot, &a, 0, &cur_order, NULL); n = 1UL << min(order, cur_order); - if ( ot == p2m_populate_on_demand ) + if ( p2m_is_pod(ot) ) { /* Count how many PoD entries we'll be replacing if successful */ pod_count += n; diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 09c99d78aa..ef3f8e02a4 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -841,7 +841,7 @@ pod_retry_l3: flags = l3e_get_flags(*l3e); if ( !(flags & _PAGE_PRESENT) ) { - if ( p2m_flags_to_type(flags) == p2m_populate_on_demand ) + if ( p2m_is_pod(p2m_flags_to_type(flags)) ) { if ( q & P2M_ALLOC ) { @@ -884,7 +884,7 @@ pod_retry_l2: if ( !(flags & _PAGE_PRESENT) ) { /* PoD: Try to populate a 2-meg chunk */ - if ( p2m_flags_to_type(flags) == p2m_populate_on_demand ) + if ( p2m_is_pod(p2m_flags_to_type(flags)) ) { if ( q & P2M_ALLOC ) { if ( p2m_pod_demand_populate(p2m, gfn_, PAGE_ORDER_2M) ) @@ -923,7 +923,7 @@ pod_retry_l1: if ( !(flags & _PAGE_PRESENT) && !p2m_is_paging(l1t) ) { /* PoD: Try to populate */ - if ( l1t == p2m_populate_on_demand ) + if ( p2m_is_pod(l1t) ) { if ( q & P2M_ALLOC ) { if ( p2m_pod_demand_populate(p2m, gfn_, PAGE_ORDER_4K) ) @@ -1094,8 +1094,7 @@ static long p2m_pt_audit_p2m(struct p2m_domain *p2m) if ( !(l2e_get_flags(l2e[i2]) & _PAGE_PRESENT) ) { if ( (l2e_get_flags(l2e[i2]) & _PAGE_PSE) - && ( p2m_flags_to_type(l2e_get_flags(l2e[i2])) - == p2m_populate_on_demand ) ) + && p2m_is_pod(p2m_flags_to_type(l2e_get_flags(l2e[i2]))) ) entry_count+=SUPERPAGE_PAGES; gfn += 1 << (L2_PAGETABLE_SHIFT - PAGE_SHIFT); continue; @@ -1132,7 +1131,7 @@ static long p2m_pt_audit_p2m(struct p2m_domain *p2m) type = p2m_flags_to_type(l1e_get_flags(l1e[i1])); if ( !(l1e_get_flags(l1e[i1]) & _PAGE_PRESENT) ) { - if ( type == p2m_populate_on_demand ) + if ( p2m_is_pod(type) ) entry_count++; continue; } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index def1695cf0..1d5a87a969 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -992,7 +992,7 @@ guest_physmap_add_entry(struct domain *d, gfn_t gfn, mfn_t mfn, ASSERT(mfn_valid(omfn)); set_gpfn_from_mfn(mfn_x(omfn), INVALID_M2P_ENTRY); } - else if ( ot == p2m_populate_on_demand ) + else if ( p2m_is_pod(ot) ) { /* Count how man PoD entries we'll be replacing if successful */ pod_count++; diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index be617281fc..bddef53163 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1478,7 +1478,7 @@ static int validate_gl4e(struct vcpu *v, void *new_ge, mfn_t sl4mfn, void *se) mfn_t gl3mfn = get_gfn_query_unlocked(d, gfn_x(gl3gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl3mfn = get_shadow_status(d, gl3mfn, SH_type_l3_shadow); - else if ( p2mt != p2m_populate_on_demand ) + else if ( !p2m_is_pod(p2mt) ) result |= SHADOW_SET_ERROR; #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) @@ -1537,7 +1537,7 @@ static int validate_gl3e(struct vcpu *v, void *new_ge, mfn_t sl3mfn, void *se) mfn_t gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl2mfn = get_shadow_status(d, gl2mfn, SH_type_l2_shadow); - else if ( p2mt != p2m_populate_on_demand ) + else if ( !p2m_is_pod(p2mt) ) result |= SHADOW_SET_ERROR; #if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) @@ -1588,7 +1588,7 @@ static int validate_gl2e(struct vcpu *v, void *new_ge, mfn_t sl2mfn, void *se) mfn_t gl1mfn = get_gfn_query_unlocked(d, gfn_x(gl1gfn), &p2mt); if ( p2m_is_ram(p2mt) ) sl1mfn = get_shadow_status(d, gl1mfn, SH_type_l1_shadow); - else if ( p2mt != p2m_populate_on_demand ) + else if ( !p2m_is_pod(p2mt) ) result |= SHADOW_SET_ERROR; } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:00:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242227.418981 (Exim 4.92) (envelope-from ) id 1muvcf-0004eK-Q3; Wed, 08 Dec 2021 12:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242227.418981; Wed, 08 Dec 2021 12:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcf-0004eC-N1; Wed, 08 Dec 2021 12:00:33 +0000 Received: by outflank-mailman (input) for mailman id 242227; Wed, 08 Dec 2021 12:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvce-0004dx-OS for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvce-0004Yg-Nb for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvce-0005ws-Mn for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rN0ljDEovnvrR9NErjyasz5Ra8l9UslRTPQbIbInnhE=; b=60G90WD/07DBf2F0TJI1RO4lvN yAvRFfc6fCXWy9LfQxiBjsbbmEFGhcWxoTBvcFZw6g/sK4Fj9425kdneiXDgFDJjkQxdq19Roi8ho F00P7vGOp1DrofG7A/FKVcu1mbKmKOFsz4/aAPxHqm256rl6RIRG3KSHcb5g17MM55T8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: fail virt-to-linear conversion for insn fetches from non-code segments Message-Id: Date: Wed, 08 Dec 2021 12:00:32 +0000 commit 311297f4216a4387bdae6df6cfbb1f5edb06618a Author: Jan Beulich AuthorDate: Mon Dec 6 14:15:05 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:15:05 2021 +0100 x86/HVM: fail virt-to-linear conversion for insn fetches from non-code segments Just like (in protected mode) reads may not go to exec-only segments and writes may not go to non-writable ones, insn fetches may not access data segments. Fixes: 623e83716791 ("hvm: Support hardware task switching") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 31e9474db0..7658f95aee 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2551,6 +2551,9 @@ bool hvm_vcpu_virtual_to_linear( */ ASSERT(seg < x86_seg_none); + /* However, check that insn fetches only ever specify CS. */ + ASSERT(access_type != hvm_access_insn_fetch || seg == x86_seg_cs); + if ( !(v->arch.hvm.guest_cr[0] & X86_CR0_PE) ) { /* @@ -2615,10 +2618,17 @@ bool hvm_vcpu_virtual_to_linear( if ( (reg->type & 0xa) == 0x8 ) goto out; /* execute-only code segment */ break; + case hvm_access_write: if ( (reg->type & 0xa) != 0x2 ) goto out; /* not a writable data segment */ break; + + case hvm_access_insn_fetch: + if ( !(reg->type & 0x8) ) + goto out; /* not a code segment */ + break; + default: break; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:00:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242230.419000 (Exim 4.92) (envelope-from ) id 1muvcq-0004yX-4B; Wed, 08 Dec 2021 12:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242230.419000; Wed, 08 Dec 2021 12:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcq-0004yQ-0z; Wed, 08 Dec 2021 12:00:44 +0000 Received: by outflank-mailman (input) for mailman id 242230; Wed, 08 Dec 2021 12:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvco-0004xz-RT for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvco-0004Yx-Qi for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvco-0005xc-Pm for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cufL8/D+Fg4YY6nUaxNU3WnSVDiEoJ1uvKzrBdTQob0=; b=sUUlx+q9ALQRQHNmU8wPqupvqM EGGqJUzN2pMomKB+oz6dYX8WgdhxudiVcB2Br/2rPbYX2gjGqP2Jj0/mGXWFOzyHQ9jnla67OzkxX VP1It/Qhd4Kv1Db7fPMED6bLkSLBQcuYvI4sZrIbY0NyZeyHm5be7+B1WNnX/zTO6Zk4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] EFI: move efi-boot.h inclusion point Message-Id: Date: Wed, 08 Dec 2021 12:00:42 +0000 commit 1f9540cd8eb63cce7702d6791093b871198a9afe Author: Jan Beulich AuthorDate: Mon Dec 6 14:15:54 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:15:54 2021 +0100 EFI: move efi-boot.h inclusion point When it was introduced, it was imo placed way too high up, making it necessary to forward-declare way too many static functions. Move it down together with - the efi_check_dt_boot() stub, which afaict was deliberately placed immediately ahead of the #include, - blexit(), because of its use of the efi_arch_blexit() hook. Move up get_value() and set_color() to before the inclusion so their forward declarations can also be zapped. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Luca Fancellu --- xen/common/efi/boot.c | 193 +++++++++++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 103 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 8fd5e2d078..114ea8278f 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -111,25 +111,10 @@ struct file { }; }; -static CHAR16 *FormatDec(UINT64 Val, CHAR16 *Buffer); -static CHAR16 *FormatHex(UINT64 Val, UINTN Width, CHAR16 *Buffer); -static void DisplayUint(UINT64 Val, INTN Width); -static CHAR16 *wstrcpy(CHAR16 *d, const CHAR16 *s); -static void PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode); -static char *get_value(const struct file *cfg, const char *section, - const char *item); -static char *split_string(char *s); -static CHAR16 *s2w(union string *str); -static char *w2s(const union string *str); -static EFI_FILE_HANDLE get_parent_handle(EFI_LOADED_IMAGE *loaded_image, - CHAR16 **leaf); static bool read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, struct file *file, const char *options); static bool read_section(const EFI_LOADED_IMAGE *image, const CHAR16 *name, struct file *file, const char *options); -static size_t wstrlen(const CHAR16 * s); -static int set_color(u32 mask, int bpp, u8 *pos, u8 *sz); -static bool match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2); static void efi_init(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable); static void efi_console_set_mode(void); @@ -168,19 +153,6 @@ static void __init PrintErr(const CHAR16 *s) StdErr->OutputString(StdErr, (CHAR16 *)s ); } -#ifndef CONFIG_HAS_DEVICE_TREE -static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) -{ - return 0; -} -#endif - -/* - * Include architecture specific implementation here, which references the - * static globals defined above. - */ -#include "efi-boot.h" - static CHAR16 *__init FormatDec(UINT64 Val, CHAR16 *Buffer) { if ( Val >= 10 ) @@ -291,30 +263,6 @@ static bool __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) !memcmp(guid1->Data4, guid2->Data4, sizeof(guid1->Data4)); } -void __init noreturn blexit(const CHAR16 *str) -{ - if ( str ) - PrintStr(str); - PrintStr(newline); - - if ( !efi_bs ) - efi_arch_halt(); - - if ( cfg.need_to_free ) - efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); - if ( kernel.need_to_free ) - efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); - if ( ramdisk.need_to_free ) - efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size)); - if ( xsm.need_to_free ) - efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); - - efi_arch_blexit(); - - efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); - unreachable(); /* not reached */ -} - /* generic routine for printing error messages */ static void __init PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode) { @@ -542,6 +490,7 @@ static CHAR16 *__init point_tail(CHAR16 *fn) break; } } + /* * Truncate string at first space, and return pointer * to remainder of string, if any/ NULL returned if @@ -559,6 +508,95 @@ static char * __init split_string(char *s) return NULL; } +static char *__init get_value(const struct file *cfg, const char *section, + const char *item) +{ + char *ptr = cfg->str, *end = ptr + cfg->size; + size_t slen = section ? strlen(section) : 0, ilen = strlen(item); + bool match = !slen; + + for ( ; ptr < end; ++ptr ) + { + switch ( *ptr ) + { + case 0: + continue; + case '[': + if ( !slen ) + break; + if ( match ) + return NULL; + match = strncmp(++ptr, section, slen) == 0 && ptr[slen] == ']'; + break; + default: + if ( match && strncmp(ptr, item, ilen) == 0 && ptr[ilen] == '=' ) + { + ptr += ilen + 1; + /* strip off any leading spaces */ + while ( *ptr && isspace(*ptr) ) + ptr++; + return ptr; + } + break; + } + ptr += strlen(ptr); + } + return NULL; +} + +static int __init __maybe_unused set_color(uint32_t mask, int bpp, + uint8_t *pos, uint8_t *sz) +{ + if ( bpp < 0 ) + return bpp; + if ( !mask ) + return -EINVAL; + for ( *pos = 0; !(mask & 1); ++*pos ) + mask >>= 1; + for ( *sz = 0; mask & 1; ++*sz) + mask >>= 1; + if ( mask ) + return -EINVAL; + return max(*pos + *sz, bpp); +} + +#ifndef CONFIG_HAS_DEVICE_TREE +static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) +{ + return 0; +} +#endif + +/* + * Include architecture specific implementation here, which references the + * static globals defined above. + */ +#include "efi-boot.h" + +void __init noreturn blexit(const CHAR16 *str) +{ + if ( str ) + PrintStr(str); + PrintStr(newline); + + if ( !efi_bs ) + efi_arch_halt(); + + if ( cfg.need_to_free ) + efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); + if ( kernel.need_to_free ) + efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size)); + if ( ramdisk.need_to_free ) + efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size)); + if ( xsm.need_to_free ) + efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); + + efi_arch_blexit(); + + efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); + unreachable(); /* not reached */ +} + static void __init handle_file_info(const CHAR16 *name, const struct file *file, const char *options) { @@ -685,42 +723,6 @@ static void __init pre_parse(const struct file *cfg) " last line will be ignored.\r\n"); } -static char *__init get_value(const struct file *cfg, const char *section, - const char *item) -{ - char *ptr = cfg->str, *end = ptr + cfg->size; - size_t slen = section ? strlen(section) : 0, ilen = strlen(item); - bool match = !slen; - - for ( ; ptr < end; ++ptr ) - { - switch ( *ptr ) - { - case 0: - continue; - case '[': - if ( !slen ) - break; - if ( match ) - return NULL; - match = strncmp(++ptr, section, slen) == 0 && ptr[slen] == ']'; - break; - default: - if ( match && strncmp(ptr, item, ilen) == 0 && ptr[ilen] == '=' ) - { - ptr += ilen + 1; - /* strip off any leading spaces */ - while ( *ptr && isspace(*ptr) ) - ptr++; - return ptr; - } - break; - } - ptr += strlen(ptr); - } - return NULL; -} - static void __init efi_init(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { efi_ih = ImageHandle; @@ -1114,21 +1116,6 @@ static void __init efi_exit_boot(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *Syste efi_fw_vendor = (void *)efi_fw_vendor + DIRECTMAP_VIRT_START; } -static int __init __maybe_unused set_color(u32 mask, int bpp, u8 *pos, u8 *sz) -{ - if ( bpp < 0 ) - return bpp; - if ( !mask ) - return -EINVAL; - for ( *pos = 0; !(mask & 1); ++*pos ) - mask >>= 1; - for ( *sz = 0; mask & 1; ++*sz) - mask >>= 1; - if ( mask ) - return -EINVAL; - return max(*pos + *sz, bpp); -} - void EFIAPI __init noreturn efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:00:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242231.419004 (Exim 4.92) (envelope-from ) id 1muvd0-00054e-7Q; Wed, 08 Dec 2021 12:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242231.419004; Wed, 08 Dec 2021 12:00:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvd0-00054W-4Q; Wed, 08 Dec 2021 12:00:54 +0000 Received: by outflank-mailman (input) for mailman id 242231; Wed, 08 Dec 2021 12:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcy-00053t-Uf for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvcy-0004ZB-Tu for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvcy-0005yc-T1 for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=i9sC8Z0S20zWnsocvlbTUjdCVxa5WFBXxWguQt/+9bg=; b=U/fzDZLGjupzMcpZ1J4D0xkSnW rgJveXGL1/B6z3kxGsRu4jZNxAcaviGZZ7wJOCxOw41orUxSJkfmgNqTLLuEEy2TnUhNZzArZ724r Qvs+Y5zQEflNCG1UpU5+Pcmz8x8eqLsamIlI1BWiay/+uuO7wcj5MB27qI8/8Lo+rET4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] EFI: drop copy-in from QueryVariableInfo()'s OUT-only variable bouncing Message-Id: Date: Wed, 08 Dec 2021 12:00:52 +0000 commit f0abfb5eca6821fb58c09331d0fa3ec97f86e0bb Author: Jan Beulich AuthorDate: Mon Dec 6 14:16:37 2021 +0100 Commit: Jan Beulich CommitDate: Mon Dec 6 14:16:37 2021 +0100 EFI: drop copy-in from QueryVariableInfo()'s OUT-only variable bouncing While be12fcca8b78 ("efi: fix alignment of function parameters in compat mode") intentionally bounced them both ways to avoid any functional change so close to the release of 4.16, the bouncing-in shouldn't really be needed. In exchange the local variables need to gain initializers to avoid copying back prior stack contents. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Luca Fancellu --- xen/common/efi/runtime.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index d2fdc28df3..fcd5a9cada 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -608,7 +608,15 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) case XEN_EFI_query_variable_info: { - uint64_t max_store_size, remain_store_size, max_size; + /* + * Put OUT variables on the stack to make them 8 byte aligned when + * called from the compat handler, as their placement in + * compat_pf_efi_runtime_call will make them 4 byte aligned instead + * and compilers may validly complain. This is done regardless of + * whether called from the compat handler or not, as it's not worth + * the extra logic to differentiate. + */ + uint64_t max_store_size = 0, remain_store_size = 0, max_size = 0; if ( op->misc & ~XEN_EFI_VARINFO_BOOT_SNAPSHOT ) return -EINVAL; @@ -642,21 +650,6 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) if ( !efi_enabled(EFI_RS) || (efi_rs->Hdr.Revision >> 16) < 2 ) return -EOPNOTSUPP; - /* - * Bounce the variables onto the stack to make them 8 byte aligned when - * called from the compat handler, as their placement in - * compat_pf_efi_runtime_call will make them 4 byte aligned instead and - * and compilers may validly complain. - * - * Note that while the function parameters are OUT only, copy the - * values here anyway just in case. This is done regardless of whether - * called from the compat handler or not, as it's not worth the extra - * logic to differentiate. - */ - max_store_size = op->u.query_variable_info.max_store_size; - remain_store_size = op->u.query_variable_info.remain_store_size; - max_size = op->u.query_variable_info.max_size; - state = efi_rs_enter(); if ( !state.cr3 ) return -EOPNOTSUPP; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 12:01:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 12:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242235.419018 (Exim 4.92) (envelope-from ) id 1muvdA-0005Vm-GG; Wed, 08 Dec 2021 12:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242235.419018; Wed, 08 Dec 2021 12:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvdA-0005Vb-DA; Wed, 08 Dec 2021 12:01:04 +0000 Received: by outflank-mailman (input) for mailman id 242235; Wed, 08 Dec 2021 12:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvd9-0005UZ-1Y for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muvd9-0004ZY-0k for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:01:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1muvd8-0005za-W9 for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 12:01:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gaKNElakymND2WkmzALKp100ccctodKp0O04X+wMWF4=; b=wX36Bm8JAD8PWcQ+VEAOwkKuUe ABuWOuCKt6czPemJzOix3WzGpIbcZ1wMa/dmrWqfwdQ5BfIYWYf8jqFPwENygZpZIboK5ZAiS+fA+ iIwcE8z1k8f7xJ1mGZvNYGIfULFwM7/wUZyPwaPcQ6c5SufdpLjY15ZZ7Zw3ZXAyqCcQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: Resign from my maintainership roles Message-Id: Date: Wed, 08 Dec 2021 12:01:02 +0000 commit 608531a0cc34a5bc096ccf585e16f182b5ed83e1 Author: Ian Jackson AuthorDate: Mon Dec 6 14:34:20 2021 +0000 Commit: Ian Jackson CommitDate: Mon Dec 6 14:34:20 2021 +0000 MAINTAINERS: Resign from my maintainership roles Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson --- MAINTAINERS | 7 ------- 1 file changed, 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 136f51ad5c..e43dc0edce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -256,7 +256,6 @@ S: Supported F: xen/drivers/passthrough/arm/smmu-v3.c Change Log -M: Ian Jackson R: Community Manager S: Maintained F: CHANGELOG.md @@ -375,7 +374,6 @@ F: xen/arch/x86/machine_kexec.c F: xen/arch/x86/x86_64/kexec_reloc.S LIBS -M: Ian Jackson M: Wei Liu R: Juergen Gross S: Supported @@ -396,7 +394,6 @@ F: tools/include/xentoollog.h F: tools/libs/ LIBXENLIGHT -M: Ian Jackson M: Wei Liu M: Anthony PERARD S: Supported @@ -458,7 +455,6 @@ S: Supported F: tools/python QEMU-DM -M: Ian Jackson S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git @@ -517,7 +513,6 @@ F: xen/arch/arm/tee/ F: xen/include/asm-arm/tee TOOLSTACK -M: Ian Jackson M: Wei Liu S: Supported F: autogen.sh @@ -639,7 +634,6 @@ F: xen/include/asm-x86/guest/hyperv-tlfs.h F: xen/include/asm-x86/hvm/viridian.h XENSTORE -M: Ian Jackson M: Wei Liu M: Juergen Gross R: Julien Grall @@ -665,7 +659,6 @@ F: docs/misc/xsm-flask.txt THE REST M: Andrew Cooper M: George Dunlap -M: Ian Jackson M: Jan Beulich M: Julien Grall M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 08 16:44:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 08 Dec 2021 16:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242505.419409 (Exim 4.92) (envelope-from ) id 1mv033-0003jr-Th; Wed, 08 Dec 2021 16:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242505.419409; Wed, 08 Dec 2021 16:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mv033-0003jj-Qi; Wed, 08 Dec 2021 16:44:05 +0000 Received: by outflank-mailman (input) for mailman id 242505; Wed, 08 Dec 2021 16:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mv032-0003jd-9s for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 16:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mv032-0001eq-95 for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 16:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mv032-0001ad-81 for xen-changelog@lists.xenproject.org; Wed, 08 Dec 2021 16:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0f50UCBliIGMk6cMPRGtmJQ9yuPVGm/kPJ+3zX4PnLQ=; b=fzdG1IgcQFxxLef+cmU9L1VMDV lHAKc8QoyeIgavsQzjAo4Ux5ekjM/euOsE1dhiUcdEywmfRaTvEvlxthvV9DOj+TDPD5XJhjtBQt0 5wXh5jq+jcSC8CDLJAgykcQY+yt9+QzcKfAOCsms36J3kyE7FiMbL6dOA0JUxbbqyOn4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: process pending vPCI map/unmap operations Message-Id: Date: Wed, 08 Dec 2021 16:44:04 +0000 commit c62d634cce8b1507d00a61bfc8168ac42367fe87 Author: Oleksandr Andrushchenko AuthorDate: Wed Nov 24 09:59:41 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 8 16:38:25 2021 +0000 xen/arm: process pending vPCI map/unmap operations vPCI may map and unmap PCI device memory (BARs) being passed through which may take a lot of time. For this those operations may be deferred to be performed later, so that they can be safely preempted. Currently this deferred processing is happening in common IOREQ code which doesn't seem to be the right place for x86 and is even more doubtful because IOREQ may not be enabled for Arm at all. So, for Arm the pending vPCI work may have no chance to be executed if the processing is left as is in the common IOREQ code only. For that reason make vPCI processing happen in arch specific code. Please be aware that there are a few outstanding TODOs affecting this code path, see xen/drivers/vpci/header.c:map_range and xen/drivers/vpci/header.c:vpci_process_pending. Signed-off-by: Oleksandr Andrushchenko [x86 part] Acked-by: Jan Beulich Reviewed-by: Julien Grall Reviewed-by: Paul Durrant Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/traps.c | 13 +++++++++++++ xen/arch/x86/hvm/hvm.c | 6 ++++++ xen/common/ioreq.c | 9 --------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 219ab3c3fb..8757210a79 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -2290,6 +2291,18 @@ static bool check_for_vcpu_work(void) { struct vcpu *v = current; + if ( has_vpci(v->domain) ) + { + bool pending; + + local_irq_enable(); + pending = vpci_process_pending(v); + local_irq_disable(); + + if ( pending ) + return true; + } + #ifdef CONFIG_IOREQ_SERVER if ( domain_has_ioreq_server(v->domain) ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7658f95aee..350dc396e3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -546,6 +546,12 @@ void hvm_do_resume(struct vcpu *v) pt_restore_timer(v); + if ( has_vpci(v->domain) && vpci_process_pending(v) ) + { + raise_softirq(SCHEDULE_SOFTIRQ); + return; + } + if ( !vcpu_ioreq_handle_completion(v) ) return; diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c index d732dc045d..689d256544 100644 --- a/xen/common/ioreq.c +++ b/xen/common/ioreq.c @@ -25,9 +25,7 @@ #include #include #include -#include #include -#include #include #include @@ -212,19 +210,12 @@ static bool wait_for_io(struct ioreq_vcpu *sv, ioreq_t *p) bool vcpu_ioreq_handle_completion(struct vcpu *v) { - struct domain *d = v->domain; struct vcpu_io *vio = &v->io; struct ioreq_server *s; struct ioreq_vcpu *sv; enum vio_completion completion; bool res = true; - if ( has_vpci(d) && vpci_process_pending(v) ) - { - raise_softirq(SCHEDULE_SOFTIRQ); - return false; - } - while ( (sv = get_pending_vcpu(v, &s)) != NULL ) if ( !wait_for_io(sv, get_ioreq(s, v)) ) return false; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 09:00:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 09:00:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.242806.419898 (Exim 4.92) (envelope-from ) id 1mvFHW-0001mv-DV; Thu, 09 Dec 2021 09:00:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 242806.419898; Thu, 09 Dec 2021 09:00:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvFHW-0001mV-AR; Thu, 09 Dec 2021 09:00:02 +0000 Received: by outflank-mailman (input) for mailman id 242806; Thu, 09 Dec 2021 09:00:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvFHV-0001hN-Lv for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 09:00:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvFHV-0005XX-Jh for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 09:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvFHV-0004Tx-Ig for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 09:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PoWImIp+GaOuY675beDzEXHgs9JyIf3K5GzkQK53Dpo=; b=b0mL+LNp9AEHNMPApIXpZcMLVs pAsAPb+WP123hr6YVxEj6ZRvjisK9fGktm553QsC8SxNBm2qNECAzWZIwwzgd/Ev6+td4puKWyS8f n4uJ18k720G0YBtvb2q/sP9Rlg80Jiu9nA7UNNlRgud6gdG4cgDtTTZD9wyXztLgce5Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: process pending vPCI map/unmap operations Message-Id: Date: Thu, 09 Dec 2021 09:00:01 +0000 commit c62d634cce8b1507d00a61bfc8168ac42367fe87 Author: Oleksandr Andrushchenko AuthorDate: Wed Nov 24 09:59:41 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 8 16:38:25 2021 +0000 xen/arm: process pending vPCI map/unmap operations vPCI may map and unmap PCI device memory (BARs) being passed through which may take a lot of time. For this those operations may be deferred to be performed later, so that they can be safely preempted. Currently this deferred processing is happening in common IOREQ code which doesn't seem to be the right place for x86 and is even more doubtful because IOREQ may not be enabled for Arm at all. So, for Arm the pending vPCI work may have no chance to be executed if the processing is left as is in the common IOREQ code only. For that reason make vPCI processing happen in arch specific code. Please be aware that there are a few outstanding TODOs affecting this code path, see xen/drivers/vpci/header.c:map_range and xen/drivers/vpci/header.c:vpci_process_pending. Signed-off-by: Oleksandr Andrushchenko [x86 part] Acked-by: Jan Beulich Reviewed-by: Julien Grall Reviewed-by: Paul Durrant Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/traps.c | 13 +++++++++++++ xen/arch/x86/hvm/hvm.c | 6 ++++++ xen/common/ioreq.c | 9 --------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 219ab3c3fb..8757210a79 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -2290,6 +2291,18 @@ static bool check_for_vcpu_work(void) { struct vcpu *v = current; + if ( has_vpci(v->domain) ) + { + bool pending; + + local_irq_enable(); + pending = vpci_process_pending(v); + local_irq_disable(); + + if ( pending ) + return true; + } + #ifdef CONFIG_IOREQ_SERVER if ( domain_has_ioreq_server(v->domain) ) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7658f95aee..350dc396e3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -546,6 +546,12 @@ void hvm_do_resume(struct vcpu *v) pt_restore_timer(v); + if ( has_vpci(v->domain) && vpci_process_pending(v) ) + { + raise_softirq(SCHEDULE_SOFTIRQ); + return; + } + if ( !vcpu_ioreq_handle_completion(v) ) return; diff --git a/xen/common/ioreq.c b/xen/common/ioreq.c index d732dc045d..689d256544 100644 --- a/xen/common/ioreq.c +++ b/xen/common/ioreq.c @@ -25,9 +25,7 @@ #include #include #include -#include #include -#include #include #include @@ -212,19 +210,12 @@ static bool wait_for_io(struct ioreq_vcpu *sv, ioreq_t *p) bool vcpu_ioreq_handle_completion(struct vcpu *v) { - struct domain *d = v->domain; struct vcpu_io *vio = &v->io; struct ioreq_server *s; struct ioreq_vcpu *sv; enum vio_completion completion; bool res = true; - if ( has_vpci(d) && vpci_process_pending(v) ) - { - raise_softirq(SCHEDULE_SOFTIRQ); - return false; - } - while ( (sv = get_pending_vcpu(v, &s)) != NULL ) if ( !wait_for_io(sv, get_ioreq(s, v)) ) return false; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 15:11:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 15:11:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243125.420469 (Exim 4.92) (envelope-from ) id 1mvL4Z-0001xU-KS; Thu, 09 Dec 2021 15:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243125.420469; Thu, 09 Dec 2021 15:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4Z-0001xM-HU; Thu, 09 Dec 2021 15:11:03 +0000 Received: by outflank-mailman (input) for mailman id 243125; Thu, 09 Dec 2021 15:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4Y-0001xG-4m for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4Y-0003hl-2P for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvL4Y-0006Sk-1M for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=00q616CTfiuZOqlJcevfVM3dvR27mTUVVCnIMqxEmsc=; b=6XTYKjGSN+JYysPRcKcKSEMHJB d31ZUbXCzY5M8LPICmiurxJTig/zbrr2K4/Qif0r1lZIWlCp0n1OicGVtiEN34keT76d06njmcugo ZStv/NSsmvwhNm0yKIEor/ISOA/pHPhYcYrwVbJSBo0IxwChb3M5Gx1NzwmSkd9v5YII=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: fix testbuilds regarding CONFIG_XC Message-Id: Date: Thu, 09 Dec 2021 15:11:02 +0000 commit d3d7189f02be347aa4fbdbe08f5f6b2d51fec3f8 Author: Juergen Gross AuthorDate: Mon Oct 4 16:19:23 2021 +0200 Commit: Andrew Cooper CommitDate: Thu Dec 9 14:52:01 2021 +0000 mini-os: fix testbuilds regarding CONFIG_XC CONFIG_GC is requiring external support, so disable it in testbuilds. The only reason this is working right now is its usage being inside a HAVE_LIBC section. Make that more obvious by making the default setting of CONFIG_XC depending on libc being available. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- Config.mk | 3 ++- arch/x86/testbuild/all-yes | 3 ++- arch/x86/testbuild/newxen-yes | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 15311ef..8f4cea9 100644 --- a/Config.mk +++ b/Config.mk @@ -62,6 +62,7 @@ MINIOS_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \ MINIOS_TARGET_ARCH ?= $(MINIOS_COMPILE_ARCH) endif +stubdom ?= n libc = $(stubdom) XEN_INTERFACE_VERSION ?= 0x00030205 @@ -179,7 +180,6 @@ CONFIG-y += CONFIG_FBFRONT CONFIG-y += CONFIG_KBDFRONT CONFIG-y += CONFIG_CONSFRONT CONFIG-y += CONFIG_XENBUS -CONFIG-y += CONFIG_XC CONFIG-n += CONFIG_QEMU_XS_ARGS CONFIG-n += CONFIG_TEST CONFIG-n += CONFIG_PCIFRONT @@ -195,6 +195,7 @@ CONFIG-y += CONFIG_PARAVIRT else CONFIG-n += CONFIG_PARAVIRT endif +CONFIG-$(libc) += CONFIG_XC CONFIG-$(lwip) += CONFIG_LWIP $(foreach i,$(CONFIG-y),$(eval $(i) ?= y)) diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes index 8732e69..5464342 100644 --- a/arch/x86/testbuild/all-yes +++ b/arch/x86/testbuild/all-yes @@ -13,7 +13,8 @@ CONFIG_FBFRONT = y CONFIG_KBDFRONT = y CONFIG_CONSFRONT = y CONFIG_XENBUS = y -CONFIG_XC = y +# XC is special: it needs support from outside +CONFIG_XC = n # LWIP is special: it needs support from outside CONFIG_LWIP = n CONFIG_BALLOON = y diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes index 9c30c00..2a3ed2e 100644 --- a/arch/x86/testbuild/newxen-yes +++ b/arch/x86/testbuild/newxen-yes @@ -13,7 +13,8 @@ CONFIG_FBFRONT = y CONFIG_KBDFRONT = y CONFIG_CONSFRONT = y CONFIG_XENBUS = y -CONFIG_XC = y +# XC is special: it needs support from outside +CONFIG_XC = n # LWIP is special: it needs support from outside CONFIG_LWIP = n CONFIG_BALLOON = y -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 15:11:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 15:11:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243126.420472 (Exim 4.92) (envelope-from ) id 1mvL4i-0001zO-Lm; Thu, 09 Dec 2021 15:11:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243126.420472; Thu, 09 Dec 2021 15:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4i-0001zH-It; Thu, 09 Dec 2021 15:11:12 +0000 Received: by outflank-mailman (input) for mailman id 243126; Thu, 09 Dec 2021 15:11:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4i-0001zB-6a for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4i-0003hp-5j for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvL4i-0006Ta-4p for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KlczbOLUb0x9dxPxDCkG5HfYz42fVPA3s3AgEm6FPQs=; b=R7uGHUx5obsNq/2Jn2oDk+pVw8 ICMG2h5SqqX6b8fbJkit1Mm11NzsiIONMZkzKofIKu0cKNyhV87pc/yAKw7AD8ih7lnievKqAqRM0 AFqcHHltj4RNxraHtbSkV7f2wOBMSKBTXCFUp+vF9nI7pvgVB0hhavE3qFCe0WIvdzKM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: add config options for xen libraries Message-Id: Date: Thu, 09 Dec 2021 15:11:12 +0000 commit 8669e5c6d0992163d7b5a9879e16c07d166376cb Author: Juergen Gross AuthorDate: Mon Oct 4 16:19:24 2021 +0200 Commit: Andrew Cooper CommitDate: Thu Dec 9 14:52:01 2021 +0000 mini-os: add config options for xen libraries Today close hooks into libxenctrl, libxenevtchn and libxengnttab are under the CONFIG_XC umbrella. In order to support Mini-OS builds using stable Xen libraries only, add CONFIG_LIBXENCTRL, CONFIG_LIBXENEVTCHN and CONFIG_LIBXENGNTTAB config options. In case CONFIG_XC was specified in the Mini-OS config explicitly, set the three new variables to the specified value. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- Config.mk | 7 ++++++- arch/x86/testbuild/all-no | 4 +++- arch/x86/testbuild/all-yes | 9 +++++---- arch/x86/testbuild/newxen-yes | 9 +++++---- lib/sys.c | 8 ++++++-- 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Config.mk b/Config.mk index 8f4cea9..5e66089 100644 --- a/Config.mk +++ b/Config.mk @@ -195,7 +195,12 @@ CONFIG-y += CONFIG_PARAVIRT else CONFIG-n += CONFIG_PARAVIRT endif -CONFIG-$(libc) += CONFIG_XC +# Support legacy CONFIG_XC value +CONFIG_XC ?= $(libc) +CONFIG-$(CONFIG_XC) += CONFIG_LIBXENCTRL +CONFIG-$(CONFIG_XC) += CONFIG_LIBXENEVTCHN +CONFIG-$(CONFIG_XC) += CONFIG_LIBXENGNTTAB + CONFIG-$(lwip) += CONFIG_LWIP $(foreach i,$(CONFIG-y),$(eval $(i) ?= y)) diff --git a/arch/x86/testbuild/all-no b/arch/x86/testbuild/all-no index 1c50bba..7972ecd 100644 --- a/arch/x86/testbuild/all-no +++ b/arch/x86/testbuild/all-no @@ -13,7 +13,9 @@ CONFIG_FBFRONT = n CONFIG_KBDFRONT = n CONFIG_CONSFRONT = n CONFIG_XENBUS = n -CONFIG_XC = n +CONFIG_LIBXENCTRL = n +CONFIG_LIBXENEVTCHN = n +CONFIG_LIBXENGNTTAB = n CONFIG_LWIP = n CONFIG_BALLOON = n CONFIG_USE_XEN_CONSOLE = n diff --git a/arch/x86/testbuild/all-yes b/arch/x86/testbuild/all-yes index 5464342..bc8eea5 100644 --- a/arch/x86/testbuild/all-yes +++ b/arch/x86/testbuild/all-yes @@ -13,9 +13,10 @@ CONFIG_FBFRONT = y CONFIG_KBDFRONT = y CONFIG_CONSFRONT = y CONFIG_XENBUS = y -# XC is special: it needs support from outside -CONFIG_XC = n -# LWIP is special: it needs support from outside -CONFIG_LWIP = n CONFIG_BALLOON = y CONFIG_USE_XEN_CONSOLE = y +# The following are special: they need support from outside +CONFIG_LIBXENCTRL = n +CONFIG_LIBXENEVTCHN = n +CONFIG_LIBXENGNTTAB = n +CONFIG_LWIP = n diff --git a/arch/x86/testbuild/newxen-yes b/arch/x86/testbuild/newxen-yes index 2a3ed2e..f72123b 100644 --- a/arch/x86/testbuild/newxen-yes +++ b/arch/x86/testbuild/newxen-yes @@ -13,10 +13,11 @@ CONFIG_FBFRONT = y CONFIG_KBDFRONT = y CONFIG_CONSFRONT = y CONFIG_XENBUS = y -# XC is special: it needs support from outside -CONFIG_XC = n -# LWIP is special: it needs support from outside -CONFIG_LWIP = n CONFIG_BALLOON = y CONFIG_USE_XEN_CONSOLE = y XEN_INTERFACE_VERSION=__XEN_LATEST_INTERFACE_VERSION__ +# The following are special: they need support from outside +CONFIG_LIBXENCTRL = n +CONFIG_LIBXENEVTCHN = n +CONFIG_LIBXENGNTTAB = n +CONFIG_LWIP = n diff --git a/lib/sys.c b/lib/sys.c index c6a7b9f..e8d5eb2 100644 --- a/lib/sys.c +++ b/lib/sys.c @@ -437,13 +437,17 @@ int close(int fd) return res; } #endif -#ifdef CONFIG_XC +#ifdef CONFIG_LIBXENCTRL case FTYPE_XC: minios_interface_close_fd(fd); return 0; +#endif +#ifdef CONFIG_LIBXENEVTCHN case FTYPE_EVTCHN: minios_evtchn_close_fd(fd); return 0; +#endif +#ifdef CONFIG_LIBXENGNTTAB case FTYPE_GNTMAP: minios_gnttab_close_fd(fd); return 0; @@ -1373,7 +1377,7 @@ void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset if (fd == -1) return map_zero(n, 1); -#ifdef CONFIG_XC +#ifdef CONFIG_LIBXENCTRL else if (files[fd].type == FTYPE_XC) { unsigned long zero = 0; return map_frames_ex(&zero, n, 0, 0, 1, DOMID_SELF, NULL, 0); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 15:11:22 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 15:11:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243127.420477 (Exim 4.92) (envelope-from ) id 1mvL4s-00021n-NY; Thu, 09 Dec 2021 15:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243127.420477; Thu, 09 Dec 2021 15:11:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4s-00021d-KS; Thu, 09 Dec 2021 15:11:22 +0000 Received: by outflank-mailman (input) for mailman id 243127; Thu, 09 Dec 2021 15:11:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4s-00021U-A0 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvL4s-0003ht-99 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvL4s-0006UL-87 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 15:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JuRG9dEp6/g1d/gfGrA/AYvkxKENm/XFZKKt+sz17tM=; b=j01PySbF4ESeE+KH44NQcHhWWj BbmCbZuF1NksYpL2bUu7WrwAGcFR8v8pRsW759wRPbyfgRUC2qDhJKW9jiv1WKWrwKdLACG9RjIaB inMU0TlfLG6L+r7EKEITC1ZlpUYRJFjlDHpufglKSZTVaV9+zvL8lh63PAHKXVxzKGm8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] xenbus: support large messages Message-Id: Date: Thu, 09 Dec 2021 15:11:22 +0000 commit 3e9a261fc8ac8fe47105f7d93c3d55631ea89fb8 Author: Juergen Gross AuthorDate: Mon Oct 4 11:40:00 2021 +0200 Commit: Andrew Cooper CommitDate: Thu Dec 9 14:52:02 2021 +0000 xenbus: support large messages Today the implementation of the xenbus protocol in Mini-OS will only allow to transfer the complete message to or from the ring page buffer. This is limiting the maximum message size to lower values as the xenbus protocol normally would allow. Change that by allowing to transfer the xenbus message in chunks as soon as they are available. Avoid crashing Mini-OS in case of illegal data read from the ring buffer. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- xenbus/xenbus.c | 210 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 122 insertions(+), 88 deletions(-) diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c index 23de61e..b687678 100644 --- a/xenbus/xenbus.c +++ b/xenbus/xenbus.c @@ -29,6 +29,7 @@ #include #include #include +#include #define min(x,y) ({ \ typeof(x) tmpx = (x); \ @@ -46,6 +47,7 @@ static struct xenstore_domain_interface *xenstore_buf; static DECLARE_WAIT_QUEUE_HEAD(xb_waitq); DECLARE_WAIT_QUEUE_HEAD(xenbus_watch_queue); +static __DECLARE_SEMAPHORE_GENERIC(xb_write_sem, 1); xenbus_event_queue xenbus_events; static struct watch { @@ -231,75 +233,103 @@ char *xenbus_wait_for_state_change(const char* path, XenbusState *state, xenbus_ } +static void xenbus_read_data(char *buf, unsigned int len) +{ + unsigned int off = 0; + unsigned int prod, cons; + unsigned int size; + + while (off != len) + { + wait_event(xb_waitq, xenstore_buf->rsp_prod != xenstore_buf->rsp_cons); + + prod = xenstore_buf->rsp_prod; + cons = xenstore_buf->rsp_cons; + DEBUG("Rsp_cons %d, rsp_prod %d.\n", cons, prod); + size = min(len - off, prod - cons); + + rmb(); /* Make sure data read from ring is ordered with rsp_prod. */ + memcpy_from_ring(xenstore_buf->rsp, buf + off, + MASK_XENSTORE_IDX(cons), size); + off += size; + mb(); /* memcpy() and rsp_cons update must not be reordered. */ + xenstore_buf->rsp_cons += size; + mb(); /* rsp_cons must be visible before we look at rsp_prod. */ + if (xenstore_buf->rsp_prod - cons >= XENSTORE_RING_SIZE) + notify_remote_via_evtchn(xenbus_evtchn); + } +} + static void xenbus_thread_func(void *ign) { struct xsd_sockmsg msg; - unsigned prod = xenstore_buf->rsp_prod; + char *data; for (;;) { - wait_event(xb_waitq, prod != xenstore_buf->rsp_prod); - while (1) { - prod = xenstore_buf->rsp_prod; - DEBUG("Rsp_cons %d, rsp_prod %d.\n", xenstore_buf->rsp_cons, - xenstore_buf->rsp_prod); - if (xenstore_buf->rsp_prod - xenstore_buf->rsp_cons < sizeof(msg)) - break; - rmb(); - memcpy_from_ring(xenstore_buf->rsp, &msg, - MASK_XENSTORE_IDX(xenstore_buf->rsp_cons), - sizeof(msg)); - DEBUG("Msg len %d, %d avail, id %d.\n", msg.len + sizeof(msg), - xenstore_buf->rsp_prod - xenstore_buf->rsp_cons, msg.req_id); - - if (xenstore_buf->rsp_prod - xenstore_buf->rsp_cons < - sizeof(msg) + msg.len) - break; - - DEBUG("Message is good.\n"); - - if (msg.type == XS_WATCH_EVENT) { - struct xenbus_event *event = malloc(sizeof(*event) + msg.len); - xenbus_event_queue *events = NULL; - char *data = (char*)event + sizeof(*event); - struct watch *watch; - - memcpy_from_ring(xenstore_buf->rsp, data, - MASK_XENSTORE_IDX(xenstore_buf->rsp_cons + sizeof(msg)), - msg.len); - - event->path = data; - event->token = event->path + strlen(event->path) + 1; - - mb(); - xenstore_buf->rsp_cons += msg.len + sizeof(msg); - - for (watch = watches; watch; watch = watch->next) - if (!strcmp(watch->token, event->token)) { - events = watch->events; - break; - } - - if (events) { - event->next = *events; - *events = event; - wake_up(&xenbus_watch_queue); - } else { - printk("unexpected watch token %s\n", event->token); - free(event); + xenbus_read_data((char *)&msg, sizeof(msg)); + DEBUG("Msg len %d, %d avail, id %d.\n", msg.len + sizeof(msg), + xenstore_buf->rsp_prod - xenstore_buf->rsp_cons, msg.req_id); + + if (msg.len > XENSTORE_PAYLOAD_MAX) { + printk("Xenstore violates protocol, message longer than allowed.\n"); + return; + } + + if (msg.type == XS_WATCH_EVENT) { + struct xenbus_event *event = malloc(sizeof(*event) + msg.len); + xenbus_event_queue *events = NULL; + struct watch *watch; + char *c; + int zeroes = 0; + + data = (char*)event + sizeof(*event); + xenbus_read_data(data, msg.len); + + for (c = data; c < data + msg.len; c++) + if (!*c) + zeroes++; + if (zeroes != 2) { + printk("Xenstore: illegal watch event data\n"); + free(event); + continue; + } + + event->path = data; + event->token = event->path + strlen(event->path) + 1; + + for (watch = watches; watch; watch = watch->next) + if (!strcmp(watch->token, event->token)) { + events = watch->events; + break; } + + if (events) { + event->next = *events; + *events = event; + wake_up(&xenbus_watch_queue); } else { - req_info[msg.req_id].reply = malloc(sizeof(msg) + msg.len); - memcpy_from_ring(xenstore_buf->rsp, req_info[msg.req_id].reply, - MASK_XENSTORE_IDX(xenstore_buf->rsp_cons), - msg.len + sizeof(msg)); - mb(); - xenstore_buf->rsp_cons += msg.len + sizeof(msg); - wake_up(&req_info[msg.req_id].waitq); + printk("Xenstore: unexpected watch token %s\n", event->token); + free(event); } - wmb(); - notify_remote_via_evtchn(xenbus_evtchn); + continue; } + + data = malloc(sizeof(msg) + msg.len); + memcpy(data, &msg, sizeof(msg)); + xenbus_read_data(data + sizeof(msg), msg.len); + + if (msg.req_id >= NR_REQS || !req_info[msg.req_id].in_use) { + printk("Xenstore: illegal request id %d\n", msg.req_id); + free(data); + continue; + } + + DEBUG("Message is good.\n"); + + req_info[msg.req_id].reply = data; + + wake_up(&req_info[msg.req_id].waitq); } } @@ -451,36 +481,40 @@ static void xb_write(int type, int req_id, xenbus_transaction_t trans_id, cur_req = &header_req; - BUG_ON(len > XENSTORE_RING_SIZE); - /* Wait for the ring to drain to the point where we can send the - message. */ - prod = xenstore_buf->req_prod; - if (prod + len - xenstore_buf->req_cons > XENSTORE_RING_SIZE) - { - /* Wait for there to be space on the ring */ - DEBUG("prod %d, len %d, cons %d, size %d; waiting.\n", - prod, len, xenstore_buf->req_cons, XENSTORE_RING_SIZE); - wait_event(xb_waitq, - xenstore_buf->req_prod + len - xenstore_buf->req_cons <= - XENSTORE_RING_SIZE); - DEBUG("Back from wait.\n"); - prod = xenstore_buf->req_prod; - } + BUG_ON(len > XENSTORE_PAYLOAD_MAX); + + /* Make sure we are the only thread trying to write. */ + down(&xb_write_sem); - /* We're now guaranteed to be able to send the message without - overflowing the ring. Do so. */ + /* Send the message in chunks using free ring space when available. */ total_off = 0; req_off = 0; - while (total_off < len) + while (total_off < len) { + prod = xenstore_buf->req_prod; + if (prod - xenstore_buf->req_cons >= XENSTORE_RING_SIZE) + { + /* Send evtchn to notify remote */ + notify_remote_via_evtchn(xenbus_evtchn); + + /* Wait for there to be space on the ring */ + DEBUG("prod %d, len %d, cons %d, size %d; waiting.\n", prod, + len - total_off, xenstore_buf->req_cons, XENSTORE_RING_SIZE); + wait_event(xb_waitq, + prod - xenstore_buf->req_cons < XENSTORE_RING_SIZE); + DEBUG("Back from wait.\n"); + } + this_chunk = min(cur_req->len - req_off, - XENSTORE_RING_SIZE - MASK_XENSTORE_IDX(prod)); + XENSTORE_RING_SIZE - MASK_XENSTORE_IDX(prod)); + this_chunk = min(this_chunk, + xenstore_buf->req_cons + XENSTORE_RING_SIZE - prod); memcpy((char *)xenstore_buf->req + MASK_XENSTORE_IDX(prod), - (char *)cur_req->data + req_off, this_chunk); + (char *)cur_req->data + req_off, this_chunk); prod += this_chunk; req_off += this_chunk; total_off += this_chunk; - if (req_off == cur_req->len) + if (req_off == cur_req->len) { req_off = 0; if (cur_req == &header_req) @@ -488,20 +522,20 @@ static void xb_write(int type, int req_id, xenbus_transaction_t trans_id, else cur_req++; } + + /* Remote must see entire message before updating indexes */ + wmb(); + xenstore_buf->req_prod = prod; } + /* Send evtchn to notify remote */ + notify_remote_via_evtchn(xenbus_evtchn); + DEBUG("Complete main loop of xb_write.\n"); BUG_ON(req_off != 0); BUG_ON(total_off != len); - BUG_ON(prod > xenstore_buf->req_cons + XENSTORE_RING_SIZE); - /* Remote must see entire message before updating indexes */ - wmb(); - - xenstore_buf->req_prod += len; - - /* Send evtchn to notify remote */ - notify_remote_via_evtchn(xenbus_evtchn); + up(&xb_write_sem); } /* Send a mesasge to xenbus, in the same fashion as xb_write, and -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:00:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243286.420801 (Exim 4.92) (envelope-from ) id 1mvPaI-0003Us-Kn; Thu, 09 Dec 2021 20:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243286.420801; Thu, 09 Dec 2021 20:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaI-0003Uk-GN; Thu, 09 Dec 2021 20:00:06 +0000 Received: by outflank-mailman (input) for mailman id 243286; Thu, 09 Dec 2021 20:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaH-0003Pm-NJ for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaH-0000pS-Kz for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPaH-0005Eq-K0 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Yq/7ae5SqH2Hkb/2jApEuXGlOGllucl/bl0juJNHTUU=; b=d4mPFcwPda9AoN/L2L7kqRIplC 504Y5em5OJfPBHv7Kcz9kzHpabYkSCdQPAfs+UKE76/phx5a6mtomgmWcbFJ0vt2YuHxsddd+tQuR AokB3Yta220Rbd482PPY6KHHMUnxOYcalVdMnKrLrru/jR+6hONqplmCURgWsDVsm8V0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/build: Move exception tables into __ro_after_init Message-Id: Date: Thu, 09 Dec 2021 20:00:05 +0000 commit a0c3cd03ce76313a7c461ecb3e70b513a15453f7 Author: Andrew Cooper AuthorDate: Mon Dec 6 13:07:08 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 x86/build: Move exception tables into __ro_after_init Since c/s 79713ed0a94c ("x86: move both exception tables into .rodata") in 2016, we've been (ab)using the fact that .rodata is read/write during early boot, so we can sort the two tables. Now that we have a real __ro_after_init concept, reposition them to better match reality. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Wei Liu --- xen/arch/x86/xen.lds.S | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 4db5b404e0..ca22e984f8 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -100,6 +100,18 @@ SECTIONS __ro_after_init_start = .; *(.data.ro_after_init) + + . = ALIGN(8); + /* Exception table */ + __start___ex_table = .; + *(.ex_table) + __stop___ex_table = .; + + /* Pre-exception table */ + __start___pre_ex_table = .; + *(.ex_table.pre) + __stop___pre_ex_table = .; + . = ALIGN(PAGE_SIZE); __ro_after_init_end = .; @@ -129,17 +141,6 @@ SECTIONS *(.note.gnu.build-id) __note_gnu_build_id_end = .; #endif - . = ALIGN(8); - /* Exception table */ - __start___ex_table = .; - *(.ex_table) - __stop___ex_table = .; - - /* Pre-exception table */ - __start___pre_ex_table = .; - *(.ex_table.pre) - __stop___pre_ex_table = .; - #ifdef CONFIG_HAS_VPCI . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:00:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243287.420804 (Exim 4.92) (envelope-from ) id 1mvPaS-0003bp-LM; Thu, 09 Dec 2021 20:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243287.420804; Thu, 09 Dec 2021 20:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaS-0003bh-IJ; Thu, 09 Dec 2021 20:00:16 +0000 Received: by outflank-mailman (input) for mailman id 243287; Thu, 09 Dec 2021 20:00:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaR-0003bZ-Py for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaR-0000qJ-PB for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPaR-0005Hf-NX for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uI1y8S/lgKuw8Davb5xvJwuHCVZeEKoWEi6zMTJUq2M=; b=QKSLg/PYp2nf9QNSGssCh7yo/9 91KgKk+G6vhGySbsCtgmPJsbO32VRqN6xX4HYbqJ8JkKS0K7/ruFpXR4kMJl5+PR34ZECo1ckJ90g pgxR9B42EI1EBQDP5TJHL2Krj7PVVYDlmZTSeYSaC/09a6LHDZa63F/Z3/XiP3cpkafA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/helpers: fix PVH xenstore-stubdom console parameters Message-Id: Date: Thu, 09 Dec 2021 20:00:15 +0000 commit 1e8b732de1e78eb978b59390a81f9bf01c16e0aa Author: Juergen Gross AuthorDate: Wed Dec 8 09:47:44 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/helpers: fix PVH xenstore-stubdom console parameters When using a PVH mode xenstore-stubdom the frame number of the console should be a PFN instead of a MFN. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/helpers/init-xenstore-domain.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index b205a79ee6..9457d0251b 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -30,7 +30,7 @@ static char *param; static char *name = "Xenstore"; static int memory; static int maxmem; -static xen_pfn_t console_mfn; +static xen_pfn_t console_gfn; static xc_evtchn_port_or_error_t console_evtchn; static struct option options[] = { @@ -283,7 +283,9 @@ static int build(xc_interface *xch) } rv = 0; - console_mfn = xc_dom_p2m(dom, dom->console_pfn); + console_gfn = (dom->container_type == XC_DOM_PV_CONTAINER) + ? xc_dom_p2m(dom, dom->console_pfn) + : dom->console_pfn; err: if ( dom ) @@ -528,7 +530,7 @@ int main(int argc, char** argv) do_xs_write_dir_node(xsh, fe_path, "tty", ""); snprintf(buf, 16, "%d", console_evtchn); do_xs_write_dir_node(xsh, fe_path, "port", buf); - snprintf(buf, 16, "%ld", console_mfn); + snprintf(buf, 16, "%ld", console_gfn); do_xs_write_dir_node(xsh, fe_path, "ring-ref", buf); xs_close(xsh); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:00:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:00:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243288.420807 (Exim 4.92) (envelope-from ) id 1mvPac-0003fA-Nz; Thu, 09 Dec 2021 20:00:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243288.420807; Thu, 09 Dec 2021 20:00:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPac-0003f4-L7; Thu, 09 Dec 2021 20:00:26 +0000 Received: by outflank-mailman (input) for mailman id 243288; Thu, 09 Dec 2021 20:00:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPab-0003ew-TS for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPab-0000qS-SZ for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPab-0005IO-Rd for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8BdqrYuJH2hBgXxcJop365IP/1GU7PoSnnUykbMG47M=; b=v57UDCuSKRD2Kc2/VQzGpbZMiX Ogb977LR5qsI/kMnL1uyUjK/4F2Ea6mrnxrg8kw5O3PAeRRFQEZteVo3AxS8z19yx2u9nXiIilWEd mURj5je2VNUG0zxtbz6Zhml78J0VmoMmpZ/t170SBKM8pon/tSwenCbKk2iWZpJTJRx4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: set event channel HVM parameters in libxenguest Message-Id: Date: Thu, 09 Dec 2021 20:00:25 +0000 commit 1d896a0ef7df2bf4c74c3c5272e0d341038eea8b Author: Juergen Gross AuthorDate: Wed Dec 8 09:47:45 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools: set event channel HVM parameters in libxenguest The HVM parameters for pre-allocated event channels should be set in libxenguest, like it is done for PV guests, and the ring pages that libxenguest allocates. Suggested-by: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/libs/guest/xg_dom_x86.c | 6 ++++++ tools/libs/light/libxl_dom.c | 15 ++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/libs/guest/xg_dom_x86.c b/tools/libs/guest/xg_dom_x86.c index b6e75afba2..9328fbf804 100644 --- a/tools/libs/guest/xg_dom_x86.c +++ b/tools/libs/guest/xg_dom_x86.c @@ -1866,6 +1866,12 @@ static int bootlate_hvm(struct xc_dom_image *dom) munmap(hvm_info_page, PAGE_SIZE); } + if ( xc_hvm_param_set(xch, domid, HVM_PARAM_CONSOLE_EVTCHN, + dom->console_evtchn) || + xc_hvm_param_set(xch, domid, HVM_PARAM_STORE_EVTCHN, + dom->xenstore_evtchn) ) + return -1; + return 0; } diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index fe9f760f71..c9c24666cd 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -723,9 +723,8 @@ out: static int hvm_build_set_params(xc_interface *handle, uint32_t domid, libxl_domain_build_info *info, - int store_evtchn, unsigned long *store_mfn, - int console_evtchn, unsigned long *console_mfn, - domid_t store_domid, domid_t console_domid) + unsigned long *store_mfn, + unsigned long *console_mfn) { struct hvm_info_table *va_hvm; uint8_t *va_map, sum; @@ -752,8 +751,6 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); - xc_hvm_param_set(handle, domid, HVM_PARAM_STORE_EVTCHN, store_evtchn); - xc_hvm_param_set(handle, domid, HVM_PARAM_CONSOLE_EVTCHN, console_evtchn); *store_mfn = str_mfn; *console_mfn = cons_mfn; @@ -1123,7 +1120,9 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->vga_hole_size = device_model ? LIBXL_VGA_HOLE_SIZE : 0; dom->device_model = device_model; dom->max_vcpus = info->max_vcpus; + dom->console_evtchn = state->console_port; dom->console_domid = state->console_domid; + dom->xenstore_evtchn = state->store_port; dom->xenstore_domid = state->store_domid; rc = libxl__domain_device_construct_rdm(gc, d_config, @@ -1169,10 +1168,8 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (rc != 0) goto out; - rc = hvm_build_set_params(ctx->xch, domid, info, state->store_port, - &state->store_mfn, state->console_port, - &state->console_mfn, state->store_domid, - state->console_domid); + rc = hvm_build_set_params(ctx->xch, domid, info, &state->store_mfn, + &state->console_mfn); if (rc != 0) { LOG(ERROR, "hvm build set params failed"); goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:00:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:00:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243290.420812 (Exim 4.92) (envelope-from ) id 1mvPan-0003ig-PX; Thu, 09 Dec 2021 20:00:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243290.420812; Thu, 09 Dec 2021 20:00:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPan-0003iY-Mk; Thu, 09 Dec 2021 20:00:37 +0000 Received: by outflank-mailman (input) for mailman id 243290; Thu, 09 Dec 2021 20:00:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPam-0003iH-0b for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPal-0000qX-W3 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPal-0005JB-V0 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6pjZLbMKcQC+No/ZosEXqHW5ea2L//c1pWj1Je0hrZ4=; b=JnftPNVSr1BAozUBcoZ6hbNIeI euZyBKvMqZJhe5mMWFLZalt9lHOwJtyPlEqCIdu7SKyC66nJhw2GKFlVfU72jr+9+ngpvlcFq5da8 /LQrG3IqkwyKphzXgqPgPmWQBwHBm/35LUw5Uxb3o9ldGYI8Pv+popVSrrwepzd7dwdk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libs/ctrl: Save errno only once in *PRINTF() and *ERROR() Message-Id: Date: Thu, 09 Dec 2021 20:00:35 +0000 commit f10202d5c7c296c52a69775a4faab7db1b2e478d Author: Juergen Gross AuthorDate: Thu Dec 9 14:40:54 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/libs/ctrl: Save errno only once in *PRINTF() and *ERROR() All *PRINTF() and *ERROR() macros are based on xc_reportv() which is saving and restoring errno in order to not modify it. There is no need to save and restore in those macros, too. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- tools/libs/ctrl/xc_private.h | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index 2e483590e6..6fc98a35a8 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -122,28 +122,18 @@ void xc_report_progress_step(xc_interface *xch, /* anamorphic macros: struct xc_interface *xch must be in scope */ -#define IPRINTF(_f, _a...) do { int IPRINTF_errno = errno; \ - xc_report(xch, xch->error_handler, XTL_INFO,0, _f , ## _a); \ - errno = IPRINTF_errno; \ - } while (0) -#define DPRINTF(_f, _a...) do { int DPRINTF_errno = errno; \ - xc_report(xch, xch->error_handler, XTL_DETAIL,0, _f , ## _a); \ - errno = DPRINTF_errno; \ - } while (0) -#define DBGPRINTF(_f, _a...) do { int DBGPRINTF_errno = errno; \ - xc_report(xch, xch->error_handler, XTL_DEBUG,0, _f , ## _a); \ - errno = DBGPRINTF_errno; \ - } while (0) - -#define ERROR(_m, _a...) do { int ERROR_errno = errno; \ - xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a ); \ - errno = ERROR_errno; \ - } while (0) -#define PERROR(_m, _a...) do { int PERROR_errno = errno; \ - xc_report_error(xch,XC_INTERNAL_ERROR,_m " (%d = %s)", \ - ## _a , errno, xc_strerror(xch, errno)); \ - errno = PERROR_errno; \ - } while (0) +#define IPRINTF(_f, _a...) \ + xc_report(xch, xch->error_handler, XTL_INFO, 0, _f, ## _a) +#define DPRINTF(_f, _a...) \ + xc_report(xch, xch->error_handler, XTL_DETAIL, 0, _f, ## _a) +#define DBGPRINTF(_f, _a...) \ + xc_report(xch, xch->error_handler, XTL_DEBUG, 0, _f, ## _a) + +#define ERROR(_m, _a...) \ + xc_report_error(xch, XC_INTERNAL_ERROR, _m, ## _a) +#define PERROR(_m, _a...) \ + xc_report_error(xch, XC_INTERNAL_ERROR, _m " (%d = %s)", \ + ## _a, errno, xc_strerror(xch, errno)) /* * HYPERCALL ARGUMENT BUFFERS -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:00:47 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:00:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243292.420816 (Exim 4.92) (envelope-from ) id 1mvPax-0003ls-RC; Thu, 09 Dec 2021 20:00:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243292.420816; Thu, 09 Dec 2021 20:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPax-0003lk-OK; Thu, 09 Dec 2021 20:00:47 +0000 Received: by outflank-mailman (input) for mailman id 243292; Thu, 09 Dec 2021 20:00:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaw-0003lD-3c for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPaw-0000qi-2x for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPaw-0005Jq-27 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SvCFRYr4GLypZj4rBc4FsaBOCCPmpVIpkC1ZatWl/FI=; b=coZaaGuxjkuLgY5+Kr9CpVoSke NzEPVhuytmSDWMcK+ee96g7QKqvB080bferZWFL2Bu1YXjL8OjMs6csMDIkyJ7onlpAeaJCyn3wR1 6K6iYqw3OSt8Q7h+EpNtId0E+Js8JHsiKD24rfNGR2oZ5JJljFLwZ/q5nWUSXeRIHKZY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libs/light: set video_mem for PVH guests Message-Id: Date: Thu, 09 Dec 2021 20:00:46 +0000 commit 0a20a53df158eb0724ce6dcd9de70cbdad547d6f Author: Juergen Gross AuthorDate: Fri Dec 3 08:30:58 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/libs/light: set video_mem for PVH guests The size of the video memory of PVH guests should be set to 0 in case no value has been specified. Doing not so will leave it to be -1, resulting in an additional 1 kB of RAM being advertised in the memory map (here the output of a PVH Mini-OS boot with 16 MB of RAM assigned): Memory map: 000000000000-0000010003ff: RAM 0000feff8000-0000feffffff: Reserved 0000fc008000-0000fc00803f: ACPI 0000fc000000-0000fc000fff: ACPI 0000fc001000-0000fc007fff: ACPI Signed-off-by: Juergen Gross Reviewed-by: Roger Pau Monné Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index dcd09d32ba..d7a40d7550 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -427,6 +427,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; case LIBXL_DOMAIN_TYPE_PVH: libxl_defbool_setdefault(&b_info->u.pvh.pvshim, false); + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; if (libxl_defbool_val(b_info->u.pvh.pvshim)) { if (!b_info->u.pvh.pvshim_path) b_info->u.pvh.pvshim_path = -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:00:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:00:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243293.420820 (Exim 4.92) (envelope-from ) id 1mvPb7-0003oi-Sp; Thu, 09 Dec 2021 20:00:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243293.420820; Thu, 09 Dec 2021 20:00:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPb7-0003oa-Pm; Thu, 09 Dec 2021 20:00:57 +0000 Received: by outflank-mailman (input) for mailman id 243293; Thu, 09 Dec 2021 20:00:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPb6-0003oL-6l for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPb6-0000rE-5x for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPb6-0005KP-5A for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:00:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GrneFCyUxfuns+zQIfjK2d+V9oZVv6qYtrf248Q7usY=; b=DNhV/Sx5Z0nGOCIUmD/JRt+LX9 LSDSL47VslpS/P6paB0iSQ3texWw5JgEcAlkvKrlPOXxUhaXrKBcLEmqniteRZUOB2KTaVdNKSdWz 0/VVHoM55ubBI7rrZ5vG5NzfudVIDZS7mYcpvyX/CJoyQbBAtg69d4N7DQ7jsAAs/TdE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] .gitignore: Non existing toolcore/include files. Message-Id: Date: Thu, 09 Dec 2021 20:00:56 +0000 commit 92f3b438f3b5c255022b70310c1f32363f26be7a Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:44 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 .gitignore: Non existing toolcore/include files. 4664034cdc (tools/libs: move official headers to common directory) forgot one .gitignore update. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9513506dd9..cad5aacd8d 100644 --- a/.gitignore +++ b/.gitignore @@ -384,7 +384,6 @@ tools/include/xen-foreign/arm64.h .git tools/misc/xen-hptool tools/misc/xen-mfndump -tools/libs/toolcore/include/_*.h tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz tools/misc/xenhypfs -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:01:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:01:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243294.420824 (Exim 4.92) (envelope-from ) id 1mvPbH-0003rD-UB; Thu, 09 Dec 2021 20:01:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243294.420824; Thu, 09 Dec 2021 20:01:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbH-0003r5-RJ; Thu, 09 Dec 2021 20:01:07 +0000 Received: by outflank-mailman (input) for mailman id 243294; Thu, 09 Dec 2021 20:01:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbG-0003qv-AO for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbG-0000rV-9Z for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPbG-0005LY-8m for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xIn74XhFFe/vgjlzLZywZbzvkVjpoXG8c8mQHUFt4SM=; b=4A1iuaMv3RHJ74Izl/iIJVfDfE IBB3Nv7n4cJh3Ae15l/ShFPU8WCW9AO+FhrXCZPB72fQZfI613ERJHieYY3+RrpEuejFc3eDGicHD NiOLg/5D2EJF308oOQwrMNYZ9DW5EtnHvaDdJDPnl512yGMVwrVKt1SA2rQAP4Mw+dUI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/configure.ac: Remove left over system_aio Message-Id: Date: Thu, 09 Dec 2021 20:01:06 +0000 commit 71643161782e1257b2dcb6cebcb6a67467ac42ad Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:45 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/configure.ac: Remove left over system_aio system_aio isn't set since 3d4678108a (tools: remove in tree libaio). Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/configure | 2 -- tools/configure.ac | 1 - 2 files changed, 3 deletions(-) diff --git a/tools/configure b/tools/configure index 21e3a83795..8e4a59c2cb 100755 --- a/tools/configure +++ b/tools/configure @@ -641,7 +641,6 @@ PTHREAD_LIBS PTHREAD_LDFLAGS PTHREAD_CFLAGS EXTFS_LIBS -system_aio zlib libzstd_LIBS libzstd_CFLAGS @@ -8772,7 +8771,6 @@ $as_echo "yes" >&6; } fi - ac_fn_c_check_header_mongrel "$LINENO" "ext2fs/ext2fs.h" "ac_cv_header_ext2fs_ext2fs_h" "$ac_includes_default" if test "x$ac_cv_header_ext2fs_ext2fs_h" = xyes; then : diff --git a/tools/configure.ac b/tools/configure.ac index 3ac62626a5..5a4fb9022d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -402,7 +402,6 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) PKG_CHECK_MODULES([libzstd], [libzstd], [zlib="$zlib -DHAVE_ZSTD $libzstd_CFLAGS $libzstd_LIBS"], [true]) AC_SUBST(zlib) -AC_SUBST(system_aio) AX_CHECK_EXTFS AX_CHECK_PTHREAD AX_CHECK_PTYFUNCS -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:01:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:01:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243295.420828 (Exim 4.92) (envelope-from ) id 1mvPbR-0003tr-Vi; Thu, 09 Dec 2021 20:01:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243295.420828; Thu, 09 Dec 2021 20:01:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbR-0003tj-Sq; Thu, 09 Dec 2021 20:01:17 +0000 Received: by outflank-mailman (input) for mailman id 243295; Thu, 09 Dec 2021 20:01:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbQ-0003tX-DU for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbQ-0000rZ-Cf for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPbQ-0005MQ-Br for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/CJ+ZThDji6xkkDtckgthN/BuSRqAA7nqMwp1rIN/Ck=; b=TuqKvtoUsrNDugmFznM91qKCsd HuhlGFfG7IAF8PS/QxhcI+eG/akzGc0QuiGufv3Pv4Zv4ywj+peBcFYj5U38fl3544OUv17d4M+1m 1Irlm4qf2s097RE+SJ4ItOlhzn2ksyfYmwqf25RweL5/ybZ72Zp8xnyI71JGU+4XE8b0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/Rules.mk: Remove $(CFLAGS.opic) from %.opic: %.S Message-Id: Date: Thu, 09 Dec 2021 20:01:16 +0000 commit ec47d17d2209a1cf8b2d8bc1e563aa89e040727a Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:46 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/Rules.mk: Remove $(CFLAGS.opic) from %.opic: %.S $(CFLAGS.opic) isn't set anywere, never was, just remove it. Signed-off-by: Anthony PERARD --- tools/Rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index b022da3336..4e9b4ee17f 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -155,7 +155,7 @@ INSTALL_PYTHON_PROG = \ %.o: %.S $(CC) $(CFLAGS) $(CFLAGS_$*.o) -c $< -o $@ $(APPEND_CFLAGS) %.opic: %.S - $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS) + $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $< $(APPEND_CFLAGS) subdirs-all subdirs-clean subdirs-install subdirs-distclean subdirs-uninstall: .phony @set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:01:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:01:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243296.420831 (Exim 4.92) (envelope-from ) id 1mvPbc-0003wt-16; Thu, 09 Dec 2021 20:01:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243296.420831; Thu, 09 Dec 2021 20:01:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbb-0003wm-UL; Thu, 09 Dec 2021 20:01:27 +0000 Received: by outflank-mailman (input) for mailman id 243296; Thu, 09 Dec 2021 20:01:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPba-0003wG-Ga for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPba-0000rd-Fp for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPba-0005NF-F0 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1Pu5GMMseUDeRlTczqEwlZhMijp7Jqe4RcSOrlc1IlE=; b=PIOspzhj/wQVsN7M6tvMhBM9lW 4KBjysYq0WZDU4+wgd3xOkCpi7UQzIJVsptbBcZD77j/2xt3UOAqG6Fcjl9cLlJkhYCTFd/sqSOvb bRUA1lZG9IFwsJ23K2mhfgYsQdrwyNgi4l0pMapOvGQd/xWFUh9we7srQdjtEgkmd1rE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs: Remove _paths.h from libs ctrl and util. Message-Id: Date: Thu, 09 Dec 2021 20:01:26 +0000 commit e0c9bd3d67e05508557f58ca4d5ee2b542ea2903 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:47 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs: Remove _paths.h from libs ctrl and util. libxenutil doesn't include _paths.h so no need to generate it. libxenctrl doesn't use macros from _paths.h so can be removed. Fix libxenguest to include _paths.h properly instead of relying on xc_private.h Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- .gitignore | 2 -- tools/libs/ctrl/Makefile | 5 ----- tools/libs/ctrl/xc_private.h | 2 -- tools/libs/guest/Makefile | 2 +- tools/libs/guest/xg_suspend.c | 1 + tools/libs/util/Makefile | 6 +----- 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index cad5aacd8d..111eb03b86 100644 --- a/.gitignore +++ b/.gitignore @@ -117,7 +117,6 @@ tools/libs/hypfs/headers.chk tools/libs/hypfs/xenhypfs.pc tools/libs/call/headers.chk tools/libs/call/xencall.pc -tools/libs/ctrl/_*.[ch] tools/libs/ctrl/libxenctrl.map tools/libs/ctrl/xencontrol.pc tools/libs/foreignmemory/headers.chk @@ -157,7 +156,6 @@ tools/libs/store/utils.h tools/libs/store/xenstore.pc tools/libs/store/xs_lib.c tools/libs/util/*.pc -tools/libs/util/_paths.h tools/libs/util/libxlu_cfg_y.output tools/libs/util/libxenutil.map tools/libs/vchan/headers.chk diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index 519246b0d6..5d866b8d04 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -54,11 +54,6 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) clean: cleanlocal diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index 6fc98a35a8..ebdf78c2bf 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -29,8 +29,6 @@ #include #include -#include "_paths.h" - #define XC_WANT_COMPAT_MAP_FOREIGN_API #define XC_INTERNAL_COMPAT_MAP_FOREIGN_API #include "xenctrl.h" diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 2ce92d247e..b49e5059f2 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -111,7 +111,7 @@ libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz genpath-target = $(call buildmakevars2header,_paths.h) $(eval $(genpath-target)) -xc_private.h: _paths.h +$(LIB_OBJS) $(PIC_OBJS): _paths.h -include $(DEPS_INCLUDE) diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 0ce6364963..128353029c 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,6 +19,7 @@ #include #include "xc_private.h" +#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index f5f9e89fee..87425d862a 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -39,7 +39,7 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h +$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) %.c %.h:: %.y @rm -f $*.[ch] @@ -49,14 +49,10 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h @rm -f $*.[ch] $(FLEX) --header-file=$*.h --outfile=$*.c $< -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -include $(DEPS_INCLUDE) clean: cleanlocal .PHONY: cleanlocal cleanlocal: - $(RM) -f _*.h $(RM) -f libxlutil.map -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:01:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:01:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243297.420836 (Exim 4.92) (envelope-from ) id 1mvPbm-0003zy-2i; Thu, 09 Dec 2021 20:01:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243297.420836; Thu, 09 Dec 2021 20:01:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbl-0003zq-W7; Thu, 09 Dec 2021 20:01:37 +0000 Received: by outflank-mailman (input) for mailman id 243297; Thu, 09 Dec 2021 20:01:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbk-0003zZ-JT for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbk-0000rh-Il for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPbk-0005Nw-I4 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ro3rjwh+WX3WuU2YQPM/FZeNPytvIE7gNe925hoZAQc=; b=LoZvoJAQe8tk/53LfT8VOhtDsg isQsnK71xZPURdOTQ6zwa2zry3bTjXLwQ5oRJh6kMU7WaZiTyr2OgMlKTEZ/OonOoyaLw4dY3t3x6 jjdqCFdoZNpnOZPfnsyRpwCEH/HGLxap25LIJ9GFok68JOBRJgczoSFG6P05p9vTYSMA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs: Remove -Iinclude from CFLAGS Message-Id: Date: Thu, 09 Dec 2021 20:01:36 +0000 commit 870cbd1c820967cd01dd77de7427ce06d5a9532d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:48 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs: Remove -Iinclude from CFLAGS They are no more directory libs/*/include. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index ebdb2a4782..830bdc851f 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -12,7 +12,7 @@ MINOR ?= 0 SHLIB_LDFLAGS += -Wl,--version-script=libxen$(LIBNAME).map CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += -I./include $(CFLAGS_xeninclude) +CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) LDUSELIBS = $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:01:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:01:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243298.420840 (Exim 4.92) (envelope-from ) id 1mvPbw-00043L-5K; Thu, 09 Dec 2021 20:01:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243298.420840; Thu, 09 Dec 2021 20:01:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbw-00043D-2b; Thu, 09 Dec 2021 20:01:48 +0000 Received: by outflank-mailman (input) for mailman id 243298; Thu, 09 Dec 2021 20:01:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbu-00042z-MM for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPbu-0000t4-LZ for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPbu-0005Oh-Kt for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9nA/mGu0l4GfIYc/CEHW+i9gVgNPGRP2P6b2YET1fag=; b=wTBMJphhV7mMT0NanIoGn8B5t9 VlrDtqproDOndIO9dudE7N20XSxGY5MKdviforo+FEfBm/UfIxs7QetCBKHU4KWVTABDuQVE/QfeS Jiqimf5i4Vhs//jbASdi4ZUeOyEcQpBK0Tr4CXoRLYbYYxIGRkJSJp6e/lv4V/+0qztU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/libs.mk: Remove generic variable that already exist Message-Id: Date: Thu, 09 Dec 2021 20:01:46 +0000 commit 0f4c576473c7819bdedec834297d76bbe4c0f804 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:49 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/libs.mk: Remove generic variable that already exist comma, empty, space are already defined in "Config.mk". Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 830bdc851f..dfbbef4080 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -26,9 +26,6 @@ ifneq ($(nosharedlibs),y) LIB += lib$(LIB_FILE_NAME).so endif -comma:= , -empty:= -space:= $(empty) $(empty) PKG_CONFIG ?= $(LIB_FILE_NAME).pc PKG_CONFIG_NAME ?= Xen$(LIBNAME) PKG_CONFIG_DESC ?= The $(PKG_CONFIG_NAME) library for Xen hypervisor -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:01:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:01:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243299.420845 (Exim 4.92) (envelope-from ) id 1mvPc6-00046K-7N; Thu, 09 Dec 2021 20:01:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243299.420845; Thu, 09 Dec 2021 20:01:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPc6-000468-4A; Thu, 09 Dec 2021 20:01:58 +0000 Received: by outflank-mailman (input) for mailman id 243299; Thu, 09 Dec 2021 20:01:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPc4-00045t-Pb for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPc4-0000tj-Oh for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPc4-0005PR-Nt for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:01:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PukMbfQHG+pA5P767W2GpecuetP2PBncYHipm5Yv+cg=; b=ff33qPmMZyg0jiJnRbMBpHkihQ XUbKoXJ+XpvrsqK7jXGPLwgEmEYOaWyfzt4WrMtNtmc/NWu4xyeTjxEaLetvCKaBsjFVHOBfmZ/bs dJOJfCXQ1McTFWKpPcGMLWJk1Ezo1+VQ7QlEjOq2dJ8GHkQWYRfMtd+oj4LRaf79koXQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/guest: Drop spurious include in Makefile Message-Id: Date: Thu, 09 Dec 2021 20:01:56 +0000 commit 4d1586c7b420d762ca2b6e07264a2b6c35f19618 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:50 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/guest: Drop spurious include in Makefile This include hasn't been useful since e567964a54 (tools: drop ia64 support). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/guest/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index b49e5059f2..c6d882e239 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -71,8 +71,6 @@ SRCS-y += xg_dom_decompress_unsafe_xz.c SRCS-y += xg_dom_decompress_unsafe_zstd.c endif --include $(XEN_TARGET_ARCH)/Makefile - CFLAGS += -Werror -Wmissing-prototypes CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS += -D__XEN_TOOLS__ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:02:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:02:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243300.420848 (Exim 4.92) (envelope-from ) id 1mvPcG-000498-8V; Thu, 09 Dec 2021 20:02:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243300.420848; Thu, 09 Dec 2021 20:02:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcG-000490-5a; Thu, 09 Dec 2021 20:02:08 +0000 Received: by outflank-mailman (input) for mailman id 243300; Thu, 09 Dec 2021 20:02:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcE-00048g-Sh for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcE-0000u0-S1 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPcE-0005R9-R4 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8Fz9UJgqXp7jfUMoo8ttmLR+XGuoFC2wA5VPZfDncXk=; b=sLpEt8KbYZuo7JsEaOqlZ60HEH KMc0Vo6u2KbBAR3CK+hS/BFtzv40QZJrKqzpMtFPIicpsyjEKt9zbbXqFux0vUV9mi5nUinJIRW01 3+BS+9rXJHr6KyTscnQFnII1LvpcGOq5/NRVNM8UGtICr07RfhcZESt6J0XXSHLYI9Rk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/light: Remove non-existing CFLAGS_libxl.o var Message-Id: Date: Thu, 09 Dec 2021 20:02:06 +0000 commit 7db8ea9ad875e4ba3776f3e85f1226662a24f75d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:51 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/light: Remove non-existing CFLAGS_libxl.o var This var was originally $(CFLAGS_$*.o), and probably was copied from the generic %.o:%.c rules. Nothing sets CFLAGS_libxl.o, so remove it. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 194bc5f268..975413ade8 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -200,7 +200,7 @@ libxl.api-ok: check-libxl-api-rules _libxl.api-for-check touch $@ _libxl.api-for-check: $(XEN_INCLUDE)/libxl.h $(AUTOINCS) - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_libxl.o) -c -E $< $(APPEND_CFLAGS) \ + $(CC) $(CPPFLAGS) $(CFLAGS) -c -E $< $(APPEND_CFLAGS) \ -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ >$@.new mv -f $@.new $@ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:02:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:02:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243302.420855 (Exim 4.92) (envelope-from ) id 1mvPcQ-0004Cp-Ap; Thu, 09 Dec 2021 20:02:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243302.420855; Thu, 09 Dec 2021 20:02:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcQ-0004Ch-7j; Thu, 09 Dec 2021 20:02:18 +0000 Received: by outflank-mailman (input) for mailman id 243302; Thu, 09 Dec 2021 20:02:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcP-0004CX-01 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcO-0000uE-VV for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPcO-0005SH-Uj for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XMnITDnuQUZedCDBqeCQ3/NMHhGAqtnMEbGMjNp3uCk=; b=1rBuVbwngfpeVEAvBrgeVmMOAs nAFWf8l6eyRZ1qQI5xKuVD6REGQ104yHGwfJ1H1LuTO3Tq3p/86R55AV+n+tDpktXxU7CxowX8UZp Zh9Ur7MnFGU1kkxjSKr/22ry1ppBMFuAeiNVDlOV1KY9l4ynVN6J4mpFd7aejnhbud5Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/light: Remove -I. Message-Id: Date: Thu, 09 Dec 2021 20:02:16 +0000 commit 3e87c09ddd961edb6b5726ba8376c2f1959611db Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:52 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/light: Remove -I. There is no need to include current directory. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 975413ade8..bfd58226ce 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -44,7 +44,6 @@ SRCS-$(CONFIG_X86) += $(ACPI_OBJS:.o=.c) CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. CFLAGS-$(CONFIG_X86) += -DCONFIG_PCI_SUPP_LEGACY_IRQ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:02:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:02:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243304.420862 (Exim 4.92) (envelope-from ) id 1mvPca-0004Fw-Co; Thu, 09 Dec 2021 20:02:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243304.420862; Thu, 09 Dec 2021 20:02:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPca-0004Fo-9t; Thu, 09 Dec 2021 20:02:28 +0000 Received: by outflank-mailman (input) for mailman id 243304; Thu, 09 Dec 2021 20:02:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcZ-0004Fd-6k for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcZ-0000uS-60 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPcZ-0005TV-1f for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZQtrnBoV1Qolfd98b9IO3awwwCJOsM690QAsonssDEI=; b=fND4wHbJ0owdeaN7+JL+uZ96TI l0fG2ThCMg2qo2g6VVqXr1tikNcx+pC285aUlfsuThgM3tjL8NXL75H51RqB29oIkBxC8HulD3Wy6 7y5r+OI73psSLizrajVMwVpxshk/35h1Grj3ral/fLIFn+YeeoQeYl6zbwYGUuXxEHTk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/stat: Remove duplicated CFLAGS from deps Message-Id: Date: Thu, 09 Dec 2021 20:02:27 +0000 commit bca2eab9b52cff470bd9e16b07d370b38a98f438 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:53 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/stat: Remove duplicated CFLAGS from deps Those CFLAGS_* are already added in libs.mk via USELIBS_stat. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/stat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index c99508ae6b..911a2de8ec 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -15,7 +15,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) -include $(XEN_ROOT)/tools/config.h +CFLAGS += -include $(XEN_ROOT)/tools/config.h SRCS-y += xenstat.c SRCS-y += xenstat_qmp.c -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:02:39 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:02:39 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243305.420867 (Exim 4.92) (envelope-from ) id 1mvPcl-0004JF-EP; Thu, 09 Dec 2021 20:02:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243305.420867; Thu, 09 Dec 2021 20:02:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcl-0004J5-BE; Thu, 09 Dec 2021 20:02:39 +0000 Received: by outflank-mailman (input) for mailman id 243305; Thu, 09 Dec 2021 20:02:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcj-0004Ik-9k for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcj-0000ui-92 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPcj-0005UW-8K for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uFY304PyKfFpMGIlaVcO6ST720VpooG5J4W9lQh3KoI=; b=Zhl0kwTZCNyWmFNXPAE8CcmL47 s7Ljb7kl3Dvggq16C/QreIehjgTw8NliWmVC0uUvfBo6dOBzsVIvqc6zhzEqwBq/4tUKjUZ14rZlm QW2VD0KSQV6JTfhEMzMsp8R688GNG3pYhHlp2W0+Be13GgY6G+D9hhLjxxke3NENN1+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/store: Remove PKG_CONFIG_REMOVE Message-Id: Date: Thu, 09 Dec 2021 20:02:37 +0000 commit d739f78ef6c4d5e467401c71b218e8249fde0574 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:54 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/store: Remove PKG_CONFIG_REMOVE PKG_CONFIG_REMOVE doesn't do anything anymore. Commit dd33fd2e81 (tools: split libxenstore into new tools/libs/store directory) had reintroduced it without saying why. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/store/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 43b018aa8c..c208dbb48a 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -27,8 +27,6 @@ CFLAGS += -I $(XEN_ROOT)/tools/xenstore xs.opic: CFLAGS += -DUSE_PTHREAD ifeq ($(CONFIG_Linux),y) xs.opic: CFLAGS += -DUSE_DLSYM -else -PKG_CONFIG_REMOVE += -ldl endif -include $(DEPS_INCLUDE) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:02:49 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:02:49 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243306.420870 (Exim 4.92) (envelope-from ) id 1mvPcv-0004M7-Fr; Thu, 09 Dec 2021 20:02:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243306.420870; Thu, 09 Dec 2021 20:02:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPcv-0004Lz-Cf; Thu, 09 Dec 2021 20:02:49 +0000 Received: by outflank-mailman (input) for mailman id 243306; Thu, 09 Dec 2021 20:02:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPct-0004Lg-Cc for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPct-0000uv-Bv for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPct-0005VQ-BJ for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iYf1B+JjYzPZXbvT6b5KMS7eJSnoKgJ6B5fyN6azWFE=; b=aKIzpxl0iEzvEyXqQco41igoZ8 nm9wmFp1HdmfjfKhjlgqdbRRo8aJsofzNQEsCugHMDZF90IvB2s4xNFpYh1D5b/EGJoB3zgvAcjYA 49AY4B4G3dYE1hblsuOESKogCv3FPkVOOyzRKOSElTksInI7xgW/Nane8kwkKMpWgt2A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: remove some unneeded subdir-distclean-* targets Message-Id: Date: Thu, 09 Dec 2021 20:02:47 +0000 commit c2a535325e9948c911ce558e9487339f912867f0 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:55 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools: remove some unneeded subdir-distclean-* targets Those two are already covered by subdir-distclean-% target in Rules.mk. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/Makefile | 3 --- tools/firmware/Makefile | 3 --- 2 files changed, 6 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 757a560be0..8936b754c8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -296,9 +296,6 @@ subdir-uninstall-debugger/kdd: .phony subdir-all-debugger/kdd: .phony $(MAKE) -C debugger/kdd all -subdir-distclean-firmware: .phony - $(MAKE) -C firmware distclean - subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 1f27117794..345037b93b 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -85,9 +85,6 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean -subdir-distclean-etherboot: .phony - $(MAKE) -C etherboot distclean - subdir-distclean-ovmf-dir: .phony rm -rf ovmf-dir ovmf-dir-remote -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 09 20:02:59 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 09 Dec 2021 20:02:59 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243307.420874 (Exim 4.92) (envelope-from ) id 1mvPd5-0004PP-H3; Thu, 09 Dec 2021 20:02:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243307.420874; Thu, 09 Dec 2021 20:02:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPd5-0004PH-E9; Thu, 09 Dec 2021 20:02:59 +0000 Received: by outflank-mailman (input) for mailman id 243307; Thu, 09 Dec 2021 20:02:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPd3-0004Ov-FS for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvPd3-0000vU-En for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvPd3-0005WY-E6 for xen-changelog@lists.xenproject.org; Thu, 09 Dec 2021 20:02:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2ymhkK8O0NVIPgqPDoP+BwsBwKqv/LyHZzOtOuRjR9g=; b=iOwoKZBzLmd9Q2Y0tvZVNqaJse 8m+6JwSblWuOcaLA/Nm3q3yimep/LY/b70TT+iHMQA0qMHXzdcAZIqpAEOXl2L1jdRwHDuwXcOSjn 7y4CGQGkduZtsTyjHe42Y/mr+j6xwcQ7QAzFfCIUcf6WU82bPWOazfjKOW7HKHOO/qo0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/firmware/hvmloader: remove "subdirs-*" prerequisite Message-Id: Date: Thu, 09 Dec 2021 20:02:57 +0000 commit 1384d4e1e4ef6e846a1cac54f6d2868d40309607 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:56 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/firmware/hvmloader: remove "subdirs-*" prerequisite hvmloader's last subdir have been removed in 73b72736e6 ("acpi: Move ACPI code to tools/libacpi"), so there is no need to use "subdirs-*" target anymore. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/firmware/hvmloader/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index e980ce7c5f..b754220839 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -60,7 +60,7 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) endif .PHONY: all -all: acpi subdirs-all +all: acpi $(MAKE) hvmloader .PHONY: acpi @@ -104,7 +104,7 @@ endif mv $@.new $@ .PHONY: clean -clean: subdirs-clean +clean: rm -f roms.inc roms.inc.new acpi.h rm -f hvmloader hvmloader.tmp *.o $(DEPS_RM) $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:33:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:33:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243650.421518 (Exim 4.92) (envelope-from ) id 1mvcH4-0006HH-1y; Fri, 10 Dec 2021 09:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243650.421518; Fri, 10 Dec 2021 09:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcH3-0006H9-V4; Fri, 10 Dec 2021 09:33:05 +0000 Received: by outflank-mailman (input) for mailman id 243650; Fri, 10 Dec 2021 09:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcH2-0006Gw-I2 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcH2-000295-HI for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcH2-0003Tm-GD for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DCw7zmtqn+/8QZU0Q9pw1t/m5OKOAFWFGdXIQt/Y+/U=; b=dp4DXvkWQD13nohSkBbmT7A3yt ITxk/LUHTs52kylkAbmscD4pwgaRjGGtG4AY/cnJtUpciuhOoUKusUwaDjd3Fo8iVsyYHhbCKvzyY 5NvoevgkwgCfqhJiTG5WeQsqBd7nRQlXydcbiG3fbGHrl/RM88Wm57ORpCIZH7QkK5Wo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libxc: correct bounce direction in xc_get_device_group() Message-Id: Date: Fri, 10 Dec 2021 09:33:04 +0000 commit 22592f1c5e789e4606f0a6fb88e5f1244a8384c9 Author: Jan Beulich AuthorDate: Fri Dec 10 10:25:12 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 10:25:12 2021 +0100 libxc: correct bounce direction in xc_get_device_group() The array of IDs is an output. Fixes: 79647c5bc9c6 ("libxc: convert domctl interfaces over to hypercall buffers") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross --- tools/libs/ctrl/xc_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libs/ctrl/xc_domain.c b/tools/libs/ctrl/xc_domain.c index b155d6afd2..20b86d986c 100644 --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -1546,7 +1546,8 @@ int xc_get_device_group( { int rc; DECLARE_DOMCTL; - DECLARE_HYPERCALL_BOUNCE(sdev_array, max_sdevs * sizeof(*sdev_array), XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BOUNCE(sdev_array, max_sdevs * sizeof(*sdev_array), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); if ( xc_hypercall_bounce_pre(xch, sdev_array) ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:33:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:33:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243651.421524 (Exim 4.92) (envelope-from ) id 1mvcHE-0006KG-5n; Fri, 10 Dec 2021 09:33:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243651.421524; Fri, 10 Dec 2021 09:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHE-0006K2-0O; Fri, 10 Dec 2021 09:33:16 +0000 Received: by outflank-mailman (input) for mailman id 243651; Fri, 10 Dec 2021 09:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHC-0006Jf-LD for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHC-00029F-KT for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcHC-0003Ue-JV for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W53ziBksjG6bYSM1EAiKac+4MTO5WeeJY6vdDgqeE0M=; b=Vc0dYd0cFIXyYDqhanDOd6Y4k3 MQ5DzQFGwIfumTvqZzDtj2uCk07Y5HEL7mZndPgjlB7ugezHhRbWXF8ZDG+1WW3J8/S7YW6pZ03Zs 2PbDrQVrsbmXc6inJmVGN3H0542DSSW2QUv8oNVCM/nbnXTCbXyl0lXLIuiaZy9MClgI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] perfc: conditionalize credit/credit2 counters Message-Id: Date: Fri, 10 Dec 2021 09:33:14 +0000 commit ab6ba8c6753fa7642de2ffc84f6decadc6c40c2c Author: Jan Beulich AuthorDate: Fri Dec 10 10:25:44 2021 +0100 Commit: Jan Beulich CommitDate: 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 Reviewed-by: Luca Fancellu --- xen/include/xen/perfc_defn.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 08b182ccd9..13486d3ed9 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -37,6 +37,7 @@ PERFCOUNTER(tickled_busy_cpu, "sched: tickled_busy_cpu") PERFCOUNTER(unit_check, "sched: unit_check") /* credit specific counters */ +#ifdef CONFIG_SCHED_CREDIT PERFCOUNTER(delay_ms, "csched: delay") PERFCOUNTER(acct_run, "csched: acct_run") PERFCOUNTER(acct_no_work, "csched: acct_no_work") @@ -58,8 +59,10 @@ PERFCOUNTER(migrate_queued, "csched: migrate_queued") PERFCOUNTER(migrate_running, "csched: migrate_running") PERFCOUNTER(migrate_kicked_away, "csched: migrate_kicked_away") PERFCOUNTER(unit_hot, "csched: unit_hot") +#endif /* credit2 specific counters */ +#ifdef CONFIG_SCHED_CREDIT2 PERFCOUNTER(burn_credits_t2c, "csched2: burn_credits_t2c") PERFCOUNTER(acct_load_balance, "csched2: acct_load_balance") PERFCOUNTER(upd_max_weight_quick, "csched2: update_max_weight_quick") @@ -77,6 +80,7 @@ PERFCOUNTER(credit_reset, "csched2: credit_reset") PERFCOUNTER(deferred_to_tickled_cpu,"csched2: deferred_to_tickled_cpu") PERFCOUNTER(tickled_cpu_overwritten,"csched2: tickled_cpu_overwritten") PERFCOUNTER(tickled_cpu_overridden, "csched2: tickled_cpu_overridden") +#endif PERFCOUNTER(need_flush_tlb_flush, "PG_need_flush tlb flushes") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:33:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:33:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243654.421537 (Exim 4.92) (envelope-from ) id 1mvcHN-0006hn-F1; Fri, 10 Dec 2021 09:33:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243654.421537; Fri, 10 Dec 2021 09:33:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHN-0006hf-Bo; Fri, 10 Dec 2021 09:33:25 +0000 Received: by outflank-mailman (input) for mailman id 243654; Fri, 10 Dec 2021 09:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHM-0006hO-OI for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHM-00029b-NW for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcHM-0003VS-Me for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E9I0yAfwKx9ToxL1ji02KEdDVwRMNxAOnwNclilrX/8=; b=UPTUybiVmUx+8KtnDzbeBYb5yf j5U34mOnOjCatGyWf9Si3cWVRDUm+/XvNkZOYiqmRXradklxILBW2SXsBCP6TxgDEdnkcGz9E91kd pc5CnvTERTFXauu9HlrwxIZybe3Pp9Q49+XnxJ0KXSlhX3ZtY3iM0y5K4dFir/Zlo6vw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: avoid wrong use of all-but-self IPI shorthand Message-Id: Date: Fri, 10 Dec 2021 09:33:24 +0000 commit 7621880de0bb40bae6436a5b106babc0e4718f4d Author: Jan Beulich AuthorDate: Fri Dec 10 10:26:52 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 10:26:52 2021 +0100 x86: avoid wrong use of all-but-self IPI shorthand With "nosmp" I did observe a flood of "APIC error on CPU0: 04(04), Send accept error" log messages on an AMD system. And rightly so - nothing excludes the use of the shorthand in send_IPI_mask() in this case. Set "unaccounted_cpus" to "true" also when command line restrictions are the cause. Note that PV-shim mode is unaffected by this change, first and foremost because "nosmp" and "maxcpus=" are ignored in this case. Fixes: 5500d265a2a8 ("x86/smp: use APIC ALLBUT destination shorthand when possible") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mpparse.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 42b5ac7871..8faac289ea 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -84,9 +84,14 @@ void __init set_nr_cpu_ids(unsigned int max_cpus) if (!park_offline_cpus) tot_cpus = max_cpus; nr_cpu_ids = min(tot_cpus, NR_CPUS + 0u); - if (park_offline_cpus && nr_cpu_ids < num_processors) - printk(XENLOG_WARNING "SMP: Cannot bring up %u further CPUs\n", - num_processors - nr_cpu_ids); + if (nr_cpu_ids < num_processors) + { + unaccounted_cpus = true; + if (park_offline_cpus) + printk(XENLOG_WARNING + "SMP: Cannot bring up %u further CPUs\n", + num_processors - nr_cpu_ids); + } #ifndef nr_cpumask_bits nr_cpumask_bits = ROUNDUP(nr_cpu_ids, BITS_PER_LONG); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:33:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:33:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243656.421540 (Exim 4.92) (envelope-from ) id 1mvcHX-0006wW-GR; Fri, 10 Dec 2021 09:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243656.421540; Fri, 10 Dec 2021 09:33:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHX-0006wO-DS; Fri, 10 Dec 2021 09:33:35 +0000 Received: by outflank-mailman (input) for mailman id 243656; Fri, 10 Dec 2021 09:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHW-0006w0-R7 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcHW-00029o-QI for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcHW-0003WC-Pd for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8VyJVnwNl6OgM4JF2XdTbJVYzPdXsghVr+hF3Opi7eM=; b=sZGXnnqakhh03cEHFj3N9FoCjQ hPv6jjebd3WcYOD9xIwG0P6u1HG/wzRigqTfrOmWcd+xqIHqT4A3HDTxpwn8o92d7lkojZwOaXPAC c8df3crc6Hw48Rs4lq1i/yIBF6LbZdGYZwHdUrObuog30h5fryIhrCIk1amb7IWd8lmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] MAINTAINERS: widen Anthony's area Message-Id: Date: Fri, 10 Dec 2021 09:33:34 +0000 commit 29e31aaf5d81e57679c2abfe8ffd3851a87042b5 Author: Jan Beulich AuthorDate: Fri Dec 10 10:27:27 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 10:27:27 2021 +0100 MAINTAINERS: widen Anthony's area As was briefly discussed on the December Community Call, I'd like to propose to widen Anthony's maintainership to all of tools/. This then means that the special LIBXENLIGHT entry can go away. Signed-off-by: Jan Beulich Acked-by: Ian Jackson Acked-by: Stefano Stabellini Acked-by: Anthony PERARD --- MAINTAINERS | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e43dc0edce..22ea62d964 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -375,9 +375,11 @@ F: xen/arch/x86/x86_64/kexec_reloc.S LIBS M: Wei Liu +M: Anthony PERARD R: Juergen Gross S: Supported F: tools/include/libxenvchan.h +F: tools/include/libxl*.h F: tools/include/xencall.h F: tools/include/xenctrl*.h F: tools/include/xendevicemodel.h @@ -393,15 +395,6 @@ F: tools/include/xentoolcore*.h F: tools/include/xentoollog.h F: tools/libs/ -LIBXENLIGHT -M: Wei Liu -M: Anthony PERARD -S: Supported -F: tools/include/libxl*.h -F: tools/libs/light/ -F: tools/libs/util/ -F: tools/xl/ - LIVEPATCH M: Konrad Rzeszutek Wilk M: Ross Lagerwall @@ -514,6 +507,7 @@ F: xen/include/asm-arm/tee TOOLSTACK M: Wei Liu +M: Anthony PERARD S: Supported F: autogen.sh F: config/*.in -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:55:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:55:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243715.421650 (Exim 4.92) (envelope-from ) id 1mvccJ-000761-Pg; Fri, 10 Dec 2021 09:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243715.421650; Fri, 10 Dec 2021 09:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccJ-00075t-Ma; Fri, 10 Dec 2021 09:55:03 +0000 Received: by outflank-mailman (input) for mailman id 243715; Fri, 10 Dec 2021 09:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccI-00075j-0w for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccI-0002Zq-0D for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvccH-0004rt-VJ for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KqkZQVAuAJ/tdUIkYOydb8RSnu/x8lx2I+85ioI8gAQ=; b=c8SaA7+f+Fe6zQhysniC/mdtXG jRhrBtPd//YzPPbHPSGcDyFIy7CxboiziQQYPrRFl30KhUiNkuAX35l0c5eRXwsG1cr2pCJthgEcG rsRKMej0vVx+GLobEof9csejBbCsT9yOOdczQ+TnVKCaWJVL3xtk0y7ZDEBUUeJbswHc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/build: Move exception tables into __ro_after_init Message-Id: Date: Fri, 10 Dec 2021 09:55:01 +0000 commit a0c3cd03ce76313a7c461ecb3e70b513a15453f7 Author: Andrew Cooper AuthorDate: Mon Dec 6 13:07:08 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 x86/build: Move exception tables into __ro_after_init Since c/s 79713ed0a94c ("x86: move both exception tables into .rodata") in 2016, we've been (ab)using the fact that .rodata is read/write during early boot, so we can sort the two tables. Now that we have a real __ro_after_init concept, reposition them to better match reality. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Wei Liu --- xen/arch/x86/xen.lds.S | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 4db5b404e0..ca22e984f8 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -100,6 +100,18 @@ SECTIONS __ro_after_init_start = .; *(.data.ro_after_init) + + . = ALIGN(8); + /* Exception table */ + __start___ex_table = .; + *(.ex_table) + __stop___ex_table = .; + + /* Pre-exception table */ + __start___pre_ex_table = .; + *(.ex_table.pre) + __stop___pre_ex_table = .; + . = ALIGN(PAGE_SIZE); __ro_after_init_end = .; @@ -129,17 +141,6 @@ SECTIONS *(.note.gnu.build-id) __note_gnu_build_id_end = .; #endif - . = ALIGN(8); - /* Exception table */ - __start___ex_table = .; - *(.ex_table) - __stop___ex_table = .; - - /* Pre-exception table */ - __start___pre_ex_table = .; - *(.ex_table.pre) - __stop___pre_ex_table = .; - #ifdef CONFIG_HAS_VPCI . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:55:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243716.421654 (Exim 4.92) (envelope-from ) id 1mvccT-000789-Qz; Fri, 10 Dec 2021 09:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243716.421654; Fri, 10 Dec 2021 09:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccT-000781-O4; Fri, 10 Dec 2021 09:55:13 +0000 Received: by outflank-mailman (input) for mailman id 243716; Fri, 10 Dec 2021 09:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccS-00077t-3z for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccS-0002a4-3K for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvccS-0004t9-2Q for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZzlY5+lPTo1I/Nr70MS6dqC9ubSo5eTDkcNYYt66yaM=; b=g2yMKazQJvlKes6D3UDVOKXm1g dyrBRIEHgVCwM3K96Rw1kyhjBmJZdoxwQAl6+jUb9Dd5Xc8bMFDf7cw86P3aKB4C7Z0NK9f4Hc/J3 K4UIJnU9oOoxCpNPw8nkcMMX2LQvhNZjiQhUOdIWFKBXV4x+0DPBFX1+wqh1QUo8ECFI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/helpers: fix PVH xenstore-stubdom console parameters Message-Id: Date: Fri, 10 Dec 2021 09:55:12 +0000 commit 1e8b732de1e78eb978b59390a81f9bf01c16e0aa Author: Juergen Gross AuthorDate: Wed Dec 8 09:47:44 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/helpers: fix PVH xenstore-stubdom console parameters When using a PVH mode xenstore-stubdom the frame number of the console should be a PFN instead of a MFN. Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper --- tools/helpers/init-xenstore-domain.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index b205a79ee6..9457d0251b 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -30,7 +30,7 @@ static char *param; static char *name = "Xenstore"; static int memory; static int maxmem; -static xen_pfn_t console_mfn; +static xen_pfn_t console_gfn; static xc_evtchn_port_or_error_t console_evtchn; static struct option options[] = { @@ -283,7 +283,9 @@ static int build(xc_interface *xch) } rv = 0; - console_mfn = xc_dom_p2m(dom, dom->console_pfn); + console_gfn = (dom->container_type == XC_DOM_PV_CONTAINER) + ? xc_dom_p2m(dom, dom->console_pfn) + : dom->console_pfn; err: if ( dom ) @@ -528,7 +530,7 @@ int main(int argc, char** argv) do_xs_write_dir_node(xsh, fe_path, "tty", ""); snprintf(buf, 16, "%d", console_evtchn); do_xs_write_dir_node(xsh, fe_path, "port", buf); - snprintf(buf, 16, "%ld", console_mfn); + snprintf(buf, 16, "%ld", console_gfn); do_xs_write_dir_node(xsh, fe_path, "ring-ref", buf); xs_close(xsh); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:55:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243717.421657 (Exim 4.92) (envelope-from ) id 1mvccd-0007BO-SN; Fri, 10 Dec 2021 09:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243717.421657; Fri, 10 Dec 2021 09:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccd-0007BG-PY; Fri, 10 Dec 2021 09:55:23 +0000 Received: by outflank-mailman (input) for mailman id 243717; Fri, 10 Dec 2021 09:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccc-0007B4-7W for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccc-0002aI-6m for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvccc-0004ug-5l for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=O6gGg//GcdiVoY5cNu5kvVPhz4bRW4u2ALcARqvbLYs=; b=A9/LRTJwKQUNCTR+Lp/EwqR+gV kfRj9kigNPG4/VvmFEMlKd3abwaK0NUNlhKAP7qkM0t32P5lNhKnbK5ZMhuFkgailrhJnsqr4cpMe 8W06KTD2geVYlm2vsl0X2Ksw0MbAnZQcWP46JjJ/uUu3NheCdnm5PPPVOhTHhJX14/VE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: set event channel HVM parameters in libxenguest Message-Id: Date: Fri, 10 Dec 2021 09:55:22 +0000 commit 1d896a0ef7df2bf4c74c3c5272e0d341038eea8b Author: Juergen Gross AuthorDate: Wed Dec 8 09:47:45 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools: set event channel HVM parameters in libxenguest The HVM parameters for pre-allocated event channels should be set in libxenguest, like it is done for PV guests, and the ring pages that libxenguest allocates. Suggested-by: Andrew Cooper Signed-off-by: Juergen Gross Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/libs/guest/xg_dom_x86.c | 6 ++++++ tools/libs/light/libxl_dom.c | 15 ++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/libs/guest/xg_dom_x86.c b/tools/libs/guest/xg_dom_x86.c index b6e75afba2..9328fbf804 100644 --- a/tools/libs/guest/xg_dom_x86.c +++ b/tools/libs/guest/xg_dom_x86.c @@ -1866,6 +1866,12 @@ static int bootlate_hvm(struct xc_dom_image *dom) munmap(hvm_info_page, PAGE_SIZE); } + if ( xc_hvm_param_set(xch, domid, HVM_PARAM_CONSOLE_EVTCHN, + dom->console_evtchn) || + xc_hvm_param_set(xch, domid, HVM_PARAM_STORE_EVTCHN, + dom->xenstore_evtchn) ) + return -1; + return 0; } diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index fe9f760f71..c9c24666cd 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -723,9 +723,8 @@ out: static int hvm_build_set_params(xc_interface *handle, uint32_t domid, libxl_domain_build_info *info, - int store_evtchn, unsigned long *store_mfn, - int console_evtchn, unsigned long *console_mfn, - domid_t store_domid, domid_t console_domid) + unsigned long *store_mfn, + unsigned long *console_mfn) { struct hvm_info_table *va_hvm; uint8_t *va_map, sum; @@ -752,8 +751,6 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); - xc_hvm_param_set(handle, domid, HVM_PARAM_STORE_EVTCHN, store_evtchn); - xc_hvm_param_set(handle, domid, HVM_PARAM_CONSOLE_EVTCHN, console_evtchn); *store_mfn = str_mfn; *console_mfn = cons_mfn; @@ -1123,7 +1120,9 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->vga_hole_size = device_model ? LIBXL_VGA_HOLE_SIZE : 0; dom->device_model = device_model; dom->max_vcpus = info->max_vcpus; + dom->console_evtchn = state->console_port; dom->console_domid = state->console_domid; + dom->xenstore_evtchn = state->store_port; dom->xenstore_domid = state->store_domid; rc = libxl__domain_device_construct_rdm(gc, d_config, @@ -1169,10 +1168,8 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (rc != 0) goto out; - rc = hvm_build_set_params(ctx->xch, domid, info, state->store_port, - &state->store_mfn, state->console_port, - &state->console_mfn, state->store_domid, - state->console_domid); + rc = hvm_build_set_params(ctx->xch, domid, info, &state->store_mfn, + &state->console_mfn); if (rc != 0) { LOG(ERROR, "hvm build set params failed"); goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:55:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243718.421662 (Exim 4.92) (envelope-from ) id 1mvccn-0007EX-U7; Fri, 10 Dec 2021 09:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243718.421662; Fri, 10 Dec 2021 09:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccn-0007EL-R3; Fri, 10 Dec 2021 09:55:33 +0000 Received: by outflank-mailman (input) for mailman id 243718; Fri, 10 Dec 2021 09:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccm-0007E8-Ao for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccm-0002aS-A7 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvccm-0004vF-96 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ogq6gsoi3TVcnfMGmxpmjK5JiZxNJkH1L0WYt+RDrLU=; b=P/n1jLJL35wGXH/NtvDPHw6OV8 qmt5NPJG0ZBi2JZT2Tevi0vGw9vn5BXWY6cV+gAxfypozC8/3QaiTYByWAZvPL0WBw/sYnZhOYOJQ DEkTXD4C2u9+2ztmla6hBy9uhz8Ead3gI2Hqj5Mc/0wo8NtT6Jj7oOZgvkgVEaUSKbeI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/ctrl: Save errno only once in *PRINTF() and *ERROR() Message-Id: Date: Fri, 10 Dec 2021 09:55:32 +0000 commit f10202d5c7c296c52a69775a4faab7db1b2e478d Author: Juergen Gross AuthorDate: Thu Dec 9 14:40:54 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/libs/ctrl: Save errno only once in *PRINTF() and *ERROR() All *PRINTF() and *ERROR() macros are based on xc_reportv() which is saving and restoring errno in order to not modify it. There is no need to save and restore in those macros, too. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- tools/libs/ctrl/xc_private.h | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index 2e483590e6..6fc98a35a8 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -122,28 +122,18 @@ void xc_report_progress_step(xc_interface *xch, /* anamorphic macros: struct xc_interface *xch must be in scope */ -#define IPRINTF(_f, _a...) do { int IPRINTF_errno = errno; \ - xc_report(xch, xch->error_handler, XTL_INFO,0, _f , ## _a); \ - errno = IPRINTF_errno; \ - } while (0) -#define DPRINTF(_f, _a...) do { int DPRINTF_errno = errno; \ - xc_report(xch, xch->error_handler, XTL_DETAIL,0, _f , ## _a); \ - errno = DPRINTF_errno; \ - } while (0) -#define DBGPRINTF(_f, _a...) do { int DBGPRINTF_errno = errno; \ - xc_report(xch, xch->error_handler, XTL_DEBUG,0, _f , ## _a); \ - errno = DBGPRINTF_errno; \ - } while (0) - -#define ERROR(_m, _a...) do { int ERROR_errno = errno; \ - xc_report_error(xch,XC_INTERNAL_ERROR,_m , ## _a ); \ - errno = ERROR_errno; \ - } while (0) -#define PERROR(_m, _a...) do { int PERROR_errno = errno; \ - xc_report_error(xch,XC_INTERNAL_ERROR,_m " (%d = %s)", \ - ## _a , errno, xc_strerror(xch, errno)); \ - errno = PERROR_errno; \ - } while (0) +#define IPRINTF(_f, _a...) \ + xc_report(xch, xch->error_handler, XTL_INFO, 0, _f, ## _a) +#define DPRINTF(_f, _a...) \ + xc_report(xch, xch->error_handler, XTL_DETAIL, 0, _f, ## _a) +#define DBGPRINTF(_f, _a...) \ + xc_report(xch, xch->error_handler, XTL_DEBUG, 0, _f, ## _a) + +#define ERROR(_m, _a...) \ + xc_report_error(xch, XC_INTERNAL_ERROR, _m, ## _a) +#define PERROR(_m, _a...) \ + xc_report_error(xch, XC_INTERNAL_ERROR, _m " (%d = %s)", \ + ## _a, errno, xc_strerror(xch, errno)) /* * HYPERCALL ARGUMENT BUFFERS -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:55:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:55:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243719.421666 (Exim 4.92) (envelope-from ) id 1mvccx-0007H7-VS; Fri, 10 Dec 2021 09:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243719.421666; Fri, 10 Dec 2021 09:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccx-0007Gz-SV; Fri, 10 Dec 2021 09:55:43 +0000 Received: by outflank-mailman (input) for mailman id 243719; Fri, 10 Dec 2021 09:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccw-0007Ge-EG for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvccw-0002ac-DW for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvccw-0004w1-CU for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JK9w5/CzkqkidsMyGAh2qS6WWt0f0r7y3gUysoCklsA=; b=ww5xso5rWHfj55XnuoiuT7AO/X yTtngk+lX+xsXq60Fm20slE48B9gou59goF4VRkoLsePcgVdgwB/MLdHK5vs2y5phQXxc1H7w4Ccu Yad1429ubJIO93v5kIC4U44YQnSOE0y3VZr3vovaKliZWdFdxxlwUdG+D6h5T7sYDCWE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/light: set video_mem for PVH guests Message-Id: Date: Fri, 10 Dec 2021 09:55:42 +0000 commit 0a20a53df158eb0724ce6dcd9de70cbdad547d6f Author: Juergen Gross AuthorDate: Fri Dec 3 08:30:58 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/libs/light: set video_mem for PVH guests The size of the video memory of PVH guests should be set to 0 in case no value has been specified. Doing not so will leave it to be -1, resulting in an additional 1 kB of RAM being advertised in the memory map (here the output of a PVH Mini-OS boot with 16 MB of RAM assigned): Memory map: 000000000000-0000010003ff: RAM 0000feff8000-0000feffffff: Reserved 0000fc008000-0000fc00803f: ACPI 0000fc000000-0000fc000fff: ACPI 0000fc001000-0000fc007fff: ACPI Signed-off-by: Juergen Gross Reviewed-by: Roger Pau Monné Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index dcd09d32ba..d7a40d7550 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -427,6 +427,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; case LIBXL_DOMAIN_TYPE_PVH: libxl_defbool_setdefault(&b_info->u.pvh.pvshim, false); + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; if (libxl_defbool_val(b_info->u.pvh.pvshim)) { if (!b_info->u.pvh.pvshim_path) b_info->u.pvh.pvshim_path = -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:55:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243720.421669 (Exim 4.92) (envelope-from ) id 1mvcd8-0007KK-21; Fri, 10 Dec 2021 09:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243720.421669; Fri, 10 Dec 2021 09:55:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcd7-0007KC-VJ; Fri, 10 Dec 2021 09:55:53 +0000 Received: by outflank-mailman (input) for mailman id 243720; Fri, 10 Dec 2021 09:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcd6-0007K0-HQ for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcd6-0002ap-Gl for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcd6-0004wn-Fo for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nLm7YIBPhIiof/nHYLEEf0IPeeK46nRYD6BOBuuDBVM=; b=0dCRyZnEiNe0ipmbam0QlLkS4W YMZ/VJgxSDojFR0f1Kwmu9u5fBcJtiElb+LVNyeipbhhn2x3cb0HjcVEdFV4qlXfYmwNaJFViDMfz zaxGe6dLKmRcPIrHiOlAFKzJZQHycPygf89o3IVPrK9/p8Ml90vsHftcTidiau8i5ieM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] .gitignore: Non existing toolcore/include files. Message-Id: Date: Fri, 10 Dec 2021 09:55:52 +0000 commit 92f3b438f3b5c255022b70310c1f32363f26be7a Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:44 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 .gitignore: Non existing toolcore/include files. 4664034cdc (tools/libs: move official headers to common directory) forgot one .gitignore update. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9513506dd9..cad5aacd8d 100644 --- a/.gitignore +++ b/.gitignore @@ -384,7 +384,6 @@ tools/include/xen-foreign/arm64.h .git tools/misc/xen-hptool tools/misc/xen-mfndump -tools/libs/toolcore/include/_*.h tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz tools/misc/xenhypfs -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:56:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243721.421674 (Exim 4.92) (envelope-from ) id 1mvcdI-0007NA-3S; Fri, 10 Dec 2021 09:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243721.421674; Fri, 10 Dec 2021 09:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdI-0007N0-0Y; Fri, 10 Dec 2021 09:56:04 +0000 Received: by outflank-mailman (input) for mailman id 243721; Fri, 10 Dec 2021 09:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdG-0007Mm-L4 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdG-0002bS-KO for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcdG-0004xl-JY for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d788xMval4VudwDdMu4g/3OHP//JQmr+lFEmV6lhiGI=; b=oLTDZq3M4CRXpczkY4YHsE+hns 2ByWq2btDp+zHc0YsifvZmdHcAnNOHNAe+IQN6ofVTcGHHttuSQC3hnryhxOnErVETwfvlmyhK7uT RnsWZfXs/Aje+i/mgOudBMpBZShM6Av4kRST0BP6eOuDJAW5sZy5CDk/ruoh3krBySOY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/configure.ac: Remove left over system_aio Message-Id: Date: Fri, 10 Dec 2021 09:56:02 +0000 commit 71643161782e1257b2dcb6cebcb6a67467ac42ad Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:45 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/configure.ac: Remove left over system_aio system_aio isn't set since 3d4678108a (tools: remove in tree libaio). Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/configure | 2 -- tools/configure.ac | 1 - 2 files changed, 3 deletions(-) diff --git a/tools/configure b/tools/configure index 21e3a83795..8e4a59c2cb 100755 --- a/tools/configure +++ b/tools/configure @@ -641,7 +641,6 @@ PTHREAD_LIBS PTHREAD_LDFLAGS PTHREAD_CFLAGS EXTFS_LIBS -system_aio zlib libzstd_LIBS libzstd_CFLAGS @@ -8772,7 +8771,6 @@ $as_echo "yes" >&6; } fi - ac_fn_c_check_header_mongrel "$LINENO" "ext2fs/ext2fs.h" "ac_cv_header_ext2fs_ext2fs_h" "$ac_includes_default" if test "x$ac_cv_header_ext2fs_ext2fs_h" = xyes; then : diff --git a/tools/configure.ac b/tools/configure.ac index 3ac62626a5..5a4fb9022d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -402,7 +402,6 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) PKG_CHECK_MODULES([libzstd], [libzstd], [zlib="$zlib -DHAVE_ZSTD $libzstd_CFLAGS $libzstd_LIBS"], [true]) AC_SUBST(zlib) -AC_SUBST(system_aio) AX_CHECK_EXTFS AX_CHECK_PTHREAD AX_CHECK_PTYFUNCS -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:56:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243722.421680 (Exim 4.92) (envelope-from ) id 1mvcdS-0007PR-5y; Fri, 10 Dec 2021 09:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243722.421680; Fri, 10 Dec 2021 09:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdS-0007PI-22; Fri, 10 Dec 2021 09:56:14 +0000 Received: by outflank-mailman (input) for mailman id 243722; Fri, 10 Dec 2021 09:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdQ-0007P1-OH for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdQ-0002bc-Nc for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcdQ-0004yH-MX for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V5pH312E2CX7uA8DI86uBWMCXnM0vMrfHHi+2XCU0q0=; b=sKjkQgdzghBzCep09Dgzp4kc/H VjhwHqk6eIEhPdt5Ybi8BAhl/4dVQ1VGC5lY7VR3a/+o6+guMbFhcfODH/kcjq+giRc0N9/bs8Tq8 YnY97qf2ZDJhW+bhIzoaWDMzVLyn2rdqFIfrgPQAnltLuPDMpqDqrTUBwSYO3wOLfD7A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/Rules.mk: Remove $(CFLAGS.opic) from %.opic: %.S Message-Id: Date: Fri, 10 Dec 2021 09:56:12 +0000 commit ec47d17d2209a1cf8b2d8bc1e563aa89e040727a Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:46 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/Rules.mk: Remove $(CFLAGS.opic) from %.opic: %.S $(CFLAGS.opic) isn't set anywere, never was, just remove it. Signed-off-by: Anthony PERARD --- tools/Rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index b022da3336..4e9b4ee17f 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -155,7 +155,7 @@ INSTALL_PYTHON_PROG = \ %.o: %.S $(CC) $(CFLAGS) $(CFLAGS_$*.o) -c $< -o $@ $(APPEND_CFLAGS) %.opic: %.S - $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS) + $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $< $(APPEND_CFLAGS) subdirs-all subdirs-clean subdirs-install subdirs-distclean subdirs-uninstall: .phony @set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:56:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243723.421683 (Exim 4.92) (envelope-from ) id 1mvcdc-0007SQ-71; Fri, 10 Dec 2021 09:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243723.421683; Fri, 10 Dec 2021 09:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdc-0007SI-3c; Fri, 10 Dec 2021 09:56:24 +0000 Received: by outflank-mailman (input) for mailman id 243723; Fri, 10 Dec 2021 09:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcda-0007S2-RN for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcda-0002bm-Qk for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcda-0004ys-Py for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7vt0pye3IIPB2tlPNC5nfSNTv9P2ywie5OlJqlH1q/k=; b=DP4VWahPqbnfZQ0nrGyQOkZS8x Hk2fUNUtr+qVLT3IN8djmsmad32+ySAzqYMv4lltGVTTkdQGFvtqmRAKCkBQBaWZ8XRKvWgm1KiGL M62FPN391wf2W5TlVPOlTz3uywnag+2hTLtlUHgQYfgzATltOVJzh+LYXkjKg8qYb+9c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs: Remove _paths.h from libs ctrl and util. Message-Id: Date: Fri, 10 Dec 2021 09:56:22 +0000 commit e0c9bd3d67e05508557f58ca4d5ee2b542ea2903 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:47 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs: Remove _paths.h from libs ctrl and util. libxenutil doesn't include _paths.h so no need to generate it. libxenctrl doesn't use macros from _paths.h so can be removed. Fix libxenguest to include _paths.h properly instead of relying on xc_private.h Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- .gitignore | 2 -- tools/libs/ctrl/Makefile | 5 ----- tools/libs/ctrl/xc_private.h | 2 -- tools/libs/guest/Makefile | 2 +- tools/libs/guest/xg_suspend.c | 1 + tools/libs/util/Makefile | 6 +----- 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index cad5aacd8d..111eb03b86 100644 --- a/.gitignore +++ b/.gitignore @@ -117,7 +117,6 @@ tools/libs/hypfs/headers.chk tools/libs/hypfs/xenhypfs.pc tools/libs/call/headers.chk tools/libs/call/xencall.pc -tools/libs/ctrl/_*.[ch] tools/libs/ctrl/libxenctrl.map tools/libs/ctrl/xencontrol.pc tools/libs/foreignmemory/headers.chk @@ -157,7 +156,6 @@ tools/libs/store/utils.h tools/libs/store/xenstore.pc tools/libs/store/xs_lib.c tools/libs/util/*.pc -tools/libs/util/_paths.h tools/libs/util/libxlu_cfg_y.output tools/libs/util/libxenutil.map tools/libs/vchan/headers.chk diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index 519246b0d6..5d866b8d04 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -54,11 +54,6 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) clean: cleanlocal diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index 6fc98a35a8..ebdf78c2bf 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -29,8 +29,6 @@ #include #include -#include "_paths.h" - #define XC_WANT_COMPAT_MAP_FOREIGN_API #define XC_INTERNAL_COMPAT_MAP_FOREIGN_API #include "xenctrl.h" diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 2ce92d247e..b49e5059f2 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -111,7 +111,7 @@ libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz genpath-target = $(call buildmakevars2header,_paths.h) $(eval $(genpath-target)) -xc_private.h: _paths.h +$(LIB_OBJS) $(PIC_OBJS): _paths.h -include $(DEPS_INCLUDE) diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 0ce6364963..128353029c 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,6 +19,7 @@ #include #include "xc_private.h" +#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index f5f9e89fee..87425d862a 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -39,7 +39,7 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h +$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) %.c %.h:: %.y @rm -f $*.[ch] @@ -49,14 +49,10 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h @rm -f $*.[ch] $(FLEX) --header-file=$*.h --outfile=$*.c $< -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -include $(DEPS_INCLUDE) clean: cleanlocal .PHONY: cleanlocal cleanlocal: - $(RM) -f _*.h $(RM) -f libxlutil.map -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:56:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243724.421686 (Exim 4.92) (envelope-from ) id 1mvcdm-0007VK-8S; Fri, 10 Dec 2021 09:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243724.421686; Fri, 10 Dec 2021 09:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdm-0007V8-5B; Fri, 10 Dec 2021 09:56:34 +0000 Received: by outflank-mailman (input) for mailman id 243724; Fri, 10 Dec 2021 09:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdl-0007Uw-00 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdk-0002bq-Tr for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcdk-0004zP-Sx for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+aSRwvjUomIcuG5CASqU0+4RjrPxachj17WBLpAjnzA=; b=j4/ELcm8DwAYvUt7koe28rouwx CXk61Hl3iPWYPy7YP+OaCO9b3eFJf+L/WtoYLtg6v5GF/7E/T4/xwokojN2qcwQwbpM2jIZfugaIA MideXjM9JAwU9yD7Q2LhMtqnyzFiYmRf2IrZQHGVglGDnipnuPl8fM0D8YypsjXlPqaE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs: Remove -Iinclude from CFLAGS Message-Id: Date: Fri, 10 Dec 2021 09:56:32 +0000 commit 870cbd1c820967cd01dd77de7427ce06d5a9532d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:48 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs: Remove -Iinclude from CFLAGS They are no more directory libs/*/include. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index ebdb2a4782..830bdc851f 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -12,7 +12,7 @@ MINOR ?= 0 SHLIB_LDFLAGS += -Wl,--version-script=libxen$(LIBNAME).map CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += -I./include $(CFLAGS_xeninclude) +CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) LDUSELIBS = $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:56:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243725.421690 (Exim 4.92) (envelope-from ) id 1mvcdw-0007YE-9b; Fri, 10 Dec 2021 09:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243725.421690; Fri, 10 Dec 2021 09:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdw-0007Y4-6i; Fri, 10 Dec 2021 09:56:44 +0000 Received: by outflank-mailman (input) for mailman id 243725; Fri, 10 Dec 2021 09:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdv-0007Xr-1V for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcdv-0002bu-0h for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcdu-0004zs-W4 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kmk1fCft9gvJH63aJZk2oB1WbhD5EiKJ1sjSGXxX9Ec=; b=1TmDW4r4Ps1SFUeg+ADfCK/4dl 38XXCqQcePVTes+YkGG3HwWO2IC1LVcs44C7qcLpcoSoIeOUNBeMEFivdf7IOGrv/2qGOLQgeeVSj ce1zYlc/TiEtwXGoqd9CQkBZ5RkWHZLzAbSktthqhEnNHqOjHj71UVYvEuT7hXMNPndU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/libs.mk: Remove generic variable that already exist Message-Id: Date: Fri, 10 Dec 2021 09:56:42 +0000 commit 0f4c576473c7819bdedec834297d76bbe4c0f804 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:49 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/libs.mk: Remove generic variable that already exist comma, empty, space are already defined in "Config.mk". Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 830bdc851f..dfbbef4080 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -26,9 +26,6 @@ ifneq ($(nosharedlibs),y) LIB += lib$(LIB_FILE_NAME).so endif -comma:= , -empty:= -space:= $(empty) $(empty) PKG_CONFIG ?= $(LIB_FILE_NAME).pc PKG_CONFIG_NAME ?= Xen$(LIBNAME) PKG_CONFIG_DESC ?= The $(PKG_CONFIG_NAME) library for Xen hypervisor -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:56:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243726.421694 (Exim 4.92) (envelope-from ) id 1mvce6-0007bt-BE; Fri, 10 Dec 2021 09:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243726.421694; Fri, 10 Dec 2021 09:56:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvce6-0007bl-8B; Fri, 10 Dec 2021 09:56:54 +0000 Received: by outflank-mailman (input) for mailman id 243726; Fri, 10 Dec 2021 09:56:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvce5-0007bb-4S for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvce5-0002dV-3i for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvce5-00050X-2w for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:56:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sBx3w5j8SC/KUHquPKVv9YAmKPFP1s+hjeu6OFAgzwM=; b=F/u8BuMYpH6wSc9yLHDqTfXJMz uzvorffg6tG/MpA/5BH5AZwcMHyqE0eof5YXYCdHLse2FQBTBquEIqLBo7XeXGT31xulv5i98/IEt AAX8uCZm3VL9GWl8H8uiwQCzzfuK2qTQ5pYKoAnp5DhAYo1SDdo8XpQe6RLRlKtdlczU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/guest: Drop spurious include in Makefile Message-Id: Date: Fri, 10 Dec 2021 09:56:53 +0000 commit 4d1586c7b420d762ca2b6e07264a2b6c35f19618 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:50 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/guest: Drop spurious include in Makefile This include hasn't been useful since e567964a54 (tools: drop ia64 support). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/guest/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index b49e5059f2..c6d882e239 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -71,8 +71,6 @@ SRCS-y += xg_dom_decompress_unsafe_xz.c SRCS-y += xg_dom_decompress_unsafe_zstd.c endif --include $(XEN_TARGET_ARCH)/Makefile - CFLAGS += -Werror -Wmissing-prototypes CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS += -D__XEN_TOOLS__ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:57:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243727.421698 (Exim 4.92) (envelope-from ) id 1mvceG-0008GL-Co; Fri, 10 Dec 2021 09:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243727.421698; Fri, 10 Dec 2021 09:57:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceG-0008GD-9g; Fri, 10 Dec 2021 09:57:04 +0000 Received: by outflank-mailman (input) for mailman id 243727; Fri, 10 Dec 2021 09:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceF-0008G4-7X for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceF-0002eC-6l for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvceF-00051J-5y for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bnKjd2olnRqAu0TsxstiYi8iodvdtnF1fHkGo39RqNs=; b=Lcw3/WFrr0SXR1mxQP/gESOAFY Om4SlYu6o7XtAf2mawsGUZ7VXjPF6W0veMi1+3a0FqH75cHT8uvobO2yCv0IUOV6BYFmKMjt9gmcj 2I5drwxRjBLebLzHMKuN8uCRZoT41c0HM3uTwVMUd1CPaNR0bOc2YLLAp6wK7U9rVQVM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/light: Remove non-existing CFLAGS_libxl.o var Message-Id: Date: Fri, 10 Dec 2021 09:57:03 +0000 commit 7db8ea9ad875e4ba3776f3e85f1226662a24f75d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:51 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/light: Remove non-existing CFLAGS_libxl.o var This var was originally $(CFLAGS_$*.o), and probably was copied from the generic %.o:%.c rules. Nothing sets CFLAGS_libxl.o, so remove it. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 194bc5f268..975413ade8 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -200,7 +200,7 @@ libxl.api-ok: check-libxl-api-rules _libxl.api-for-check touch $@ _libxl.api-for-check: $(XEN_INCLUDE)/libxl.h $(AUTOINCS) - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_libxl.o) -c -E $< $(APPEND_CFLAGS) \ + $(CC) $(CPPFLAGS) $(CFLAGS) -c -E $< $(APPEND_CFLAGS) \ -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ >$@.new mv -f $@.new $@ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:57:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:57:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243728.421702 (Exim 4.92) (envelope-from ) id 1mvceR-0008JA-Ea; Fri, 10 Dec 2021 09:57:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243728.421702; Fri, 10 Dec 2021 09:57:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceR-0008J2-BF; Fri, 10 Dec 2021 09:57:15 +0000 Received: by outflank-mailman (input) for mailman id 243728; Fri, 10 Dec 2021 09:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceP-0008Il-Aa for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceP-0002eG-9r for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvceP-00051m-99 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MOjfI8/MIdN5v4wZFeSPN+gmBnSZ43YQEo/vmxTOjCM=; b=o8kPub7kDRtzAfPo27qJadb80w oNJf926mYaN3IFx3EKzvsnsFsgzifKUserpjKXoSjtLmvPz/E2Ti7Sgm3HRpClC0ULlBNNBKfIg62 yH1eeSYVpCt/CaBCnRBLYEOervpICzdVrJv3VxrxqFvOubiDuJsuZoSR/f4AV3B2LuWM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/light: Remove -I. Message-Id: Date: Fri, 10 Dec 2021 09:57:13 +0000 commit 3e87c09ddd961edb6b5726ba8376c2f1959611db Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:52 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/light: Remove -I. There is no need to include current directory. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 975413ade8..bfd58226ce 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -44,7 +44,6 @@ SRCS-$(CONFIG_X86) += $(ACPI_OBJS:.o=.c) CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. CFLAGS-$(CONFIG_X86) += -DCONFIG_PCI_SUPP_LEGACY_IRQ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:57:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:57:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243729.421706 (Exim 4.92) (envelope-from ) id 1mvceb-0008Mc-HA; Fri, 10 Dec 2021 09:57:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243729.421706; Fri, 10 Dec 2021 09:57:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceb-0008MU-EL; Fri, 10 Dec 2021 09:57:25 +0000 Received: by outflank-mailman (input) for mailman id 243729; Fri, 10 Dec 2021 09:57:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceZ-0008Lv-Dd for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvceZ-0002eK-Cx for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvceZ-00052D-C8 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mx+TQe6ZECSeTTo8btbCV15iIbn/D8Vepnb14X7xkS8=; b=Hoc8qDFr8ha9U0MbP3UKAh0XIq L39rAetQnBJ+WlwDYvWpo7dfbBFX4dpLIQE8ZohtS4ZxASdXCKx9cTQicTdUbo2wpJdBLYxqh7XmA AYkFj/H0YW6alpj84sslJ53Whe+LwqR0nRmg024ZRKHHMav0BezfuK1ujFMpNzIJH/28=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/stat: Remove duplicated CFLAGS from deps Message-Id: Date: Fri, 10 Dec 2021 09:57:23 +0000 commit bca2eab9b52cff470bd9e16b07d370b38a98f438 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:53 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/stat: Remove duplicated CFLAGS from deps Those CFLAGS_* are already added in libs.mk via USELIBS_stat. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/stat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index c99508ae6b..911a2de8ec 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -15,7 +15,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) -include $(XEN_ROOT)/tools/config.h +CFLAGS += -include $(XEN_ROOT)/tools/config.h SRCS-y += xenstat.c SRCS-y += xenstat_qmp.c -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:57:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:57:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243731.421710 (Exim 4.92) (envelope-from ) id 1mvcel-0008PK-J8; Fri, 10 Dec 2021 09:57:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243731.421710; Fri, 10 Dec 2021 09:57:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcel-0008PC-Fk; Fri, 10 Dec 2021 09:57:35 +0000 Received: by outflank-mailman (input) for mailman id 243731; Fri, 10 Dec 2021 09:57:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcej-0008Ov-Ge for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcej-0002eU-Fy for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcej-00052h-FE for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lcj48H7uNfsjHWdKLCd7HdWi3K5nezXasNM7HOCciLE=; b=V/CxPKxX7rBsGojRQgd45uH6wQ 6YswB8ZudYZa/9bUwZ0s+8ccAyZlgtgep9uks72v78mUYVt62FcNw24kxLOOV0GOJjypE2s0KNXKT yxF2KG5ilx+Sgrf/kY+7Q2MAMksxovxYlm4ZXnOYDavA1hs2Wx64eLF6RY1b7zx070mc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/store: Remove PKG_CONFIG_REMOVE Message-Id: Date: Fri, 10 Dec 2021 09:57:33 +0000 commit d739f78ef6c4d5e467401c71b218e8249fde0574 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:54 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 libs/store: Remove PKG_CONFIG_REMOVE PKG_CONFIG_REMOVE doesn't do anything anymore. Commit dd33fd2e81 (tools: split libxenstore into new tools/libs/store directory) had reintroduced it without saying why. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/store/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 43b018aa8c..c208dbb48a 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -27,8 +27,6 @@ CFLAGS += -I $(XEN_ROOT)/tools/xenstore xs.opic: CFLAGS += -DUSE_PTHREAD ifeq ($(CONFIG_Linux),y) xs.opic: CFLAGS += -DUSE_DLSYM -else -PKG_CONFIG_REMOVE += -ldl endif -include $(DEPS_INCLUDE) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:57:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:57:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243732.421715 (Exim 4.92) (envelope-from ) id 1mvcev-0008SP-Kh; Fri, 10 Dec 2021 09:57:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243732.421715; Fri, 10 Dec 2021 09:57:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcev-0008SD-HK; Fri, 10 Dec 2021 09:57:45 +0000 Received: by outflank-mailman (input) for mailman id 243732; Fri, 10 Dec 2021 09:57:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcet-0008Ru-Jt for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcet-0002ef-J7 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcet-00053B-IG for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vIvpYl9j8qyDrFldzYzBC9w/IC2bGY5Wt8i+Qa4BSsk=; b=IJe0MRq8wsKf3wV95vYCQyXMIR uBarkYopXUEUclnIsL2LQlJtOu4dyPm0e/dYE0Xagsge94fRFJO8bPbZK9KNuaOkRcqIU2++vdd8e gDR+qd9HM6YDWBhKVP1jrEvH9Rs1+z2fWPfA9GQOuNvgTkSOrjrjUZhx3QIivqOxODog=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: remove some unneeded subdir-distclean-* targets Message-Id: Date: Fri, 10 Dec 2021 09:57:43 +0000 commit c2a535325e9948c911ce558e9487339f912867f0 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:55 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools: remove some unneeded subdir-distclean-* targets Those two are already covered by subdir-distclean-% target in Rules.mk. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/Makefile | 3 --- tools/firmware/Makefile | 3 --- 2 files changed, 6 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 757a560be0..8936b754c8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -296,9 +296,6 @@ subdir-uninstall-debugger/kdd: .phony subdir-all-debugger/kdd: .phony $(MAKE) -C debugger/kdd all -subdir-distclean-firmware: .phony - $(MAKE) -C firmware distclean - subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 1f27117794..345037b93b 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -85,9 +85,6 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean -subdir-distclean-etherboot: .phony - $(MAKE) -C etherboot distclean - subdir-distclean-ovmf-dir: .phony rm -rf ovmf-dir ovmf-dir-remote -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 09:57:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 09:57:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243733.421718 (Exim 4.92) (envelope-from ) id 1mvcf4-0008V2-Lj; Fri, 10 Dec 2021 09:57:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243733.421718; Fri, 10 Dec 2021 09:57:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcf4-0008Uu-If; Fri, 10 Dec 2021 09:57:54 +0000 Received: by outflank-mailman (input) for mailman id 243733; Fri, 10 Dec 2021 09:57:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcf3-0008Um-Mj for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcf3-0002ev-M6 for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvcf3-00053g-LL for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 09:57:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MB3xz1rpaOSVIPyOaUtI8WSBJgm2mAGvMliVSYgB0ds=; b=IO0iyTOsxfgOnAFQ5dKfViXdwg fYeoBmtGfLRjZ5Rbi/Uf0UzsSv3IpzdY+hNrMxvMCg3yq0XLVUq44xrLoH9ky4e0Ul8X66Vhik6sC 1uLEQAm56F8XE+DIUsNZoJhn2be2vzToPUWijGf3d2XTnK5TdNXQt8VBQZP8HKD15D5c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/firmware/hvmloader: remove "subdirs-*" prerequisite Message-Id: Date: Fri, 10 Dec 2021 09:57:53 +0000 commit 1384d4e1e4ef6e846a1cac54f6d2868d40309607 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:56 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 9 16:26:29 2021 +0000 tools/firmware/hvmloader: remove "subdirs-*" prerequisite hvmloader's last subdir have been removed in 73b72736e6 ("acpi: Move ACPI code to tools/libacpi"), so there is no need to use "subdirs-*" target anymore. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/firmware/hvmloader/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index e980ce7c5f..b754220839 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -60,7 +60,7 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) endif .PHONY: all -all: acpi subdirs-all +all: acpi $(MAKE) hvmloader .PHONY: acpi @@ -104,7 +104,7 @@ endif mv $@.new $@ .PHONY: clean -clean: subdirs-clean +clean: rm -f roms.inc roms.inc.new acpi.h rm -f hvmloader hvmloader.tmp *.o $(DEPS_RM) $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 13:11:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 13:11:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243840.421921 (Exim 4.92) (envelope-from ) id 1mvfg3-0005PN-Ha; Fri, 10 Dec 2021 13:11:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243840.421921; Fri, 10 Dec 2021 13:11:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvfg3-0005PF-Eb; Fri, 10 Dec 2021 13:11:07 +0000 Received: by outflank-mailman (input) for mailman id 243840; Fri, 10 Dec 2021 13:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvfg1-0005P9-Ko for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 13:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvfg1-00066M-IA for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 13:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvfg1-0001Ak-Gp for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 13:11:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zIxIk9a4ukL78RXekY0TaKkwYJu/A8zvXwpC9tWSd7o=; b=RKIedE6PAwOkTv4BVTUJVhqHcc F7BzsSNSVbugWNXCBzdPyEZcBhzBJ8dEgBL6qhTAruG2d1q9g3NHw2ezRLC9SXnRN4zzg3/7hehbR emosdLOZm7uSkdcLhEOzhowmG/AWVzfMgUcDPm8hiwn/GxRMq8OW/tUuRdOahinl3X0w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] EFI: constify EFI_LOADED_IMAGE * function parameters Message-Id: Date: Fri, 10 Dec 2021 13:11:05 +0000 commit c6cec7af287aa31123e259b90247b20ef3a7e1a7 Author: Jan Beulich AuthorDate: Fri Dec 10 14:02:59 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 14:02:59 2021 +0100 EFI: constify EFI_LOADED_IMAGE * function parameters Instead of altering Arm's forward declarations, drop them. Like elsewhere we should limit such to cases where the first use lives ahead of the definition. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/efi/efi-boot.h | 24 +++++------------------- xen/arch/x86/efi/efi-boot.h | 2 +- xen/common/efi/boot.c | 4 ++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index c4ed412845..4fb345f225 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -44,20 +44,6 @@ void __flush_dcache_area(const void *vaddr, unsigned long size); static int get_module_file_index(const char *name, unsigned int name_len); static void PrintMessage(const CHAR16 *s); -static int allocate_module_file(EFI_LOADED_IMAGE *loaded_image, - EFI_FILE_HANDLE *dir_handle, - const char *name, - unsigned int name_len); -static int handle_module_node(EFI_LOADED_IMAGE *loaded_image, - EFI_FILE_HANDLE *dir_handle, - int module_node_offset, - int reg_addr_cells, - int reg_size_cells, - bool is_domu_module); -static int handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, - EFI_FILE_HANDLE *dir_handle, - int domain_node); -static int efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image); #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -650,7 +636,7 @@ static void __init PrintMessage(const CHAR16 *s) * This function allocates a binary and keeps track of its name, it returns the * index of the file in the modules array or a negative number on error. */ -static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, +static int __init allocate_module_file(const EFI_LOADED_IMAGE *loaded_image, EFI_FILE_HANDLE *dir_handle, const char *name, unsigned int name_len) @@ -713,7 +699,7 @@ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, * for the reg property into the module DT node. * Returns 1 if module is multiboot,module, 0 if not, < 0 on error */ -static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, +static int __init handle_module_node(const EFI_LOADED_IMAGE *loaded_image, EFI_FILE_HANDLE *dir_handle, int module_node_offset, int reg_addr_cells, @@ -814,7 +800,7 @@ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, * in the DT. * Returns number of multiboot,module found or negative number on error. */ -static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, +static int __init handle_dom0less_domain_node(const EFI_LOADED_IMAGE *loaded_image, EFI_FILE_HANDLE *dir_handle, int domain_node) { @@ -862,7 +848,7 @@ static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, * dom0 and domU guests to be loaded. * Returns the number of multiboot modules found or a negative number for error. */ -static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) +static int __init efi_check_dt_boot(const EFI_LOADED_IMAGE *loaded_image) { int chosen, node, addr_len, size_len; unsigned int i = 0, modules_found = 0; @@ -942,7 +928,7 @@ static void __init efi_arch_halt(void) stop_cpu(); } -static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) +static void __init efi_arch_load_addr_check(const EFI_LOADED_IMAGE *loaded_image) { if ( (unsigned long)loaded_image->ImageBase & ((1 << 12) - 1) ) blexit(L"Xen must be loaded at a 4 KByte boundary."); diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 9b0cc29aae..f69509a210 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -709,7 +709,7 @@ static void __init efi_arch_halt(void) halt(); } -static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) +static void __init efi_arch_load_addr_check(const EFI_LOADED_IMAGE *loaded_image) { xen_phys_start = (UINTN)loaded_image->ImageBase; if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 ) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 114ea8278f..5ceb535ad0 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -389,7 +389,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv, return argc; } -static EFI_FILE_HANDLE __init get_parent_handle(EFI_LOADED_IMAGE *loaded_image, +static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_image, CHAR16 **leaf) { static EFI_GUID __initdata fs_protocol = SIMPLE_FILE_SYSTEM_PROTOCOL; @@ -561,7 +561,7 @@ static int __init __maybe_unused set_color(uint32_t mask, int bpp, } #ifndef CONFIG_HAS_DEVICE_TREE -static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) +static int __init efi_check_dt_boot(const EFI_LOADED_IMAGE *loaded_image) { return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 10 13:11:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 10 Dec 2021 13:11:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.243841.421925 (Exim 4.92) (envelope-from ) id 1mvfgD-0005RC-J0; Fri, 10 Dec 2021 13:11:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 243841.421925; Fri, 10 Dec 2021 13:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvfgD-0005R4-G4; Fri, 10 Dec 2021 13:11:17 +0000 Received: by outflank-mailman (input) for mailman id 243841; Fri, 10 Dec 2021 13:11:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvfgB-0005Qs-MP for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 13:11:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvfgB-00066Q-La for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 13:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvfgB-0001BH-KR for xen-changelog@lists.xenproject.org; Fri, 10 Dec 2021 13:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cWQuEJnT/JZXf0arB0oKdrqBRQsxxr/nJFTbSJ4bw1Q=; b=R5TZvp3bfa6NTzDVBgbKoC6KWH R9VXoeA1+TKVKn4AS+UuRCJupDFjcdYc/EzDfgLih7mjL00qswUYhZt8BIYr2HN+dFMDSdjjRH4sN Foszh5P902xUjaPR3TvQ0AQ4jXVh7yxc5/F4Y9Wsz536mYAB0PhtFpOCcj+rGhdKHUN8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/HVM: permit CLFLUSH{,OPT} on execute-only code segments Message-Id: Date: Fri, 10 Dec 2021 13:11:15 +0000 commit df3e1a5efe700a9f59eced801cac73f9fd02a0e2 Author: Jan Beulich AuthorDate: Fri Dec 10 14:03:56 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 14:03:56 2021 +0100 x86/HVM: permit CLFLUSH{,OPT} on execute-only code segments Both SDM and PM explicitly permit this. Fixes: 52dba7bd0b36 ("x86emul: generalize wbinvd() hook") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Paul Durrant --- xen/arch/x86/hvm/emulate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 425c8ddd97..76a2ccfafe 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2310,7 +2310,9 @@ static int hvmemul_cache_op( ASSERT(!is_x86_system_segment(seg)); rc = hvmemul_virtual_to_linear(seg, offset, 0, NULL, - hvm_access_read, hvmemul_ctxt, &addr); + op != x86emul_clwb ? hvm_access_none + : hvm_access_read, + hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Dec 11 02:22:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 Dec 2021 02:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.244630.423094 (Exim 4.92) (envelope-from ) id 1mvs1T-0001uZ-Lf; Sat, 11 Dec 2021 02:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 244630.423094; Sat, 11 Dec 2021 02:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1T-0001uQ-IW; Sat, 11 Dec 2021 02:22:03 +0000 Received: by outflank-mailman (input) for mailman id 244630; Sat, 11 Dec 2021 02:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1R-0001uI-VQ for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1R-0006L9-Ub for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvs1R-0001cF-TU for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=w093x1IZ8a8KsLasLOc02mqEJ73X1WgKF0AmJ3KPcRc=; b=r+LxNQgRHZwQ+gabzoMZX+dPze eU9TjyDhxAb1UA5gsjKNno7zC2bxY/OfFIg4kCHlzRrgd2kkGNvs6Oz6Y1wExaqSzOzThT2Vr38+j 7eYqSHtDEYw7wSLTDpfmmlXAB/hD0kBo7rGjlqvtQG9bK19rWMojY2HL8az88+gXUlMg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxc: correct bounce direction in xc_get_device_group() Message-Id: Date: Sat, 11 Dec 2021 02:22:01 +0000 commit 22592f1c5e789e4606f0a6fb88e5f1244a8384c9 Author: Jan Beulich AuthorDate: Fri Dec 10 10:25:12 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 10:25:12 2021 +0100 libxc: correct bounce direction in xc_get_device_group() The array of IDs is an output. Fixes: 79647c5bc9c6 ("libxc: convert domctl interfaces over to hypercall buffers") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross --- tools/libs/ctrl/xc_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libs/ctrl/xc_domain.c b/tools/libs/ctrl/xc_domain.c index b155d6afd2..20b86d986c 100644 --- a/tools/libs/ctrl/xc_domain.c +++ b/tools/libs/ctrl/xc_domain.c @@ -1546,7 +1546,8 @@ int xc_get_device_group( { int rc; DECLARE_DOMCTL; - DECLARE_HYPERCALL_BOUNCE(sdev_array, max_sdevs * sizeof(*sdev_array), XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BOUNCE(sdev_array, max_sdevs * sizeof(*sdev_array), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); if ( xc_hypercall_bounce_pre(xch, sdev_array) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 11 02:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 Dec 2021 02:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.244631.423100 (Exim 4.92) (envelope-from ) id 1mvs1d-0001wa-No; Sat, 11 Dec 2021 02:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 244631.423100; Sat, 11 Dec 2021 02:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1d-0001wR-K0; Sat, 11 Dec 2021 02:22:13 +0000 Received: by outflank-mailman (input) for mailman id 244631; Sat, 11 Dec 2021 02:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1c-0001wJ-2Q for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1c-0006LG-1d for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvs1c-0001dL-0i for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gdpSKa4PbCBuKQ3fbArp8kWraodI7eNLiF6ST35htE0=; b=YRYzskKlJTT9Un5jWXSezJqA0u O34PhmLUWcc48Ce52s6ZoZs/dURzwUvzTEGKzKYKG2rrMMvxnNQkXIKgmOy8Lqmmk5xYLNN1z2oyB gu+PuydqfbgwCFBG/wmPtkDiIGsUnJRFbiyqzyx81cYjIyoytJ4amjdUX5ExaWxSvQBU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] perfc: conditionalize credit/credit2 counters Message-Id: Date: Sat, 11 Dec 2021 02:22:12 +0000 commit ab6ba8c6753fa7642de2ffc84f6decadc6c40c2c Author: Jan Beulich AuthorDate: Fri Dec 10 10:25:44 2021 +0100 Commit: Jan Beulich CommitDate: 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 Reviewed-by: Luca Fancellu --- xen/include/xen/perfc_defn.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 08b182ccd9..13486d3ed9 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -37,6 +37,7 @@ PERFCOUNTER(tickled_busy_cpu, "sched: tickled_busy_cpu") PERFCOUNTER(unit_check, "sched: unit_check") /* credit specific counters */ +#ifdef CONFIG_SCHED_CREDIT PERFCOUNTER(delay_ms, "csched: delay") PERFCOUNTER(acct_run, "csched: acct_run") PERFCOUNTER(acct_no_work, "csched: acct_no_work") @@ -58,8 +59,10 @@ PERFCOUNTER(migrate_queued, "csched: migrate_queued") PERFCOUNTER(migrate_running, "csched: migrate_running") PERFCOUNTER(migrate_kicked_away, "csched: migrate_kicked_away") PERFCOUNTER(unit_hot, "csched: unit_hot") +#endif /* credit2 specific counters */ +#ifdef CONFIG_SCHED_CREDIT2 PERFCOUNTER(burn_credits_t2c, "csched2: burn_credits_t2c") PERFCOUNTER(acct_load_balance, "csched2: acct_load_balance") PERFCOUNTER(upd_max_weight_quick, "csched2: update_max_weight_quick") @@ -77,6 +80,7 @@ PERFCOUNTER(credit_reset, "csched2: credit_reset") PERFCOUNTER(deferred_to_tickled_cpu,"csched2: deferred_to_tickled_cpu") PERFCOUNTER(tickled_cpu_overwritten,"csched2: tickled_cpu_overwritten") PERFCOUNTER(tickled_cpu_overridden, "csched2: tickled_cpu_overridden") +#endif PERFCOUNTER(need_flush_tlb_flush, "PG_need_flush tlb flushes") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 11 02:22:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 Dec 2021 02:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.244633.423103 (Exim 4.92) (envelope-from ) id 1mvs1n-000207-Om; Sat, 11 Dec 2021 02:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 244633.423103; Sat, 11 Dec 2021 02:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1n-0001zx-LW; Sat, 11 Dec 2021 02:22:23 +0000 Received: by outflank-mailman (input) for mailman id 244633; Sat, 11 Dec 2021 02:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1m-0001zg-5P for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1m-0006Lk-4i for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvs1m-0001eN-3l for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N9FGETTG1FFgdSShCgTt/VNmLiBiTjaTnfxqTKaHZ04=; b=zP8YxBm/SAxlQuafhAhD4WcXhK titq3Qlnk44iB7T9FgdiCKFU30Pr3+6wv78tlZd/F3ErUAnzHv6ODMWanambNgjPuerHNITPUuioH NWfMpEbbEK2lFBz0OpajnvYGgAdO8Hp/l6PcxQkH7yTi9o9L01rAiUG3cczpagT8NUcI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: avoid wrong use of all-but-self IPI shorthand Message-Id: Date: Sat, 11 Dec 2021 02:22:22 +0000 commit 7621880de0bb40bae6436a5b106babc0e4718f4d Author: Jan Beulich AuthorDate: Fri Dec 10 10:26:52 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 10:26:52 2021 +0100 x86: avoid wrong use of all-but-self IPI shorthand With "nosmp" I did observe a flood of "APIC error on CPU0: 04(04), Send accept error" log messages on an AMD system. And rightly so - nothing excludes the use of the shorthand in send_IPI_mask() in this case. Set "unaccounted_cpus" to "true" also when command line restrictions are the cause. Note that PV-shim mode is unaffected by this change, first and foremost because "nosmp" and "maxcpus=" are ignored in this case. Fixes: 5500d265a2a8 ("x86/smp: use APIC ALLBUT destination shorthand when possible") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mpparse.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 42b5ac7871..8faac289ea 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -84,9 +84,14 @@ void __init set_nr_cpu_ids(unsigned int max_cpus) if (!park_offline_cpus) tot_cpus = max_cpus; nr_cpu_ids = min(tot_cpus, NR_CPUS + 0u); - if (park_offline_cpus && nr_cpu_ids < num_processors) - printk(XENLOG_WARNING "SMP: Cannot bring up %u further CPUs\n", - num_processors - nr_cpu_ids); + if (nr_cpu_ids < num_processors) + { + unaccounted_cpus = true; + if (park_offline_cpus) + printk(XENLOG_WARNING + "SMP: Cannot bring up %u further CPUs\n", + num_processors - nr_cpu_ids); + } #ifndef nr_cpumask_bits nr_cpumask_bits = ROUNDUP(nr_cpu_ids, BITS_PER_LONG); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 11 02:22:33 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 Dec 2021 02:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.244634.423106 (Exim 4.92) (envelope-from ) id 1mvs1x-00022y-Pt; Sat, 11 Dec 2021 02:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 244634.423106; Sat, 11 Dec 2021 02:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1x-00022q-Mu; Sat, 11 Dec 2021 02:22:33 +0000 Received: by outflank-mailman (input) for mailman id 244634; Sat, 11 Dec 2021 02:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1w-00022R-8n for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvs1w-0006Lw-7z for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvs1w-0001fL-72 for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 02:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5y32XU97zCue3SlCdksju/g+NLM0T7pgm30FiZ04Pc0=; b=4OYcQ0mM6ktI1U6VWN/TtdqmDA 6WzRc9corolhHWNKGVmfyxlJMa+v+BbCsmC3QZz15Vhhb+XUk2t/Ljw9inweMN3fjLqIxZSO4tMNQ zAfxeNvQDdICRz6GXzb8NIVALQLwZzIw3Ij7pn6lI7xi9JlrfzK9bAPXUc7Ut8Flk97w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: widen Anthony's area Message-Id: Date: Sat, 11 Dec 2021 02:22:32 +0000 commit 29e31aaf5d81e57679c2abfe8ffd3851a87042b5 Author: Jan Beulich AuthorDate: Fri Dec 10 10:27:27 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 10:27:27 2021 +0100 MAINTAINERS: widen Anthony's area As was briefly discussed on the December Community Call, I'd like to propose to widen Anthony's maintainership to all of tools/. This then means that the special LIBXENLIGHT entry can go away. Signed-off-by: Jan Beulich Acked-by: Ian Jackson Acked-by: Stefano Stabellini Acked-by: Anthony PERARD --- MAINTAINERS | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e43dc0edce..22ea62d964 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -375,9 +375,11 @@ F: xen/arch/x86/x86_64/kexec_reloc.S LIBS M: Wei Liu +M: Anthony PERARD R: Juergen Gross S: Supported F: tools/include/libxenvchan.h +F: tools/include/libxl*.h F: tools/include/xencall.h F: tools/include/xenctrl*.h F: tools/include/xendevicemodel.h @@ -393,15 +395,6 @@ F: tools/include/xentoolcore*.h F: tools/include/xentoollog.h F: tools/libs/ -LIBXENLIGHT -M: Wei Liu -M: Anthony PERARD -S: Supported -F: tools/include/libxl*.h -F: tools/libs/light/ -F: tools/libs/util/ -F: tools/xl/ - LIVEPATCH M: Konrad Rzeszutek Wilk M: Ross Lagerwall @@ -514,6 +507,7 @@ F: xen/include/asm-arm/tee TOOLSTACK M: Wei Liu +M: Anthony PERARD S: Supported F: autogen.sh F: config/*.in -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 11 10:22:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 Dec 2021 10:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.245241.423271 (Exim 4.92) (envelope-from ) id 1mvzVz-0007yS-4G; Sat, 11 Dec 2021 10:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 245241.423271; Sat, 11 Dec 2021 10:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvzVz-0007yK-1K; Sat, 11 Dec 2021 10:22:03 +0000 Received: by outflank-mailman (input) for mailman id 245241; Sat, 11 Dec 2021 10:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvzVy-0007yD-51 for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 10:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvzVy-0006um-45 for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 10:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvzVy-0000jW-32 for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 10:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WJtBxiB4WoBKdnh6/9ihmM7y0h9GS2LXQoqaXE6P9pY=; b=RgIEqqIXxCByX1d087JDZPyZ45 3mHhNAowX3KmBUtJGgsXIi8Qv+8iPWZAq3YiYHe7ahScMy5hehs9GkWXNsI9RV7YObYcVzfCok6wz GP30nDr4FZj4xqStYc9zHNnaoRcXHKWiK+e0unxrYzZUAQAwCQrI2LbGNEfU9n1xlF20=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] EFI: constify EFI_LOADED_IMAGE * function parameters Message-Id: Date: Sat, 11 Dec 2021 10:22:02 +0000 commit c6cec7af287aa31123e259b90247b20ef3a7e1a7 Author: Jan Beulich AuthorDate: Fri Dec 10 14:02:59 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 14:02:59 2021 +0100 EFI: constify EFI_LOADED_IMAGE * function parameters Instead of altering Arm's forward declarations, drop them. Like elsewhere we should limit such to cases where the first use lives ahead of the definition. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Luca Fancellu Acked-by: Julien Grall --- xen/arch/arm/efi/efi-boot.h | 24 +++++------------------- xen/arch/x86/efi/efi-boot.h | 2 +- xen/common/efi/boot.c | 4 ++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index c4ed412845..4fb345f225 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -44,20 +44,6 @@ void __flush_dcache_area(const void *vaddr, unsigned long size); static int get_module_file_index(const char *name, unsigned int name_len); static void PrintMessage(const CHAR16 *s); -static int allocate_module_file(EFI_LOADED_IMAGE *loaded_image, - EFI_FILE_HANDLE *dir_handle, - const char *name, - unsigned int name_len); -static int handle_module_node(EFI_LOADED_IMAGE *loaded_image, - EFI_FILE_HANDLE *dir_handle, - int module_node_offset, - int reg_addr_cells, - int reg_size_cells, - bool is_domu_module); -static int handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, - EFI_FILE_HANDLE *dir_handle, - int domain_node); -static int efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image); #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -650,7 +636,7 @@ static void __init PrintMessage(const CHAR16 *s) * This function allocates a binary and keeps track of its name, it returns the * index of the file in the modules array or a negative number on error. */ -static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, +static int __init allocate_module_file(const EFI_LOADED_IMAGE *loaded_image, EFI_FILE_HANDLE *dir_handle, const char *name, unsigned int name_len) @@ -713,7 +699,7 @@ static int __init allocate_module_file(EFI_LOADED_IMAGE *loaded_image, * for the reg property into the module DT node. * Returns 1 if module is multiboot,module, 0 if not, < 0 on error */ -static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, +static int __init handle_module_node(const EFI_LOADED_IMAGE *loaded_image, EFI_FILE_HANDLE *dir_handle, int module_node_offset, int reg_addr_cells, @@ -814,7 +800,7 @@ static int __init handle_module_node(EFI_LOADED_IMAGE *loaded_image, * in the DT. * Returns number of multiboot,module found or negative number on error. */ -static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, +static int __init handle_dom0less_domain_node(const EFI_LOADED_IMAGE *loaded_image, EFI_FILE_HANDLE *dir_handle, int domain_node) { @@ -862,7 +848,7 @@ static int __init handle_dom0less_domain_node(EFI_LOADED_IMAGE *loaded_image, * dom0 and domU guests to be loaded. * Returns the number of multiboot modules found or a negative number for error. */ -static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) +static int __init efi_check_dt_boot(const EFI_LOADED_IMAGE *loaded_image) { int chosen, node, addr_len, size_len; unsigned int i = 0, modules_found = 0; @@ -942,7 +928,7 @@ static void __init efi_arch_halt(void) stop_cpu(); } -static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) +static void __init efi_arch_load_addr_check(const EFI_LOADED_IMAGE *loaded_image) { if ( (unsigned long)loaded_image->ImageBase & ((1 << 12) - 1) ) blexit(L"Xen must be loaded at a 4 KByte boundary."); diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 9b0cc29aae..f69509a210 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -709,7 +709,7 @@ static void __init efi_arch_halt(void) halt(); } -static void __init efi_arch_load_addr_check(EFI_LOADED_IMAGE *loaded_image) +static void __init efi_arch_load_addr_check(const EFI_LOADED_IMAGE *loaded_image) { xen_phys_start = (UINTN)loaded_image->ImageBase; if ( (xen_phys_start + loaded_image->ImageSize - 1) >> 32 ) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 114ea8278f..5ceb535ad0 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -389,7 +389,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv, return argc; } -static EFI_FILE_HANDLE __init get_parent_handle(EFI_LOADED_IMAGE *loaded_image, +static EFI_FILE_HANDLE __init get_parent_handle(const EFI_LOADED_IMAGE *loaded_image, CHAR16 **leaf) { static EFI_GUID __initdata fs_protocol = SIMPLE_FILE_SYSTEM_PROTOCOL; @@ -561,7 +561,7 @@ static int __init __maybe_unused set_color(uint32_t mask, int bpp, } #ifndef CONFIG_HAS_DEVICE_TREE -static int __init efi_check_dt_boot(EFI_LOADED_IMAGE *loaded_image) +static int __init efi_check_dt_boot(const EFI_LOADED_IMAGE *loaded_image) { return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 11 10:22:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 11 Dec 2021 10:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.245243.423276 (Exim 4.92) (envelope-from ) id 1mvzW9-00081X-72; Sat, 11 Dec 2021 10:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 245243.423276; Sat, 11 Dec 2021 10:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvzW9-00081P-4C; Sat, 11 Dec 2021 10:22:13 +0000 Received: by outflank-mailman (input) for mailman id 245243; Sat, 11 Dec 2021 10:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvzW8-000816-8l for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 10:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvzW8-0006uq-7y for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 10:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mvzW8-0000kg-71 for xen-changelog@lists.xenproject.org; Sat, 11 Dec 2021 10:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aFkMJRa3ELFdTPT1wc39t8J2MJOVQ26yf2ppRzbGLdI=; b=uiqAEFaDUOMeKECtSjyiON6yCS XHAZMGEKcHBsTVBsGaCb6eNmch6z4jvuh9ZI5cpQnAm2e0JgnSFVuSnNbKQybfVr/dPuIUnaQSLPP 6dBIjPbqk+zZY/yVTsHVUShKRzvCnKh9dfNE9pwdeC/KHcjdksNRJZcTy4WSpUlYRu4A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/HVM: permit CLFLUSH{,OPT} on execute-only code segments Message-Id: Date: Sat, 11 Dec 2021 10:22:12 +0000 commit df3e1a5efe700a9f59eced801cac73f9fd02a0e2 Author: Jan Beulich AuthorDate: Fri Dec 10 14:03:56 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 10 14:03:56 2021 +0100 x86/HVM: permit CLFLUSH{,OPT} on execute-only code segments Both SDM and PM explicitly permit this. Fixes: 52dba7bd0b36 ("x86emul: generalize wbinvd() hook") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Paul Durrant --- xen/arch/x86/hvm/emulate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 425c8ddd97..76a2ccfafe 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2310,7 +2310,9 @@ static int hvmemul_cache_op( ASSERT(!is_x86_system_segment(seg)); rc = hvmemul_virtual_to_linear(seg, offset, 0, NULL, - hvm_access_read, hvmemul_ctxt, &addr); + op != x86emul_clwb ? hvm_access_none + : hvm_access_read, + hvmemul_ctxt, &addr); if ( rc != X86EMUL_OKAY ) break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon Dec 13 19:11:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 13 Dec 2021 19:11:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246286.424746 (Exim 4.92) (envelope-from ) id 1mwqj4-00016c-Sk; Mon, 13 Dec 2021 19:11:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246286.424746; Mon, 13 Dec 2021 19:11:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mwqj4-00016U-Pq; Mon, 13 Dec 2021 19:11:06 +0000 Received: by outflank-mailman (input) for mailman id 246286; Mon, 13 Dec 2021 19:11:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mwqj3-00016O-2x for xen-changelog@lists.xenproject.org; Mon, 13 Dec 2021 19:11:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mwqj2-00031N-Vw for xen-changelog@lists.xenproject.org; Mon, 13 Dec 2021 19:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mwqj2-0003dL-Un for xen-changelog@lists.xenproject.org; Mon, 13 Dec 2021 19:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sErfWoOrH+UfyfIVQrPjtzba69GLa2OzLF+EksqPE+8=; b=UKxbQaljKwP8U5VJFMdKZ9q045 PWOlQ2Nfh605UmnjkAWTBPIHAHvv+NFmmdLZTcojutd/yF+5u9s1UwQe18HP4NQqmb+V+VX6cDnM4 paFI/rBob94pmib073M3UI/lbOTfnUqDz8S0f8c3Jjfl2teIrLFxVI8c+GvB3erWmzbo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libfsimage: Fix SONAME Message-Id: Date: Mon, 13 Dec 2021 19:11:04 +0000 commit d828caa9aeee80c59a35f662f875f6573e9b532f Author: Andrew Cooper AuthorDate: Mon Dec 13 17:50:48 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Dec 13 18:37:36 2021 +0000 tools/libfsimage: Fix SONAME This gets missed on each release. Follow the same example as libs.mk and pick the version up dynamically. Fixes: a5706b80f42e ("Set version to 4.17: rerun autogen.sh") Suggested-by: Anthony PERARD Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/libfsimage/common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index 24bc90e73e..0c5a34baea 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk -MAJOR = 4.16 +MAJOR := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) MINOR = 0 LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Dec 13 22:00:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 13 Dec 2021 22:00:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246327.424802 (Exim 4.92) (envelope-from ) id 1mwtMd-0004LX-4C; Mon, 13 Dec 2021 22:00:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246327.424802; Mon, 13 Dec 2021 22:00:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mwtMd-0004L6-18; Mon, 13 Dec 2021 22:00:07 +0000 Received: by outflank-mailman (input) for mailman id 246327; Mon, 13 Dec 2021 22:00:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mwtMb-0004Aj-8u for xen-changelog@lists.xenproject.org; Mon, 13 Dec 2021 22:00:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mwtMb-0005ut-7t for xen-changelog@lists.xenproject.org; Mon, 13 Dec 2021 22:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mwtMb-0004fj-6u for xen-changelog@lists.xenproject.org; Mon, 13 Dec 2021 22:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=OL0CgYZIfitUHZ0Q2kjHmQmXqTCUBQ+sMZDJKtABGfs=; b=ejtS7auhYHs595JnbbDsmQA/w0 S6xvQZRrJrzrFp3F8bP8aIv9ctxq1/itKdUyTke2M6C1UUlhi0+ycXN/ZXR/hQ6uEi2e4gxHVWm2M n42j1F2gIelZj23vHjgrIaa2u+ab6wbiu+Ha5ULXubdlYwqqjTNMWdoXizXBVuX6oNGE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.16] docs/efi: Fix wrong compatible in dts example Message-Id: Date: Mon, 13 Dec 2021 22:00:05 +0000 commit d0d0af67eede560faab58f161d9608a69c779d41 Author: Luca Fancellu AuthorDate: Thu Dec 2 15:05:17 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Dec 13 13:54:50 2021 -0800 docs/efi: Fix wrong compatible in dts example The example in section "UEFI boot and dom0less on ARM" has a wrong compatible for the DTB passthrough, it is "ramdisk" instead of "device-tree". This patch fixes the example. Fixes: a1743fc3a9fe ("arm/efi: Use dom0less configuration when using EFI boot") Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall (cherry picked from commit 620ed2c8c777282154a91abca69083a40c9d918d) --- docs/misc/efi.pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index 4abbb5bb82..abafb34527 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -222,7 +222,7 @@ domU1 { xen,uefi-binary = "initrd-3.0.31-0.4-xen"; }; module@3 { - compatible = "multiboot,ramdisk", "multiboot,module"; + compatible = "multiboot,device-tree", "multiboot,module"; xen,uefi-binary = "passthrough.dtb"; }; }; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 06:22:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 06:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246375.424878 (Exim 4.92) (envelope-from ) id 1mx1CM-0003Bs-6n; Tue, 14 Dec 2021 06:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246375.424878; Tue, 14 Dec 2021 06:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx1CM-0003Bj-3k; Tue, 14 Dec 2021 06:22:02 +0000 Received: by outflank-mailman (input) for mailman id 246375; Tue, 14 Dec 2021 06:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx1CL-0003Bd-Oe for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 06:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx1CL-0000SI-Mj for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 06:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx1CL-0003jc-LT for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 06:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PC/UuLLdq/UBrPK0YkSC81NrPVD/NU8pAbn7h/NhWOM=; b=Q61AITtFnZUeTKZQEEo3uf5BFQ NHTxacH4+tDnKIQq/Sk1ormouX81QY9g+sHcV6EPkWg25ChHcrxBNRn9PaqEfCuM1Su0je0ePb32Y 84nUgZ+WTJ5Ipoh2/KZkws5tgMNhnq8cR9I4fIMR2PKNAelloO3ioMbx+GMQytWoD+zY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.16] docs/efi: Fix wrong compatible in dts example Message-Id: Date: Tue, 14 Dec 2021 06:22:01 +0000 commit d0d0af67eede560faab58f161d9608a69c779d41 Author: Luca Fancellu AuthorDate: Thu Dec 2 15:05:17 2021 +0000 Commit: Stefano Stabellini CommitDate: Mon Dec 13 13:54:50 2021 -0800 docs/efi: Fix wrong compatible in dts example The example in section "UEFI boot and dom0less on ARM" has a wrong compatible for the DTB passthrough, it is "ramdisk" instead of "device-tree". This patch fixes the example. Fixes: a1743fc3a9fe ("arm/efi: Use dom0less configuration when using EFI boot") Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall (cherry picked from commit 620ed2c8c777282154a91abca69083a40c9d918d) --- docs/misc/efi.pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index 4abbb5bb82..abafb34527 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -222,7 +222,7 @@ domU1 { xen,uefi-binary = "initrd-3.0.31-0.4-xen"; }; module@3 { - compatible = "multiboot,ramdisk", "multiboot,module"; + compatible = "multiboot,device-tree", "multiboot,module"; xen,uefi-binary = "passthrough.dtb"; }; }; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.16 From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 08:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 08:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246436.424984 (Exim 4.92) (envelope-from ) id 1mx3aU-0007Ht-IY; Tue, 14 Dec 2021 08:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246436.424984; Tue, 14 Dec 2021 08:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3aU-0007Hl-Fj; Tue, 14 Dec 2021 08:55:06 +0000 Received: by outflank-mailman (input) for mailman id 246436; Tue, 14 Dec 2021 08:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3aT-0007Hf-9h for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3aT-0003aC-81 for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx3aT-0007NG-6w for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BS5WWOYvRXOkOU2ReYnoc/ltP9mLMUSgF0wpguSgfnk=; b=oKm1fAQmmMt/QooY1wk1fPGGM5 RixZrRwSXLJO83WKKKfhsB+Ow86acvoEIqGnkCC9540jiA05G4u5XvbCt/Ahan+XeaGXMv140s+mG YxaDDmdpdV6LfdFfBYK9qhe31ZYExr9UZo090Vf/5Mv8+bIwtbIF7OIjXYw43+9SUKOA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] vpci: fix function attributes for vpci_process_pending Message-Id: Date: Tue, 14 Dec 2021 08:55:05 +0000 commit 7dc0233f534f64e7f3ee71e74e05dd5ab8a24808 Author: Oleksandr Andrushchenko AuthorDate: Tue Dec 14 09:44:44 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:44:44 2021 +0100 vpci: fix function attributes for vpci_process_pending vpci_process_pending is defined with different attributes, e.g. with __must_check if CONFIG_HAS_VPCI enabled and not otherwise. Fix this by defining both of the definitions with __must_check. Fixes: 14583a590783 ("7fbb096bf345 kconfig: don't select VPCI if building a shim-only binary") Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall Reviewed-by: Roger Pau Monné --- xen/include/xen/vpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 9ea66e033f..3f32de9d7e 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -247,7 +247,7 @@ static inline void vpci_write(pci_sbdf_t sbdf, unsigned int reg, ASSERT_UNREACHABLE(); } -static inline bool vpci_process_pending(struct vcpu *v) +static inline bool __must_check vpci_process_pending(struct vcpu *v) { ASSERT_UNREACHABLE(); return false; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 08:55:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 08:55:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246437.424989 (Exim 4.92) (envelope-from ) id 1mx3ae-0007K4-Ju; Tue, 14 Dec 2021 08:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246437.424989; Tue, 14 Dec 2021 08:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ae-0007Jw-H7; Tue, 14 Dec 2021 08:55:16 +0000 Received: by outflank-mailman (input) for mailman id 246437; Tue, 14 Dec 2021 08:55:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ad-0007Jm-CC for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ad-0003aI-BO for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx3ad-0007Np-AE for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4KcWWyBxqqYqC8uKuBNlkWD/bDAkf2wk5FLGHNjcqmk=; b=DZs2O+wrVZ/RMuaWQUXPodfxsy f9zpJF0/KvecMLoP4ajPRsn9DkcvVmPv9GofYEcUauVQPBfXez8Wxi0Csinl26nRdrOjJEfe8c+6r vwihKrI8X3n43k1rfipsB9j8PlWfRI7q6Y+RFwT5Nf1Tlu07N//W4XuHqSPTfelzfQ7o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/monitor: don't open-code hvm_has_set_descriptor_access_exiting() Message-Id: Date: Tue, 14 Dec 2021 08:55:15 +0000 commit 53ed194539ddbea4f6aecb1b7c2f33aa8c0201d9 Author: Jan Beulich AuthorDate: Tue Dec 14 09:46:48 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:46:48 2021 +0100 x86/monitor: don't open-code hvm_has_set_descriptor_access_exiting() Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed by: Alexandru Isaila --- xen/arch/x86/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c index bbcb7536c7..40d2673707 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/arch/x86/monitor.c @@ -263,7 +263,7 @@ int arch_monitor_domctl_event(struct domain *d, if ( unlikely(old_status == requested_status) ) return -EEXIST; - if ( !hvm_funcs.set_descriptor_access_exiting ) + if ( !hvm_has_set_descriptor_access_exiting() ) return -EOPNOTSUPP; domain_pause(d); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 08:55:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 08:55:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246438.424993 (Exim 4.92) (envelope-from ) id 1mx3ao-0007Mb-LW; Tue, 14 Dec 2021 08:55:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246438.424993; Tue, 14 Dec 2021 08:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ao-0007MT-Ia; Tue, 14 Dec 2021 08:55:26 +0000 Received: by outflank-mailman (input) for mailman id 246438; Tue, 14 Dec 2021 08:55:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3an-0007MD-FR for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3an-0003ac-EX for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx3an-0007Oo-DW for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VDPyxyPZ/y3Dg/3n5d9SveTVwgylKY1aWryO0Ii05Mk=; b=LM8v6+1cgJV5MNGV8BB4DCWSuF nyLp2mBOXaYKmLBlr0nzeR6R8Y9geGtupejAPQd2HVgdIlAehqFWKDzFPrLZoSdakL2mKibCSy8Xg GnQb6nHdy5PIUgllbet+9wE2amSXm7sI2yGe9crkW8dihkmK9zcH763dlNjcxiNoouEM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] SUPPORT.md: limit security support for hosts with very much memory Message-Id: Date: Tue, 14 Dec 2021 08:55:25 +0000 commit c49ee0329ff3de98722fd74ed5ba6d9665701e54 Author: Jan Beulich AuthorDate: Tue Dec 14 09:47:31 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:47:31 2021 +0100 SUPPORT.md: limit security support for hosts with very much memory Sufficient and in particular regular testing on very large hosts cannot currently be guaranteed. Anyone wanting us to support larger hosts is free to propose so, but will need to supply not only test results, but also a test plan. This is a follow-up to XSA-385. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Julien Grall --- SUPPORT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 3a34933c89..3a1fd1ba39 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -48,6 +48,12 @@ For the Cortex A57 r0p0 - r1p1, see Errata 832075. Status, x86: Supported +### Physical Memory + + Status: Supported up to 8 TiB + +Hosts with more memory are supported, but not security supported. + ### Physical Memory Hotplug Status, x86: Supported -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 08:55:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 08:55:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246439.424998 (Exim 4.92) (envelope-from ) id 1mx3ay-0007Pa-O4; Tue, 14 Dec 2021 08:55:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246439.424998; Tue, 14 Dec 2021 08:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ay-0007PR-K4; Tue, 14 Dec 2021 08:55:36 +0000 Received: by outflank-mailman (input) for mailman id 246439; Tue, 14 Dec 2021 08:55:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ax-0007PA-JQ for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3ax-0003am-If for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx3ax-0007PT-Hk for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KoUtmkkvmFfSKk0bqSAZjf2Hnsl+oHuJ5HtCJY+wbIs=; b=6nsf6Q9QPvsspvAj3dCX7ZvvI2 fc5Cv/+xol8CYiHW8NyRb0RtFroAhz4hrnUu1zFcFe+iF2krWcVCAQ3g4oD9Xnjp0c5QemoetDcD4 rQwSp1naIt3NbbkZ1W1kXTnCWp9WeB+dPEpVr0kevn9Imdt7rc4oCu+tUGXf4W9QSe1s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86emul: drop "seg" parameter from insn_fetch() hook Message-Id: Date: Tue, 14 Dec 2021 08:55:35 +0000 commit 7b99e7258559c9caa235d9faf323b22c68e4a581 Author: Jan Beulich AuthorDate: Tue Dec 14 09:48:17 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:48:17 2021 +0100 x86emul: drop "seg" parameter from insn_fetch() hook This is specified (and asserted for in a number of places) to always be CS. Passing this as an argument in various places is therefore pointless. The price to pay is two simple new functions, with the benefit of the PTWR case now gaining a more appropriate error code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Paul Durrant --- tools/fuzz/x86_instruction_emulator/fuzz-emul.c | 5 +---- tools/tests/x86_emulator/predicates.c | 6 ++---- tools/tests/x86_emulator/test_x86_emulator.c | 3 +-- tools/tests/x86_emulator/x86-emulate.h | 3 +-- xen/arch/x86/hvm/emulate.c | 3 +-- xen/arch/x86/mm/shadow/hvm.c | 7 ++----- xen/arch/x86/pv/emul-gate-op.c | 8 +++++++- xen/arch/x86/pv/emul-priv-op.c | 5 +---- xen/arch/x86/pv/ro-page-fault.c | 21 ++++++++++++++++++--- xen/arch/x86/x86_emulate/x86_emulate.c | 13 ++++++------- xen/arch/x86/x86_emulate/x86_emulate.h | 8 +++----- xen/include/asm-x86/hvm/emulate.h | 3 +-- 12 files changed, 44 insertions(+), 41 deletions(-) diff --git a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c index 28285aad24..966e46bee1 100644 --- a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c +++ b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c @@ -197,14 +197,11 @@ static int fuzz_read_io( } static int fuzz_insn_fetch( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { - assert(seg == x86_seg_cs); - /* Minimal segment limit checking, until full one is being put in place. */ if ( ctxt->addr_size < 64 && (offset >> 32) ) { @@ -222,7 +219,7 @@ static int fuzz_insn_fetch( return maybe_fail(ctxt, "insn_fetch", true); } - return data_read(ctxt, seg, "insn_fetch", p_data, bytes); + return data_read(ctxt, x86_seg_cs, "insn_fetch", p_data, bytes); } static int _fuzz_rep_read(struct x86_emulate_ctxt *ctxt, diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 94b99c94e8..4760f19bf2 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2049,8 +2049,7 @@ static void print_insn(const uint8_t *instr, unsigned int len) void do_test(uint8_t *instr, unsigned int len, unsigned int modrm, enum mem_access mem, struct x86_emulate_ctxt *ctxt, - int (*fetch)(enum x86_segment seg, - unsigned long offset, + int (*fetch)(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)) @@ -2110,8 +2109,7 @@ void do_test(uint8_t *instr, unsigned int len, unsigned int modrm, } void predicates_test(void *instr, struct x86_emulate_ctxt *ctxt, - int (*fetch)(enum x86_segment seg, - unsigned long offset, + int (*fetch)(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 9b3e98a1a5..ac250c11c4 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -594,14 +594,13 @@ static int read( } static int fetch( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { if ( verbose ) - printf("** %s(%u, %p,, %u,)\n", __func__, seg, (void *)offset, bytes); + printf("** %s(CS:%p,, %u,)\n", __func__, (void *)offset, bytes); memcpy(p_data, (void *)offset, bytes); return X86EMUL_OKAY; diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index e1a2aaef68..7f60ef9e89 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -105,8 +105,7 @@ WRAP(puts); void evex_disp8_test(void *instr, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops); void predicates_test(void *instr, struct x86_emulate_ctxt *ctxt, - int (*fetch)(enum x86_segment seg, - unsigned long offset, + int (*fetch)(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)); diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 76a2ccfafe..dd59ad89be 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1294,7 +1294,6 @@ static int hvmemul_read( } int hvmemul_insn_fetch( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, @@ -1312,7 +1311,7 @@ int hvmemul_insn_fetch( if ( !bytes || unlikely((insn_off + bytes) > hvmemul_ctxt->insn_buf_bytes) ) { - int rc = __hvmemul_read(seg, offset, p_data, bytes, + int rc = __hvmemul_read(x86_seg_cs, offset, p_data, bytes, hvm_access_insn_fetch, hvmemul_ctxt); if ( rc == X86EMUL_OKAY && bytes ) diff --git a/xen/arch/x86/mm/shadow/hvm.c b/xen/arch/x86/mm/shadow/hvm.c index d5f42102a0..f2991bc176 100644 --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -162,8 +162,7 @@ hvm_emulate_read(enum x86_segment seg, } static int -hvm_emulate_insn_fetch(enum x86_segment seg, - unsigned long offset, +hvm_emulate_insn_fetch(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) @@ -172,11 +171,9 @@ hvm_emulate_insn_fetch(enum x86_segment seg, container_of(ctxt, struct sh_emulate_ctxt, ctxt); unsigned int insn_off = offset - sh_ctxt->insn_buf_eip; - ASSERT(seg == x86_seg_cs); - /* Fall back if requested bytes are not in the prefetch cache. */ if ( unlikely((insn_off + bytes) > sh_ctxt->insn_buf_bytes) ) - return hvm_read(seg, offset, p_data, bytes, + return hvm_read(x86_seg_cs, offset, p_data, bytes, hvm_access_insn_fetch, sh_ctxt); /* Hit the cache. Simple memcpy. */ diff --git a/xen/arch/x86/pv/emul-gate-op.c b/xen/arch/x86/pv/emul-gate-op.c index 43d847abd0..68ec4d11f6 100644 --- a/xen/arch/x86/pv/emul-gate-op.c +++ b/xen/arch/x86/pv/emul-gate-op.c @@ -163,6 +163,12 @@ static int read_mem(enum x86_segment seg, unsigned long offset, void *p_data, return X86EMUL_OKAY; } +static int fetch(unsigned long offset, void *p_data, + unsigned int bytes, struct x86_emulate_ctxt *ctxt) +{ + return read_mem(x86_seg_cs, offset, p_data, bytes, ctxt); +} + void pv_emulate_gate_op(struct cpu_user_regs *regs) { struct vcpu *v = current; @@ -205,7 +211,7 @@ void pv_emulate_gate_op(struct cpu_user_regs *regs) ctxt.ctxt.addr_size = ar & _SEGMENT_DB ? 32 : 16; /* Leave zero in ctxt.ctxt.sp_size, as it's not needed for decoding. */ - state = x86_decode_insn(&ctxt.ctxt, read_mem); + state = x86_decode_insn(&ctxt.ctxt, fetch); ctxt.insn_fetch = false; if ( IS_ERR_OR_NULL(state) ) { diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 8ba65178e9..c78be6d92b 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1258,8 +1258,7 @@ static int validate(const struct x86_emulate_state *state, return X86EMUL_UNHANDLEABLE; } -static int insn_fetch(enum x86_segment seg, - unsigned long offset, +static int insn_fetch(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) @@ -1269,8 +1268,6 @@ static int insn_fetch(enum x86_segment seg, unsigned int rc; unsigned long addr = poc->cs.base + offset; - ASSERT(seg == x86_seg_cs); - /* We don't mean to emulate any branches. */ if ( !bytes ) return X86EMUL_UNHANDLEABLE; diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index ac5b66870c..ef4d146c1d 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -52,6 +52,21 @@ static int ptwr_emulated_read(enum x86_segment seg, unsigned long offset, return X86EMUL_OKAY; } +static int ptwr_emulated_insn_fetch(unsigned long offset, + void *p_data, unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + unsigned int rc = copy_from_guest_pv(p_data, (void *)offset, bytes); + + if ( rc ) + { + x86_emul_pagefault(PFEC_insn_fetch, offset + bytes - rc, ctxt); + return X86EMUL_EXCEPTION; + } + + return X86EMUL_OKAY; +} + /* * p_old being NULL indicates a plain write to occur, while a non-NULL * input requests a CMPXCHG-based update. @@ -247,7 +262,7 @@ static int ptwr_emulated_cmpxchg(enum x86_segment seg, unsigned long offset, static const struct x86_emulate_ops ptwr_emulate_ops = { .read = ptwr_emulated_read, - .insn_fetch = ptwr_emulated_read, + .insn_fetch = ptwr_emulated_insn_fetch, .write = ptwr_emulated_write, .cmpxchg = ptwr_emulated_cmpxchg, .validate = pv_emul_is_mem_write, @@ -290,14 +305,14 @@ static int ptwr_do_page_fault(struct x86_emulate_ctxt *ctxt, static const struct x86_emulate_ops mmio_ro_emulate_ops = { .read = x86emul_unhandleable_rw, - .insn_fetch = ptwr_emulated_read, + .insn_fetch = ptwr_emulated_insn_fetch, .write = mmio_ro_emulated_write, .validate = pv_emul_is_mem_write, }; static const struct x86_emulate_ops mmcfg_intercept_ops = { .read = x86emul_unhandleable_rw, - .insn_fetch = ptwr_emulated_read, + .insn_fetch = ptwr_emulated_insn_fetch, .write = mmcfg_intercept_write, .validate = pv_emul_is_mem_write, }; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 069acde517..5b43bda239 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1295,7 +1295,7 @@ static inline int mkec(uint8_t e, int32_t ec, ...) generate_exception_if((uint8_t)(state->ip - \ ctxt->regs->r(ip)) > MAX_INST_LEN, \ EXC_GP, 0); \ - rc = ops->insn_fetch(x86_seg_cs, _ip, &_x, (_size), ctxt); \ + rc = ops->insn_fetch(_ip, &_x, _size, ctxt); \ if ( rc ) goto done; \ _x; \ }) @@ -1363,7 +1363,7 @@ do { \ ip = (uint16_t)ip; \ else if ( !mode_64bit() ) \ ip = (uint32_t)ip; \ - rc = ops->insn_fetch(x86_seg_cs, ip, NULL, 0, ctxt); \ + rc = ops->insn_fetch(ip, NULL, 0, ctxt); \ if ( rc ) goto done; \ _regs.r(ip) = ip; \ singlestep = _regs.eflags & X86_EFLAGS_TF; \ @@ -4740,7 +4740,7 @@ x86_emulate( ? 8 : op_bytes; if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + src.val), &dst.val, op_bytes, ctxt, ops)) != 0 || - (rc = ops->insn_fetch(x86_seg_cs, dst.val, NULL, 0, ctxt)) ) + (rc = ops->insn_fetch(dst.val, NULL, 0, ctxt)) ) goto done; _regs.r(ip) = dst.val; adjust_bnd(ctxt, ops, vex.pfx); @@ -5628,14 +5628,14 @@ x86_emulate( break; case 2: /* call (near) */ dst.val = _regs.r(ip); - if ( (rc = ops->insn_fetch(x86_seg_cs, src.val, NULL, 0, ctxt)) ) + if ( (rc = ops->insn_fetch(src.val, NULL, 0, ctxt)) ) goto done; _regs.r(ip) = src.val; src.val = dst.val; adjust_bnd(ctxt, ops, vex.pfx); goto push; case 4: /* jmp (near) */ - if ( (rc = ops->insn_fetch(x86_seg_cs, src.val, NULL, 0, ctxt)) ) + if ( (rc = ops->insn_fetch(src.val, NULL, 0, ctxt)) ) goto done; _regs.r(ip) = src.val; dst.type = OP_NONE; @@ -12220,8 +12220,7 @@ struct x86_emulate_state * x86_decode_insn( struct x86_emulate_ctxt *ctxt, int (*insn_fetch)( - enum x86_segment seg, unsigned long offset, - void *p_data, unsigned int bytes, + unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)) { static DEFINE_PER_CPU(struct x86_emulate_state, state); diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index d8fb3a9909..419def8790 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -254,13 +254,12 @@ struct x86_emulate_ops /* * insn_fetch: Emulate fetch from instruction byte stream. - * Except for @bytes, all parameters are the same as for 'read'. + * Except for @bytes and missing @seg, all parameters are the same as for + * 'read'. * @bytes: Access length (0 <= @bytes < 16, with zero meaning * "validate address only"). - * @seg is always x86_seg_cs. */ int (*insn_fetch)( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, @@ -750,8 +749,7 @@ struct x86_emulate_state * x86_decode_insn( struct x86_emulate_ctxt *ctxt, int (*insn_fetch)( - enum x86_segment seg, unsigned long offset, - void *p_data, unsigned int bytes, + unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)); unsigned int diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 610078b28f..e670040603 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -92,8 +92,7 @@ static inline bool handle_mmio(void) return hvm_emulate_one_insn(x86_insn_is_mem_access, "MMIO"); } -int hvmemul_insn_fetch(enum x86_segment seg, - unsigned long offset, +int hvmemul_insn_fetch(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 08:55:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 08:55:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246440.425001 (Exim 4.92) (envelope-from ) id 1mx3b8-0007T2-QR; Tue, 14 Dec 2021 08:55:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246440.425001; Tue, 14 Dec 2021 08:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3b8-0007Su-Na; Tue, 14 Dec 2021 08:55:46 +0000 Received: by outflank-mailman (input) for mailman id 246440; Tue, 14 Dec 2021 08:55:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3b7-0007Sg-MW for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3b7-0003aq-Lk for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx3b7-0007QC-Kq for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=SjUZfLt6+WueR9NzkHd6gcbRSWbjPoAm58K2CWHbQ5g=; b=r/deF2kaoGGNkHBaJc45RC1omS e2TDSWk3AqiSoki+v/RjQATqz/MVUEx+/JqxfyOLs1UsB14jSc9YRqstaLQVznjCCNfznJ7MYFZaC MiWQQ9Jzvu0j779e9CpFG14rRj3100/SrKHIAtUvyUk4NsOR6lNS5T/Q+vjxowsUmMW4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/perfc: add hypercall performance counters for hvm, correct pv Message-Id: Date: Tue, 14 Dec 2021 08:55:45 +0000 commit 668dd44902bbaf52f8e7214e0da060b6ec962e88 Author: Juergen Gross AuthorDate: Tue Dec 14 09:49:23 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:49:23 2021 +0100 x86/perfc: add hypercall performance counters for hvm, correct pv The HVM hypercall handler is missing incrementing the per hypercall counters. Add that. The counters for PV are handled wrong, as they are not using perf_incra() with the number of the hypercall as index, but are incrementing the first hypercall entry (set_trap_table) for each hypercall. Fix that. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hypercall.c | 2 ++ xen/arch/x86/pv/hypercall.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 1f04ffb272..c4e5c34c37 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -325,6 +325,8 @@ int hvm_hypercall(struct cpu_user_regs *regs) ioreq_signal_mapcache_invalidate(); } + perfc_incra(hypercalls, eax); + return curr->hcall_preempted ? HVM_HCALL_preempted : HVM_HCALL_completed; } diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 16a77e3a35..ecdd58deea 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -238,7 +238,7 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) if ( curr->hcall_preempted ) regs->rip -= 2; - perfc_incr(hypercalls); + perfc_incra(hypercalls, eax); } enum mc_disposition pv_do_multicall_call(struct mc_state *state) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 08:55:57 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 08:55:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246441.425005 (Exim 4.92) (envelope-from ) id 1mx3bJ-0007W0-Se; Tue, 14 Dec 2021 08:55:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246441.425005; Tue, 14 Dec 2021 08:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3bJ-0007Vs-P5; Tue, 14 Dec 2021 08:55:57 +0000 Received: by outflank-mailman (input) for mailman id 246441; Tue, 14 Dec 2021 08:55:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3bH-0007VR-Pf for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx3bH-0003au-Ox for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx3bH-0007R2-Nx for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 08:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=wO2sOK5lXskqGC+K6N8PR+S5h0SiLklgVOKKBcPCVcY=; b=GZeDuHFU8XCmstFgm/bJYn7/Vv 2+jnJHF8TCnVQ8ODxA4wsgcNNjpZ+8edm1ALXx13lZMnSO1Nq2OixZlgF8v6btmSkSW1ELkEocNpV xz9MIXRlYedLWxkKWL8ImU9PqY75PNCaqhbP0+NGQPZONyA5C1I/bckoVX7oWOll8DUA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] perfc: drop calls_to_multicall performance counter Message-Id: Date: Tue, 14 Dec 2021 08:55:55 +0000 commit 1382241fe880d48e109f2056cec052bb3919a9d1 Author: Juergen Gross AuthorDate: Tue Dec 14 09:50:07 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:50:07 2021 +0100 perfc: drop calls_to_multicall performance counter The calls_to_multicall performance counter is basically redundant to the multicall hypercall counter. The only difference is the counting of continuation calls, which isn't really that interesting. Drop the calls_to_multicall performance counter. Suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/multicall.c | 1 - xen/include/xen/perfc_defn.h | 1 - 2 files changed, 2 deletions(-) diff --git a/xen/common/multicall.c b/xen/common/multicall.c index 5a199ebf8f..794638392b 100644 --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -113,7 +113,6 @@ do_multicall( if ( unlikely(disp == mc_preempt) && i < nr_calls ) goto preempted; - perfc_incr(calls_to_multicall); perfc_add(calls_from_multicall, i); mcs->flags = 0; return rc; diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 13486d3ed9..672b51c456 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -6,7 +6,6 @@ PERFCOUNTER_ARRAY(hypercalls, "hypercalls", NR_hypercalls) -PERFCOUNTER(calls_to_multicall, "calls to multicall") PERFCOUNTER(calls_from_multicall, "calls from multicall") PERFCOUNTER(irqs, "#interrupts") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 12:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 12:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.246720.425480 (Exim 4.92) (envelope-from ) id 1mx7A6-0006Eh-HW; Tue, 14 Dec 2021 12:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 246720.425480; Tue, 14 Dec 2021 12:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx7A6-0006EZ-EN; Tue, 14 Dec 2021 12:44:06 +0000 Received: by outflank-mailman (input) for mailman id 246720; Tue, 14 Dec 2021 12:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx7A4-0006ET-So for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 12:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mx7A4-0007nD-Qa for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 12:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mx7A4-0006LO-PS for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 12:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ow3ZxEyoRKOUF8QN7AutCCEMDs7b6yydwmegnnoRpk8=; b=4VElIOdE60vp2zN4fVpMsmV4sl BJwM7LMEaJhJ06yPSGd5iY9fjzS45xv81T59e/BcjBg+C7PrGPlYre0+r2FtygqkDds7YGpdHY0pA Ea5+mdAhGnhUOnoiaj+I7nSEXq023xXCQoi2YzTVpZHdKKb9T4/z++MnwRM07IOkglgk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: Fix TSXLDTRK definition Message-Id: Date: Tue, 14 Dec 2021 12:44:04 +0000 commit 249e0f1d8f203188ccdcced5a05c2149739e1566 Author: Andrew Cooper AuthorDate: Mon Dec 13 20:33:42 2021 +0000 Commit: Andrew Cooper CommitDate: Tue Dec 14 12:30:48 2021 +0000 x86/cpuid: Fix TSXLDTRK definition TSXLDTRK lives in CPUID leaf 7[0].edx, not 7[0].ecx. Bit 16 in ecx is LA57. Fixes: a6d1b558471f ("x86emul: support X{SUS,RES}LDTRK") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/libs/light/libxl_cpuid.c | 2 +- tools/misc/xen-cpuid.c | 3 +-- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- xen/include/public/arch-x86/cpufeatureset.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 815498d4f3..e1acf6648d 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -209,7 +209,6 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-vnni", 0x00000007, 0, CPUID_REG_ECX, 11, 1}, {"avx512-bitalg",0x00000007, 0, CPUID_REG_ECX, 12, 1}, {"avx512-vpopcntdq",0x00000007,0,CPUID_REG_ECX, 14, 1}, - {"tsxldtrk", 0x00000007, 0, CPUID_REG_ECX, 16, 1}, {"rdpid", 0x00000007, 0, CPUID_REG_ECX, 22, 1}, {"cldemote", 0x00000007, 0, CPUID_REG_ECX, 25, 1}, @@ -220,6 +219,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"srbds-ctrl", 0x00000007, 0, CPUID_REG_EDX, 9, 1}, {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, {"serialize", 0x00000007, 0, CPUID_REG_EDX, 14, 1}, + {"tsxldtrk", 0x00000007, 0, CPUID_REG_EDX, 16, 1}, {"cet-ibt", 0x00000007, 0, CPUID_REG_EDX, 20, 1}, {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 9b59fec263..fb36cac07b 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -128,7 +128,6 @@ static const char *const str_7c0[32] = [10] = "vpclmulqdq", [11] = "avx512-vnni", [12] = "avx512-bitalg", [14] = "avx512-vpopcntdq", - [16] = "tsxldtrk", [22] = "rdpid", /* 24 */ [25] = "cldemote", @@ -172,7 +171,7 @@ static const char *const str_7d0[32] = [10] = "md-clear", [11] = "rtm-always-abort", /* 12 */ [13] = "tsx-force-abort", [14] = "serialize", - + [16] = "tsxldtrk", [18] = "pconfig", [20] = "cet-ibt", diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5b43bda239..824af9d899 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2000,7 +2000,6 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_vnni() (ctxt->cpuid->feat.avx512_vnni) #define vcpu_has_avx512_bitalg() (ctxt->cpuid->feat.avx512_bitalg) #define vcpu_has_avx512_vpopcntdq() (ctxt->cpuid->feat.avx512_vpopcntdq) -#define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_movdiri() (ctxt->cpuid->feat.movdiri) #define vcpu_has_movdir64b() (ctxt->cpuid->feat.movdir64b) @@ -2009,6 +2008,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) #define vcpu_has_avx512_vp2intersect() (ctxt->cpuid->feat.avx512_vp2intersect) #define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) +#define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_avx_vnni() (ctxt->cpuid->feat.avx_vnni) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index d6260c801a..647ee9e5e2 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -239,7 +239,6 @@ XEN_CPUFEATURE(VPCLMULQDQ, 6*32+10) /*A Vector Carry-less Multiplication Ins XEN_CPUFEATURE(AVX512_VNNI, 6*32+11) /*A Vector Neural Network Instrs */ XEN_CPUFEATURE(AVX512_BITALG, 6*32+12) /*A Support for VPOPCNT[B,W] and VPSHUFBITQMB */ XEN_CPUFEATURE(AVX512_VPOPCNTDQ, 6*32+14) /*A POPCNT for vectors of DW/QW */ -XEN_CPUFEATURE(TSXLDTRK, 6*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ @@ -280,6 +279,7 @@ XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffe XEN_CPUFEATURE(RTM_ALWAYS_ABORT, 9*32+11) /*! June 2021 TSX defeaturing in microcode. */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*a SERIALIZE insn */ +XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 20:44:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 20:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247077.426063 (Exim 4.92) (envelope-from ) id 1mxEeb-0002df-WB; Tue, 14 Dec 2021 20:44:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247077.426063; Tue, 14 Dec 2021 20:44:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxEeb-0002dX-Sy; Tue, 14 Dec 2021 20:44:05 +0000 Received: by outflank-mailman (input) for mailman id 247077; Tue, 14 Dec 2021 20:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxEea-0002dR-Pt for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 20:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxEea-00005D-N4 for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 20:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxEea-0002CV-Lv for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 20:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yAgJb3A8vK0XCgvNck8/YbkfT02btKJmjC4lZ2Wrr4k=; b=aRMSAGvdaHLoihDE3AvqBaiy5M mgTOfWge/wUepLNQgBvM6vb2SK24PZaWQK3OqEmxNPFxxbVKNz1v2Ubo+Q/Ujzz1XE1aQNTEqoUAP 7Nw1AxGCEQ7bvHH435rBREv6SmsJnNec4Mpgtvn+h9QjjMdvBSateWiStS4xRmnlISaA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.15] xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Message-Id: Date: Tue, 14 Dec 2021 20:44:04 +0000 commit aba22c67efe4404a2a84e378bfd98def5ec8e647 Author: Stefano Stabellini AuthorDate: Wed Aug 4 13:57:07 2021 -0700 Commit: Stefano Stabellini CommitDate: Tue Dec 14 12:29:28 2021 -0800 xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Set/Way flushes never work correctly in a virtualized environment. Our current implementation is based on clearing the valid bit in the p2m pagetable to track guest memory accesses. This technique doesn't work when the IOMMU is enabled for the domain and the pagetable is shared between IOMMU and MMU because it triggers IOMMU faults. Specifically, p2m_invalidate_root causes IOMMU faults if iommu_use_hap_pt returns true for the domain. Add a check in p2m_set_way_flush: if a set/way instruction is used and iommu_use_hap_pt returns true, rather than failing with obscure IOMMU faults, inject an undef exception straight away into the guest, and print a verbose error message to explain the problem. Also add an ASSERT in p2m_invalidate_root to make sure we don't inadvertently stumble across this problem again in the future. Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall (cherry picked from commit 2b45ff60301a988badec526846e77b538383ae63) --- xen/arch/arm/arm64/vsysreg.c | 2 +- xen/arch/arm/p2m.c | 17 ++++++++++++++++- xen/arch/arm/vcpreg.c | 2 +- xen/include/asm-arm/p2m.h | 4 +++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 41f18612c6..3743309107 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -106,7 +106,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_DCCSW: case HSR_SYSREG_DCCISW: if ( !hsr.sysreg.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ac50312620..eaa43c6181 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,6 +11,7 @@ #include #include #include +#include #define MAX_VMID_8_BIT (1UL << 8) #define MAX_VMID_16_BIT (1UL << 16) @@ -1166,11 +1167,16 @@ static void p2m_invalidate_table(struct p2m_domain *p2m, mfn_t mfn) /* * Invalidate all entries in the root page-tables. This is * useful to get fault on entry and do an action. + * + * p2m_invalid_root() should not be called when the P2M is shared with + * the IOMMU because it will cause IOMMU fault. */ void p2m_invalidate_root(struct p2m_domain *p2m) { unsigned int i; + ASSERT(!iommu_use_hap_pt(p2m->domain)); + p2m_write_lock(p2m); for ( i = 0; i < P2M_ROOT_LEVEL; i++ ) @@ -1815,11 +1821,20 @@ void p2m_flush_vm(struct vcpu *v) * * - Once the caches are enabled, we stop trapping VM ops. */ -void p2m_set_way_flush(struct vcpu *v) +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr) { /* This function can only work with the current vCPU. */ ASSERT(v == current); + if ( iommu_use_hap_pt(current->domain) ) + { + gprintk(XENLOG_ERR, + "The cache should be flushed by VA rather than by set/way.\n"); + inject_undef_exception(regs, hsr); + return; + } + if ( !(v->arch.hcr_el2 & HCR_TVM) ) { v->arch.need_flush_to_ram = true; diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index 55351fc087..67ff02f6f8 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -222,7 +222,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG32(DCCSW): case HSR_CPREG32(DCCISW): if ( !cp32.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 4f8b3b0ec7..6a2108398f 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -7,6 +7,7 @@ #include #include +#include #define paddr_bits PADDR_BITS @@ -272,7 +273,8 @@ void p2m_invalidate_root(struct p2m_domain *p2m); */ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end); -void p2m_set_way_flush(struct vcpu *v); +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr); void p2m_toggle_cache(struct vcpu *v, bool was_enabled); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15 From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 20:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 20:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247078.426067 (Exim 4.92) (envelope-from ) id 1mxEem-0002fJ-1a; Tue, 14 Dec 2021 20:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247078.426067; Tue, 14 Dec 2021 20:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxEel-0002fA-UY; Tue, 14 Dec 2021 20:44:15 +0000 Received: by outflank-mailman (input) for mailman id 247078; Tue, 14 Dec 2021 20:44:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxEel-0002ey-2j for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 20:44:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxEel-00005H-1w for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 20:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxEel-0002DZ-08 for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 20:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mRkge3CYy1576WdLleC4WuYpBxZPxj8vaWLVQtxVjUU=; b=qmDtXVrFZ8sor7hEb2NWB+R44V ctHsJx3/DuM/jTjhmLB78Loeku16+Xy8VzV8ni9Fk4WLHDL6EUbxh26XW98frZSRQaA7xagPLMYXm 7V6inSnYSrLpJkLXf5dfRodTL/Jbx9qWyQDIy5Eg+x+KG94BanJdLufOoqlS3N1SgcuQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging-4.14] xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Message-Id: Date: Tue, 14 Dec 2021 20:44:15 +0000 commit cbadf67bcab4e29c883410db393f4f5ef34df04a Author: Stefano Stabellini AuthorDate: Wed Aug 4 13:57:07 2021 -0700 Commit: Stefano Stabellini CommitDate: Tue Dec 14 12:39:20 2021 -0800 xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Set/Way flushes never work correctly in a virtualized environment. Our current implementation is based on clearing the valid bit in the p2m pagetable to track guest memory accesses. This technique doesn't work when the IOMMU is enabled for the domain and the pagetable is shared between IOMMU and MMU because it triggers IOMMU faults. Specifically, p2m_invalidate_root causes IOMMU faults if iommu_use_hap_pt returns true for the domain. Add a check in p2m_set_way_flush: if a set/way instruction is used and iommu_use_hap_pt returns true, rather than failing with obscure IOMMU faults, inject an undef exception straight away into the guest, and print a verbose error message to explain the problem. Also add an ASSERT in p2m_invalidate_root to make sure we don't inadvertently stumble across this problem again in the future. Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall (cherry picked from commit 2b45ff60301a988badec526846e77b538383ae63) --- xen/arch/arm/arm64/vsysreg.c | 2 +- xen/arch/arm/p2m.c | 17 ++++++++++++++++- xen/arch/arm/vcpreg.c | 2 +- xen/include/asm-arm/p2m.h | 4 +++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 8a85507d9d..69a91aaa84 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -98,7 +98,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_DCCSW: case HSR_SYSREG_DCCISW: if ( !hsr.sysreg.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 4eeb867ca1..ac821a9094 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -10,6 +10,7 @@ #include #include #include +#include #define MAX_VMID_8_BIT (1UL << 8) #define MAX_VMID_16_BIT (1UL << 16) @@ -1158,11 +1159,16 @@ static void p2m_invalidate_table(struct p2m_domain *p2m, mfn_t mfn) /* * Invalidate all entries in the root page-tables. This is * useful to get fault on entry and do an action. + * + * p2m_invalid_root() should not be called when the P2M is shared with + * the IOMMU because it will cause IOMMU fault. */ void p2m_invalidate_root(struct p2m_domain *p2m) { unsigned int i; + ASSERT(!iommu_use_hap_pt(p2m->domain)); + p2m_write_lock(p2m); for ( i = 0; i < P2M_ROOT_LEVEL; i++ ) @@ -1781,11 +1787,20 @@ void p2m_flush_vm(struct vcpu *v) * * - Once the caches are enabled, we stop trapping VM ops. */ -void p2m_set_way_flush(struct vcpu *v) +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr) { /* This function can only work with the current vCPU. */ ASSERT(v == current); + if ( iommu_use_hap_pt(current->domain) ) + { + gprintk(XENLOG_ERR, + "The cache should be flushed by VA rather than by set/way.\n"); + inject_undef_exception(regs, hsr); + return; + } + if ( !(v->arch.hcr_el2 & HCR_TVM) ) { v->arch.need_flush_to_ram = true; diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cdc91cdf5b..f4557b80a7 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -204,7 +204,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG32(DCCSW): case HSR_CPREG32(DCCISW): if ( !cp32.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 28ca9a838e..ea8a03449d 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -7,6 +7,7 @@ #include #include +#include #define paddr_bits PADDR_BITS @@ -263,7 +264,8 @@ void p2m_invalidate_root(struct p2m_domain *p2m); */ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end); -void p2m_set_way_flush(struct vcpu *v); +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr); void p2m_toggle_cache(struct vcpu *v, bool was_enabled); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.14 From xen-changelog-bounces@lists.xenproject.org Tue Dec 14 21:11:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 14 Dec 2021 21:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247087.426082 (Exim 4.92) (envelope-from ) id 1mxF4h-0006Nt-Cm; Tue, 14 Dec 2021 21:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247087.426082; Tue, 14 Dec 2021 21:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxF4h-0006Nl-9z; Tue, 14 Dec 2021 21:11:03 +0000 Received: by outflank-mailman (input) for mailman id 247087; Tue, 14 Dec 2021 21:11:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxF4g-0006Nf-6K for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 21:11:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxF4g-0000aG-3E for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 21:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxF4g-0003yT-23 for xen-changelog@lists.xenproject.org; Tue, 14 Dec 2021 21:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3QzGv3PI9edz21Lor8OWtVCwnZKCQYumqllAR3TYp8c=; b=UjrvurMVRv3wuMsmEiXd7/VDbW seJ4nyEGKmk6EOJnnBDTdSMvsH4YlGn5GK2Q+x1s6z4rmwzHfcZf2c2vqJvaqbA4FxKQI6kdOvqId weSvkDWsmElRoQJKb2hbK0SJAofHuzO0lYa385dyUTNjizIt1HjKttoAbK1ei4QdwA8U=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libfsimage: Fix SONAME Message-Id: Date: Tue, 14 Dec 2021 21:11:02 +0000 commit d828caa9aeee80c59a35f662f875f6573e9b532f Author: Andrew Cooper AuthorDate: Mon Dec 13 17:50:48 2021 +0000 Commit: Andrew Cooper CommitDate: Mon Dec 13 18:37:36 2021 +0000 tools/libfsimage: Fix SONAME This gets missed on each release. Follow the same example as libs.mk and pick the version up dynamically. Fixes: a5706b80f42e ("Set version to 4.17: rerun autogen.sh") Suggested-by: Anthony PERARD Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/libfsimage/common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index 24bc90e73e..0c5a34baea 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/libfsimage/Rules.mk -MAJOR = 4.16 +MAJOR := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) MINOR = 0 LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247276.426348 (Exim 4.92) (envelope-from ) id 1mxQen-0005FR-Rl; Wed, 15 Dec 2021 09:33:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247276.426348; Wed, 15 Dec 2021 09:33:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQen-0005FJ-Os; Wed, 15 Dec 2021 09:33:05 +0000 Received: by outflank-mailman (input) for mailman id 247276; Wed, 15 Dec 2021 09:33:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQem-0005FD-D8 for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQem-0008Jc-AY for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQem-0003ng-9O for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nOvSHURMlrxTr9wz0eIJAuyd9g4n0Kt8AxMzOcx2FYc=; b=U2DJQOkcp4BTABQZrth73taNk1 dP99m9mYj5JAWUKYVCMZTk7Toa0V+CKn1+haBnMBNlbEui81VxypeHSu2TTr0CML+D3jkQMvYF2I7 Hp8BKZNM0xCxtfZ9Ei6f0daVYaVzHxHu3eBUI3LFxL8HRRv89rFjRvNsVZcr34w3JUZE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: factorise generation of the linker scripts Message-Id: Date: Wed, 15 Dec 2021 09:33:04 +0000 commit 72f12ac6a36d5aa0567fd7abc2856e3bf054c4ef Author: Anthony PERARD AuthorDate: Wed Dec 15 10:08:38 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:08:38 2021 +0100 build: factorise generation of the linker scripts In Arm and X86 makefile, generating the linker script is the same, so we can simply have both call the same macro. We need to add *.lds files into extra-y so that Rules.mk can find the .*.cmd dependency file and load it. Change made to the command line: - Use cpp_flags macro which simply filter -Wa,% options from $(a_flags). - Added -D__LINKER__ even it is only used by Arm's lds. Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/Rules.mk | 4 ++++ xen/arch/arm/Makefile | 6 ++++-- xen/arch/x86/Makefile | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 5e0699e58b..d21930a7bf 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -238,6 +238,10 @@ cmd_cpp_s_S = $(CPP) $(call cpp_flags,$(a_flags)) -MQ $@ -o $@ $< %.s: %.S FORCE $(call if_changed,cpp_s_S) +# Linker scripts, .lds.S -> .lds +quiet_cmd_cpp_lds_S = LDS $@ +cmd_cpp_lds_S = $(CPP) -P $(call cpp_flags,$(a_flags)) -D__LINKER__ -MQ $@ -o $@ $< + # Add intermediate targets: # When building objects with specific suffix patterns, add intermediate # targets that the final targets are derived from. diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 07f634508e..a3a497bafe 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -67,6 +67,8 @@ obj-y += vsmc.o obj-y += vpsci.o obj-y += vuart.o +extra-y += xen.lds + #obj-bin-y += ....o ifneq ($(CONFIG_DTB_FILE),"") @@ -132,8 +134,8 @@ $(TARGET)-syms: prelink.o xen.lds .PHONY: include include: -xen.lds: xen.lds.S - $(CPP) -P $(a_flags) -D__LINKER__ -MQ $@ -o $@ $< +xen.lds: xen.lds.S FORCE + $(call if_changed,cpp_lds_S) dtb.o: $(patsubst "%",%,$(CONFIG_DTB_FILE)) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 69b6cfaded..669e16e726 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -78,6 +78,7 @@ obj-y += sysctl.o endif extra-y += asm-macros.i +extra-y += xen.lds ifneq ($(CONFIG_HVM),y) x86_emulate.o: CFLAGS-y += -Wno-unused-label @@ -238,6 +239,7 @@ endif note_file_option ?= $(note_file) ifeq ($(XEN_BUILD_PE),y) +extra-y += efi.lds $(TARGET).efi: prelink.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc ifeq ($(CONFIG_DEBUG_INFO),y) $(if $(filter --strip-debug,$(EFI_LDFLAGS)),echo,:) "Will strip debug info from $(@F)" @@ -290,8 +292,8 @@ $(BASEDIR)/include/asm-x86/asm-macros.h: asm-macros.i Makefile $(call move-if-changed,$@.new,$@) efi.lds: AFLAGS-y += -DEFI -xen.lds efi.lds: xen.lds.S - $(CPP) -P $(call cpp_flags,$(a_flags)) -MQ $@ -o $@ $< +xen.lds efi.lds: xen.lds.S FORCE + $(call if_changed,cpp_lds_S) boot/mkelf32: boot/mkelf32.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:33:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:33:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247277.426353 (Exim 4.92) (envelope-from ) id 1mxQex-0005Ha-UT; Wed, 15 Dec 2021 09:33:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247277.426353; Wed, 15 Dec 2021 09:33:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQex-0005HS-Qd; Wed, 15 Dec 2021 09:33:15 +0000 Received: by outflank-mailman (input) for mailman id 247277; Wed, 15 Dec 2021 09:33:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQew-0005H7-KJ for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQew-0008Jj-Is for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQew-0003oR-Hf for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ALaa2I7m3OZNfFRBDLf9wfRiRaFi27nXH40ynp0DhXI=; b=nuJZa6UtVL1oCXQ9w/twUZ9ud1 XuSBT6uexJTA+k7F7X7zIlDpRHPnuKshnI2O90S0TM61wfJ9+LqCEPPTu8B41tvQZ1bFNpb89kLKK Of1wHvLyzC5JACtDGVwvlub7GF/FBv2S+TvqDakWeKWItTbnSJfTR/cxjKXY8iCuIorI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: move include/asm-* to arch/*/include/asm Message-Id: Date: Wed, 15 Dec 2021 09:33:14 +0000 commit 725381a5eab35227ef0099a43e05034def42bb77 Author: Anthony PERARD AuthorDate: Wed Dec 15 10:14:13 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:14:13 2021 +0100 xen: move include/asm-* to arch/*/include/asm This avoid the need to create the symbolic link "include/asm". Whenever a comment refer to an "asm" headers, this patch avoid spelling the arch when not needed to avoid some code churn. One unrelated change is to sort entries in MAINTAINERS for "INTEL(R) VT FOR X86 (VT-X)" Signed-off-by: Anthony PERARD Acked-by: Paul Durrant Acked-by: Jan Beulich Acked-by: Julien Grall Acked-by: Andrew Cooper --- .gitignore | 5 +- MAINTAINERS | 37 +- tools/include/Makefile | 2 +- tools/misc/xen-access.c | 4 +- tools/tests/vhpet/Makefile | 2 +- xen/Makefile | 13 +- xen/arch/arm/README.LinuxPrimitives | 10 +- xen/arch/arm/arch.mk | 1 + xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm64/head.S | 2 +- xen/arch/arm/include/asm/acpi.h | 82 ++ xen/arch/arm/include/asm/alternative.h | 221 +++++ xen/arch/arm/include/asm/altp2m.h | 39 + xen/arch/arm/include/asm/arm32/atomic.h | 175 ++++ xen/arch/arm/include/asm/arm32/bitops.h | 42 + xen/arch/arm/include/asm/arm32/bug.h | 15 + xen/arch/arm/include/asm/arm32/cmpxchg.h | 229 +++++ xen/arch/arm/include/asm/arm32/flushtlb.h | 63 ++ xen/arch/arm/include/asm/arm32/insn.h | 71 ++ xen/arch/arm/include/asm/arm32/io.h | 96 ++ xen/arch/arm/include/asm/arm32/macros.h | 8 + xen/arch/arm/include/asm/arm32/mm.h | 23 + xen/arch/arm/include/asm/arm32/page.h | 118 +++ xen/arch/arm/include/asm/arm32/processor.h | 69 ++ xen/arch/arm/include/asm/arm32/sysregs.h | 78 ++ xen/arch/arm/include/asm/arm32/system.h | 77 ++ xen/arch/arm/include/asm/arm32/traps.h | 13 + xen/arch/arm/include/asm/arm32/vfp.h | 41 + xen/arch/arm/include/asm/arm64/atomic.h | 148 +++ xen/arch/arm/include/asm/arm64/bitops.h | 98 ++ xen/arch/arm/include/asm/arm64/brk.h | 39 + xen/arch/arm/include/asm/arm64/bug.h | 11 + xen/arch/arm/include/asm/arm64/cmpxchg.h | 183 ++++ xen/arch/arm/include/asm/arm64/cpufeature.h | 104 ++ xen/arch/arm/include/asm/arm64/efibind.h | 216 +++++ xen/arch/arm/include/asm/arm64/flushtlb.h | 77 ++ xen/arch/arm/include/asm/arm64/hsr.h | 159 +++ xen/arch/arm/include/asm/arm64/insn.h | 110 +++ xen/arch/arm/include/asm/arm64/io.h | 148 +++ xen/arch/arm/include/asm/arm64/macros.h | 36 + xen/arch/arm/include/asm/arm64/mm.h | 23 + xen/arch/arm/include/asm/arm64/page.h | 103 ++ xen/arch/arm/include/asm/arm64/processor.h | 99 ++ xen/arch/arm/include/asm/arm64/sysregs.h | 423 ++++++++ xen/arch/arm/include/asm/arm64/system.h | 91 ++ xen/arch/arm/include/asm/arm64/traps.h | 18 + xen/arch/arm/include/asm/arm64/vfp.h | 23 + xen/arch/arm/include/asm/asm_defns.h | 44 + xen/arch/arm/include/asm/atomic.h | 236 +++++ xen/arch/arm/include/asm/bitops.h | 192 ++++ xen/arch/arm/include/asm/bug.h | 106 ++ xen/arch/arm/include/asm/byteorder.h | 16 + xen/arch/arm/include/asm/cache.h | 19 + xen/arch/arm/include/asm/cadence-uart.h | 55 ++ xen/arch/arm/include/asm/config.h | 207 ++++ xen/arch/arm/include/asm/cpregs.h | 375 +++++++ xen/arch/arm/include/asm/cpuerrata.h | 85 ++ xen/arch/arm/include/asm/cpufeature.h | 428 ++++++++ xen/arch/arm/include/asm/current.h | 73 ++ xen/arch/arm/include/asm/debugger.h | 15 + xen/arch/arm/include/asm/delay.h | 14 + xen/arch/arm/include/asm/desc.h | 12 + xen/arch/arm/include/asm/device.h | 124 +++ xen/arch/arm/include/asm/div64.h | 250 +++++ xen/arch/arm/include/asm/domain.h | 279 ++++++ xen/arch/arm/include/asm/domain_build.h | 31 + xen/arch/arm/include/asm/early_printk.h | 23 + xen/arch/arm/include/asm/efibind.h | 2 + xen/arch/arm/include/asm/elf.h | 33 + xen/arch/arm/include/asm/event.h | 63 ++ xen/arch/arm/include/asm/exynos4210-uart.h | 112 +++ xen/arch/arm/include/asm/flushtlb.h | 77 ++ xen/arch/arm/include/asm/gic.h | 459 +++++++++ xen/arch/arm/include/asm/gic_v3_defs.h | 220 +++++ xen/arch/arm/include/asm/gic_v3_its.h | 283 ++++++ xen/arch/arm/include/asm/grant_table.h | 108 +++ xen/arch/arm/include/asm/guest_access.h | 42 + xen/arch/arm/include/asm/guest_atomics.h | 148 +++ xen/arch/arm/include/asm/guest_walk.h | 19 + xen/arch/arm/include/asm/hardirq.h | 27 + xen/arch/arm/include/asm/hsr.h | 217 +++++ xen/arch/arm/include/asm/hypercall.h | 20 + xen/arch/arm/include/asm/init.h | 20 + xen/arch/arm/include/asm/insn.h | 29 + xen/arch/arm/include/asm/io.h | 20 + xen/arch/arm/include/asm/iocap.h | 16 + xen/arch/arm/include/asm/iommu.h | 45 + xen/arch/arm/include/asm/iommu_fwspec.h | 68 ++ xen/arch/arm/include/asm/ioreq.h | 70 ++ xen/arch/arm/include/asm/irq.h | 109 +++ xen/arch/arm/include/asm/kernel.h | 89 ++ xen/arch/arm/include/asm/livepatch.h | 37 + xen/arch/arm/include/asm/lpae.h | 257 +++++ xen/arch/arm/include/asm/macros.h | 32 + xen/arch/arm/include/asm/mem_access.h | 53 + xen/arch/arm/include/asm/mm.h | 373 +++++++ xen/arch/arm/include/asm/mmio.h | 86 ++ xen/arch/arm/include/asm/monitor.h | 68 ++ xen/arch/arm/include/asm/new_vgic.h | 198 ++++ xen/arch/arm/include/asm/nospec.h | 25 + xen/arch/arm/include/asm/numa.h | 36 + xen/arch/arm/include/asm/p2m.h | 439 +++++++++ xen/arch/arm/include/asm/page-bits.h | 12 + xen/arch/arm/include/asm/page.h | 293 ++++++ xen/arch/arm/include/asm/paging.h | 16 + xen/arch/arm/include/asm/pci.h | 133 +++ xen/arch/arm/include/asm/percpu.h | 33 + xen/arch/arm/include/asm/perfc.h | 21 + xen/arch/arm/include/asm/perfc_defn.h | 89 ++ xen/arch/arm/include/asm/pl011-uart.h | 87 ++ xen/arch/arm/include/asm/platform.h | 82 ++ xen/arch/arm/include/asm/platforms/exynos5.h | 20 + xen/arch/arm/include/asm/platforms/midway.h | 21 + xen/arch/arm/include/asm/platforms/omap5.h | 32 + xen/arch/arm/include/asm/platforms/vexpress.h | 37 + .../arm/include/asm/platforms/xilinx-zynqmp-eemi.h | 128 +++ xen/arch/arm/include/asm/processor.h | 598 ++++++++++++ xen/arch/arm/include/asm/procinfo.h | 43 + xen/arch/arm/include/asm/psci.h | 91 ++ xen/arch/arm/include/asm/random.h | 9 + xen/arch/arm/include/asm/regs.h | 73 ++ xen/arch/arm/include/asm/scif-uart.h | 127 +++ xen/arch/arm/include/asm/setup.h | 135 +++ xen/arch/arm/include/asm/short-desc.h | 130 +++ xen/arch/arm/include/asm/smccc.h | 356 +++++++ xen/arch/arm/include/asm/smp.h | 46 + xen/arch/arm/include/asm/softirq.h | 16 + xen/arch/arm/include/asm/spinlock.h | 15 + xen/arch/arm/include/asm/string.h | 53 + xen/arch/arm/include/asm/sysregs.h | 22 + xen/arch/arm/include/asm/system.h | 73 ++ xen/arch/arm/include/asm/tee/optee_msg.h | 310 ++++++ xen/arch/arm/include/asm/tee/optee_rpc_cmd.h | 318 ++++++ xen/arch/arm/include/asm/tee/optee_smc.h | 567 +++++++++++ xen/arch/arm/include/asm/tee/tee.h | 112 +++ xen/arch/arm/include/asm/time.h | 118 +++ xen/arch/arm/include/asm/trace.h | 12 + xen/arch/arm/include/asm/traps.h | 121 +++ xen/arch/arm/include/asm/types.h | 80 ++ xen/arch/arm/include/asm/vfp.h | 25 + xen/arch/arm/include/asm/vgic-emul.h | 33 + xen/arch/arm/include/asm/vgic.h | 383 ++++++++ xen/arch/arm/include/asm/vm_event.h | 67 ++ xen/arch/arm/include/asm/vpl011.h | 89 ++ xen/arch/arm/include/asm/vpsci.h | 42 + xen/arch/arm/include/asm/vreg.h | 196 ++++ xen/arch/arm/include/asm/vtimer.h | 41 + xen/arch/arm/include/asm/xenoprof.h | 12 + xen/arch/arm/smpboot.c | 2 +- xen/arch/arm/vpsci.c | 2 +- xen/arch/riscv/arch.mk | 1 + xen/arch/riscv/include/asm/config.h | 47 + xen/arch/x86/Makefile | 6 +- xen/arch/x86/arch.mk | 5 +- xen/arch/x86/include/asm/acpi.h | 162 ++++ xen/arch/x86/include/asm/alternative-asm.h | 125 +++ xen/arch/x86/include/asm/alternative.h | 387 ++++++++ xen/arch/x86/include/asm/altp2m.h | 57 ++ xen/arch/x86/include/asm/amd.h | 154 +++ xen/arch/x86/include/asm/apic.h | 202 ++++ xen/arch/x86/include/asm/apicdef.h | 134 +++ xen/arch/x86/include/asm/asm-defns.h | 78 ++ xen/arch/x86/include/asm/asm_defns.h | 354 +++++++ xen/arch/x86/include/asm/atomic.h | 239 +++++ xen/arch/x86/include/asm/bitops.h | 483 +++++++++ xen/arch/x86/include/asm/bug.h | 125 +++ xen/arch/x86/include/asm/byteorder.h | 36 + xen/arch/x86/include/asm/bzimage.h | 11 + xen/arch/x86/include/asm/cache.h | 14 + xen/arch/x86/include/asm/compat.h | 20 + xen/arch/x86/include/asm/config.h | 329 +++++++ xen/arch/x86/include/asm/cpufeature.h | 214 ++++ xen/arch/x86/include/asm/cpufeatures.h | 51 + xen/arch/x86/include/asm/cpufeatureset.h | 40 + xen/arch/x86/include/asm/cpuid.h | 80 ++ xen/arch/x86/include/asm/cpuidle.h | 31 + xen/arch/x86/include/asm/current.h | 210 ++++ xen/arch/x86/include/asm/debugger.h | 101 ++ xen/arch/x86/include/asm/debugreg.h | 83 ++ xen/arch/x86/include/asm/delay.h | 13 + xen/arch/x86/include/asm/desc.h | 252 +++++ xen/arch/x86/include/asm/device.h | 25 + xen/arch/x86/include/asm/div64.h | 14 + xen/arch/x86/include/asm/dom0_build.h | 42 + xen/arch/x86/include/asm/domain.h | 769 +++++++++++++++ xen/arch/x86/include/asm/e820.h | 42 + xen/arch/x86/include/asm/edd.h | 164 ++++ xen/arch/x86/include/asm/efibind.h | 2 + xen/arch/x86/include/asm/elf.h | 20 + xen/arch/x86/include/asm/event.h | 56 ++ xen/arch/x86/include/asm/fixmap.h | 117 +++ xen/arch/x86/include/asm/flushtlb.h | 203 ++++ xen/arch/x86/include/asm/genapic.h | 70 ++ xen/arch/x86/include/asm/grant_table.h | 80 ++ xen/arch/x86/include/asm/guest.h | 39 + xen/arch/x86/include/asm/guest/hyperv-hcall.h | 97 ++ xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 934 ++++++++++++++++++ xen/arch/x86/include/asm/guest/hyperv.h | 86 ++ xen/arch/x86/include/asm/guest/hypervisor.h | 85 ++ xen/arch/x86/include/asm/guest/pvh-boot.h | 58 ++ xen/arch/x86/include/asm/guest/xen-hcall.h | 212 ++++ xen/arch/x86/include/asm/guest/xen.h | 61 ++ xen/arch/x86/include/asm/guest_access.h | 59 ++ xen/arch/x86/include/asm/guest_atomics.h | 33 + xen/arch/x86/include/asm/guest_pt.h | 468 +++++++++ xen/arch/x86/include/asm/hap.h | 60 ++ xen/arch/x86/include/asm/hardirq.h | 37 + xen/arch/x86/include/asm/hpet.h | 101 ++ xen/arch/x86/include/asm/hvm/asid.h | 52 + xen/arch/x86/include/asm/hvm/cacheattr.h | 23 + xen/arch/x86/include/asm/hvm/domain.h | 173 ++++ xen/arch/x86/include/asm/hvm/emulate.h | 156 +++ xen/arch/x86/include/asm/hvm/grant_table.h | 61 ++ xen/arch/x86/include/asm/hvm/guest_access.h | 8 + xen/arch/x86/include/asm/hvm/hvm.h | 886 +++++++++++++++++ xen/arch/x86/include/asm/hvm/io.h | 181 ++++ xen/arch/x86/include/asm/hvm/ioreq.h | 37 + xen/arch/x86/include/asm/hvm/irq.h | 227 +++++ xen/arch/x86/include/asm/hvm/monitor.h | 65 ++ xen/arch/x86/include/asm/hvm/nestedhvm.h | 100 ++ xen/arch/x86/include/asm/hvm/save.h | 144 +++ xen/arch/x86/include/asm/hvm/support.h | 170 ++++ xen/arch/x86/include/asm/hvm/svm/asid.h | 49 + xen/arch/x86/include/asm/hvm/svm/emulate.h | 66 ++ xen/arch/x86/include/asm/hvm/svm/intr.h | 25 + xen/arch/x86/include/asm/hvm/svm/nestedsvm.h | 145 +++ xen/arch/x86/include/asm/hvm/svm/svm.h | 110 +++ xen/arch/x86/include/asm/hvm/svm/svmdebug.h | 30 + xen/arch/x86/include/asm/hvm/svm/vmcb.h | 664 +++++++++++++ xen/arch/x86/include/asm/hvm/trace.h | 114 +++ xen/arch/x86/include/asm/hvm/vcpu.h | 210 ++++ xen/arch/x86/include/asm/hvm/vioapic.h | 72 ++ xen/arch/x86/include/asm/hvm/viridian.h | 112 +++ xen/arch/x86/include/asm/hvm/vlapic.h | 157 +++ xen/arch/x86/include/asm/hvm/vm_event.h | 34 + xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 688 +++++++++++++ xen/arch/x86/include/asm/hvm/vmx/vmx.h | 692 +++++++++++++ xen/arch/x86/include/asm/hvm/vmx/vvmx.h | 214 ++++ xen/arch/x86/include/asm/hvm/vpic.h | 40 + xen/arch/x86/include/asm/hvm/vpt.h | 205 ++++ xen/arch/x86/include/asm/hypercall.h | 198 ++++ xen/arch/x86/include/asm/i387.h | 40 + xen/arch/x86/include/asm/init.h | 4 + xen/arch/x86/include/asm/invpcid.h | 67 ++ xen/arch/x86/include/asm/io.h | 56 ++ xen/arch/x86/include/asm/io_apic.h | 212 ++++ xen/arch/x86/include/asm/iocap.h | 21 + xen/arch/x86/include/asm/iommu.h | 155 +++ xen/arch/x86/include/asm/ioreq.h | 39 + xen/arch/x86/include/asm/irq.h | 221 +++++ xen/arch/x86/include/asm/ldt.h | 35 + xen/arch/x86/include/asm/livepatch.h | 25 + xen/arch/x86/include/asm/mach-default/bios_ebda.h | 15 + xen/arch/x86/include/asm/mach-default/io_ports.h | 30 + .../x86/include/asm/mach-default/irq_vectors.h | 46 + .../x86/include/asm/mach-default/mach_mpspec.h | 10 + xen/arch/x86/include/asm/mach-generic/mach_apic.h | 80 ++ xen/arch/x86/include/asm/machine_kexec.h | 16 + xen/arch/x86/include/asm/mc146818rtc.h | 116 +++ xen/arch/x86/include/asm/mce.h | 49 + xen/arch/x86/include/asm/mem_access.h | 68 ++ xen/arch/x86/include/asm/mem_paging.h | 42 + xen/arch/x86/include/asm/mem_sharing.h | 153 +++ xen/arch/x86/include/asm/microcode.h | 27 + xen/arch/x86/include/asm/mm.h | 655 +++++++++++++ xen/arch/x86/include/asm/monitor.h | 126 +++ xen/arch/x86/include/asm/mpspec.h | 73 ++ xen/arch/x86/include/asm/mpspec_def.h | 188 ++++ xen/arch/x86/include/asm/msi.h | 256 +++++ xen/arch/x86/include/asm/msr-index.h | 671 +++++++++++++ xen/arch/x86/include/asm/msr.h | 381 ++++++++ xen/arch/x86/include/asm/mtrr.h | 103 ++ xen/arch/x86/include/asm/multicall.h | 12 + xen/arch/x86/include/asm/mwait.h | 19 + xen/arch/x86/include/asm/nmi.h | 46 + xen/arch/x86/include/asm/nops.h | 70 ++ xen/arch/x86/include/asm/nospec.h | 39 + xen/arch/x86/include/asm/numa.h | 84 ++ xen/arch/x86/include/asm/p2m.h | 1022 ++++++++++++++++++++ xen/arch/x86/include/asm/page-bits.h | 26 + xen/arch/x86/include/asm/page.h | 409 ++++++++ xen/arch/x86/include/asm/paging.h | 433 +++++++++ xen/arch/x86/include/asm/pci.h | 41 + xen/arch/x86/include/asm/percpu.h | 22 + xen/arch/x86/include/asm/perfc.h | 12 + xen/arch/x86/include/asm/perfc_defn.h | 120 +++ xen/arch/x86/include/asm/processor.h | 650 +++++++++++++ xen/arch/x86/include/asm/psr.h | 99 ++ xen/arch/x86/include/asm/pv/domain.h | 120 +++ xen/arch/x86/include/asm/pv/grant_table.h | 60 ++ xen/arch/x86/include/asm/pv/mm.h | 60 ++ xen/arch/x86/include/asm/pv/shim.h | 119 +++ xen/arch/x86/include/asm/pv/trace.h | 48 + xen/arch/x86/include/asm/pv/traps.h | 71 ++ xen/arch/x86/include/asm/random.h | 16 + xen/arch/x86/include/asm/regs.h | 33 + xen/arch/x86/include/asm/setup.h | 75 ++ xen/arch/x86/include/asm/shadow.h | 273 ++++++ xen/arch/x86/include/asm/shared.h | 79 ++ xen/arch/x86/include/asm/smp.h | 90 ++ xen/arch/x86/include/asm/softirq.h | 14 + xen/arch/x86/include/asm/spec_ctrl.h | 151 +++ xen/arch/x86/include/asm/spec_ctrl_asm.h | 342 +++++++ xen/arch/x86/include/asm/spinlock.h | 27 + xen/arch/x86/include/asm/string.h | 12 + xen/arch/x86/include/asm/system.h | 295 ++++++ xen/arch/x86/include/asm/tboot.h | 160 +++ xen/arch/x86/include/asm/time.h | 76 ++ xen/arch/x86/include/asm/trace.h | 4 + xen/arch/x86/include/asm/traps.h | 34 + xen/arch/x86/include/asm/types.h | 50 + xen/arch/x86/include/asm/uaccess.h | 429 ++++++++ xen/arch/x86/include/asm/unaligned.h | 6 + xen/arch/x86/include/asm/vm_event.h | 59 ++ xen/arch/x86/include/asm/vpmu.h | 140 +++ xen/arch/x86/include/asm/x86-defns.h | 156 +++ xen/arch/x86/include/asm/x86-vendors.h | 39 + xen/arch/x86/include/asm/x86_64/efibind.h | 280 ++++++ xen/arch/x86/include/asm/x86_64/elf.h | 85 ++ xen/arch/x86/include/asm/x86_64/page.h | 166 ++++ xen/arch/x86/include/asm/x86_64/regs.h | 28 + xen/arch/x86/include/asm/x86_64/system.h | 62 ++ xen/arch/x86/include/asm/x86_64/uaccess.h | 70 ++ xen/arch/x86/include/asm/x86_emulate.h | 21 + xen/arch/x86/include/asm/xenoprof.h | 107 ++ xen/arch/x86/include/asm/xstate.h | 141 +++ xen/common/efi/runtime.c | 2 +- xen/common/page_alloc.c | 2 +- xen/include/asm-arm/acpi.h | 82 -- xen/include/asm-arm/alternative.h | 221 ----- xen/include/asm-arm/altp2m.h | 39 - xen/include/asm-arm/arm32/atomic.h | 175 ---- xen/include/asm-arm/arm32/bitops.h | 42 - xen/include/asm-arm/arm32/bug.h | 15 - xen/include/asm-arm/arm32/cmpxchg.h | 229 ----- xen/include/asm-arm/arm32/flushtlb.h | 63 -- xen/include/asm-arm/arm32/insn.h | 71 -- xen/include/asm-arm/arm32/io.h | 96 -- xen/include/asm-arm/arm32/macros.h | 8 - xen/include/asm-arm/arm32/mm.h | 23 - xen/include/asm-arm/arm32/page.h | 118 --- xen/include/asm-arm/arm32/processor.h | 69 -- xen/include/asm-arm/arm32/sysregs.h | 78 -- xen/include/asm-arm/arm32/system.h | 77 -- xen/include/asm-arm/arm32/traps.h | 13 - xen/include/asm-arm/arm32/vfp.h | 41 - xen/include/asm-arm/arm64/atomic.h | 148 --- xen/include/asm-arm/arm64/bitops.h | 98 -- xen/include/asm-arm/arm64/brk.h | 39 - xen/include/asm-arm/arm64/bug.h | 11 - xen/include/asm-arm/arm64/cmpxchg.h | 183 ---- xen/include/asm-arm/arm64/cpufeature.h | 104 -- xen/include/asm-arm/arm64/efibind.h | 216 ----- xen/include/asm-arm/arm64/flushtlb.h | 77 -- xen/include/asm-arm/arm64/hsr.h | 159 --- xen/include/asm-arm/arm64/insn.h | 110 --- xen/include/asm-arm/arm64/io.h | 148 --- xen/include/asm-arm/arm64/macros.h | 36 - xen/include/asm-arm/arm64/mm.h | 23 - xen/include/asm-arm/arm64/page.h | 103 -- xen/include/asm-arm/arm64/processor.h | 99 -- xen/include/asm-arm/arm64/sysregs.h | 423 -------- xen/include/asm-arm/arm64/system.h | 91 -- xen/include/asm-arm/arm64/traps.h | 18 - xen/include/asm-arm/arm64/vfp.h | 23 - xen/include/asm-arm/asm_defns.h | 44 - xen/include/asm-arm/atomic.h | 236 ----- xen/include/asm-arm/bitops.h | 192 ---- xen/include/asm-arm/bug.h | 106 -- xen/include/asm-arm/byteorder.h | 16 - xen/include/asm-arm/cache.h | 19 - xen/include/asm-arm/cadence-uart.h | 55 -- xen/include/asm-arm/config.h | 207 ---- xen/include/asm-arm/cpregs.h | 375 ------- xen/include/asm-arm/cpuerrata.h | 85 -- xen/include/asm-arm/cpufeature.h | 428 -------- xen/include/asm-arm/current.h | 73 -- xen/include/asm-arm/debugger.h | 15 - xen/include/asm-arm/delay.h | 14 - xen/include/asm-arm/desc.h | 12 - xen/include/asm-arm/device.h | 124 --- xen/include/asm-arm/div64.h | 250 ----- xen/include/asm-arm/domain.h | 279 ------ xen/include/asm-arm/domain_build.h | 31 - xen/include/asm-arm/early_printk.h | 23 - xen/include/asm-arm/efibind.h | 2 - xen/include/asm-arm/elf.h | 33 - xen/include/asm-arm/event.h | 63 -- xen/include/asm-arm/exynos4210-uart.h | 112 --- xen/include/asm-arm/flushtlb.h | 77 -- xen/include/asm-arm/gic.h | 459 --------- xen/include/asm-arm/gic_v3_defs.h | 220 ----- xen/include/asm-arm/gic_v3_its.h | 283 ------ xen/include/asm-arm/grant_table.h | 108 --- xen/include/asm-arm/guest_access.h | 42 - xen/include/asm-arm/guest_atomics.h | 148 --- xen/include/asm-arm/guest_walk.h | 19 - xen/include/asm-arm/hardirq.h | 27 - xen/include/asm-arm/hsr.h | 217 ----- xen/include/asm-arm/hypercall.h | 20 - xen/include/asm-arm/init.h | 20 - xen/include/asm-arm/insn.h | 29 - xen/include/asm-arm/io.h | 20 - xen/include/asm-arm/iocap.h | 16 - xen/include/asm-arm/iommu.h | 45 - xen/include/asm-arm/iommu_fwspec.h | 68 -- xen/include/asm-arm/ioreq.h | 70 -- xen/include/asm-arm/irq.h | 109 --- xen/include/asm-arm/kernel.h | 89 -- xen/include/asm-arm/livepatch.h | 37 - xen/include/asm-arm/lpae.h | 257 ----- xen/include/asm-arm/macros.h | 32 - xen/include/asm-arm/mem_access.h | 53 - xen/include/asm-arm/mm.h | 373 ------- xen/include/asm-arm/mmio.h | 86 -- xen/include/asm-arm/monitor.h | 68 -- xen/include/asm-arm/new_vgic.h | 198 ---- xen/include/asm-arm/nospec.h | 25 - xen/include/asm-arm/numa.h | 36 - xen/include/asm-arm/p2m.h | 439 --------- xen/include/asm-arm/page-bits.h | 12 - xen/include/asm-arm/page.h | 293 ------ xen/include/asm-arm/paging.h | 16 - xen/include/asm-arm/pci.h | 133 --- xen/include/asm-arm/percpu.h | 33 - xen/include/asm-arm/perfc.h | 21 - xen/include/asm-arm/perfc_defn.h | 89 -- xen/include/asm-arm/pl011-uart.h | 87 -- xen/include/asm-arm/platform.h | 82 -- xen/include/asm-arm/platforms/exynos5.h | 20 - xen/include/asm-arm/platforms/midway.h | 21 - xen/include/asm-arm/platforms/omap5.h | 32 - xen/include/asm-arm/platforms/vexpress.h | 37 - xen/include/asm-arm/platforms/xilinx-zynqmp-eemi.h | 128 --- xen/include/asm-arm/processor.h | 598 ------------ xen/include/asm-arm/procinfo.h | 43 - xen/include/asm-arm/psci.h | 91 -- xen/include/asm-arm/random.h | 9 - xen/include/asm-arm/regs.h | 73 -- xen/include/asm-arm/scif-uart.h | 127 --- xen/include/asm-arm/setup.h | 135 --- xen/include/asm-arm/short-desc.h | 130 --- xen/include/asm-arm/smccc.h | 356 ------- xen/include/asm-arm/smp.h | 46 - xen/include/asm-arm/softirq.h | 16 - xen/include/asm-arm/spinlock.h | 15 - xen/include/asm-arm/string.h | 53 - xen/include/asm-arm/sysregs.h | 22 - xen/include/asm-arm/system.h | 73 -- xen/include/asm-arm/tee/optee_msg.h | 310 ------ xen/include/asm-arm/tee/optee_rpc_cmd.h | 318 ------ xen/include/asm-arm/tee/optee_smc.h | 567 ----------- xen/include/asm-arm/tee/tee.h | 112 --- xen/include/asm-arm/time.h | 118 --- xen/include/asm-arm/trace.h | 12 - xen/include/asm-arm/traps.h | 121 --- xen/include/asm-arm/types.h | 80 -- xen/include/asm-arm/vfp.h | 25 - xen/include/asm-arm/vgic-emul.h | 33 - xen/include/asm-arm/vgic.h | 383 -------- xen/include/asm-arm/vm_event.h | 67 -- xen/include/asm-arm/vpl011.h | 89 -- xen/include/asm-arm/vpsci.h | 42 - xen/include/asm-arm/vreg.h | 196 ---- xen/include/asm-arm/vtimer.h | 41 - xen/include/asm-arm/xenoprof.h | 12 - xen/include/asm-riscv/config.h | 47 - xen/include/asm-x86/acpi.h | 162 ---- xen/include/asm-x86/alternative-asm.h | 125 --- xen/include/asm-x86/alternative.h | 387 -------- xen/include/asm-x86/altp2m.h | 57 -- xen/include/asm-x86/amd.h | 154 --- xen/include/asm-x86/apic.h | 202 ---- xen/include/asm-x86/apicdef.h | 134 --- xen/include/asm-x86/asm-defns.h | 78 -- xen/include/asm-x86/asm_defns.h | 354 ------- xen/include/asm-x86/atomic.h | 239 ----- xen/include/asm-x86/bitops.h | 483 --------- xen/include/asm-x86/bug.h | 125 --- xen/include/asm-x86/byteorder.h | 36 - xen/include/asm-x86/bzimage.h | 11 - xen/include/asm-x86/cache.h | 14 - xen/include/asm-x86/compat.h | 20 - xen/include/asm-x86/config.h | 329 ------- xen/include/asm-x86/cpufeature.h | 214 ---- xen/include/asm-x86/cpufeatures.h | 51 - xen/include/asm-x86/cpufeatureset.h | 40 - xen/include/asm-x86/cpuid.h | 80 -- xen/include/asm-x86/cpuidle.h | 31 - xen/include/asm-x86/current.h | 210 ---- xen/include/asm-x86/debugger.h | 101 -- xen/include/asm-x86/debugreg.h | 83 -- xen/include/asm-x86/delay.h | 13 - xen/include/asm-x86/desc.h | 252 ----- xen/include/asm-x86/device.h | 25 - xen/include/asm-x86/div64.h | 14 - xen/include/asm-x86/dom0_build.h | 42 - xen/include/asm-x86/domain.h | 769 --------------- xen/include/asm-x86/e820.h | 42 - xen/include/asm-x86/edd.h | 164 ---- xen/include/asm-x86/efibind.h | 2 - xen/include/asm-x86/elf.h | 20 - xen/include/asm-x86/event.h | 56 -- xen/include/asm-x86/fixmap.h | 117 --- xen/include/asm-x86/flushtlb.h | 203 ---- xen/include/asm-x86/genapic.h | 70 -- xen/include/asm-x86/grant_table.h | 80 -- xen/include/asm-x86/guest.h | 39 - xen/include/asm-x86/guest/hyperv-hcall.h | 97 -- xen/include/asm-x86/guest/hyperv-tlfs.h | 934 ------------------ xen/include/asm-x86/guest/hyperv.h | 86 -- xen/include/asm-x86/guest/hypervisor.h | 85 -- xen/include/asm-x86/guest/pvh-boot.h | 58 -- xen/include/asm-x86/guest/xen-hcall.h | 212 ---- xen/include/asm-x86/guest/xen.h | 61 -- xen/include/asm-x86/guest_access.h | 59 -- xen/include/asm-x86/guest_atomics.h | 33 - xen/include/asm-x86/guest_pt.h | 468 --------- xen/include/asm-x86/hap.h | 60 -- xen/include/asm-x86/hardirq.h | 37 - xen/include/asm-x86/hpet.h | 101 -- xen/include/asm-x86/hvm/asid.h | 52 - xen/include/asm-x86/hvm/cacheattr.h | 23 - xen/include/asm-x86/hvm/domain.h | 173 ---- xen/include/asm-x86/hvm/emulate.h | 156 --- xen/include/asm-x86/hvm/grant_table.h | 61 -- xen/include/asm-x86/hvm/guest_access.h | 8 - xen/include/asm-x86/hvm/hvm.h | 886 ----------------- xen/include/asm-x86/hvm/io.h | 181 ---- xen/include/asm-x86/hvm/ioreq.h | 37 - xen/include/asm-x86/hvm/irq.h | 227 ----- xen/include/asm-x86/hvm/monitor.h | 65 -- xen/include/asm-x86/hvm/nestedhvm.h | 100 -- xen/include/asm-x86/hvm/save.h | 144 --- xen/include/asm-x86/hvm/support.h | 170 ---- xen/include/asm-x86/hvm/svm/asid.h | 49 - xen/include/asm-x86/hvm/svm/emulate.h | 66 -- xen/include/asm-x86/hvm/svm/intr.h | 25 - xen/include/asm-x86/hvm/svm/nestedsvm.h | 145 --- xen/include/asm-x86/hvm/svm/svm.h | 110 --- xen/include/asm-x86/hvm/svm/svmdebug.h | 30 - xen/include/asm-x86/hvm/svm/vmcb.h | 664 ------------- xen/include/asm-x86/hvm/trace.h | 114 --- xen/include/asm-x86/hvm/vcpu.h | 210 ---- xen/include/asm-x86/hvm/vioapic.h | 72 -- xen/include/asm-x86/hvm/viridian.h | 112 --- xen/include/asm-x86/hvm/vlapic.h | 157 --- xen/include/asm-x86/hvm/vm_event.h | 34 - xen/include/asm-x86/hvm/vmx/vmcs.h | 688 ------------- xen/include/asm-x86/hvm/vmx/vmx.h | 692 ------------- xen/include/asm-x86/hvm/vmx/vvmx.h | 214 ---- xen/include/asm-x86/hvm/vpic.h | 40 - xen/include/asm-x86/hvm/vpt.h | 205 ---- xen/include/asm-x86/hypercall.h | 198 ---- xen/include/asm-x86/i387.h | 40 - xen/include/asm-x86/init.h | 4 - xen/include/asm-x86/invpcid.h | 67 -- xen/include/asm-x86/io.h | 56 -- xen/include/asm-x86/io_apic.h | 212 ---- xen/include/asm-x86/iocap.h | 21 - xen/include/asm-x86/iommu.h | 155 --- xen/include/asm-x86/ioreq.h | 39 - xen/include/asm-x86/irq.h | 221 ----- xen/include/asm-x86/ldt.h | 35 - xen/include/asm-x86/livepatch.h | 25 - xen/include/asm-x86/mach-default/bios_ebda.h | 15 - xen/include/asm-x86/mach-default/io_ports.h | 30 - xen/include/asm-x86/mach-default/irq_vectors.h | 46 - xen/include/asm-x86/mach-default/mach_mpspec.h | 10 - xen/include/asm-x86/mach-generic/mach_apic.h | 80 -- xen/include/asm-x86/machine_kexec.h | 16 - xen/include/asm-x86/mc146818rtc.h | 116 --- xen/include/asm-x86/mce.h | 49 - xen/include/asm-x86/mem_access.h | 68 -- xen/include/asm-x86/mem_paging.h | 42 - xen/include/asm-x86/mem_sharing.h | 153 --- xen/include/asm-x86/microcode.h | 27 - xen/include/asm-x86/mm.h | 655 ------------- xen/include/asm-x86/monitor.h | 126 --- xen/include/asm-x86/mpspec.h | 73 -- xen/include/asm-x86/mpspec_def.h | 188 ---- xen/include/asm-x86/msi.h | 256 ----- xen/include/asm-x86/msr-index.h | 671 ------------- xen/include/asm-x86/msr.h | 381 -------- xen/include/asm-x86/mtrr.h | 103 -- xen/include/asm-x86/multicall.h | 12 - xen/include/asm-x86/mwait.h | 19 - xen/include/asm-x86/nmi.h | 46 - xen/include/asm-x86/nops.h | 70 -- xen/include/asm-x86/nospec.h | 39 - xen/include/asm-x86/numa.h | 84 -- xen/include/asm-x86/p2m.h | 1022 -------------------- xen/include/asm-x86/page-bits.h | 26 - xen/include/asm-x86/page.h | 409 -------- xen/include/asm-x86/paging.h | 433 --------- xen/include/asm-x86/pci.h | 41 - xen/include/asm-x86/percpu.h | 22 - xen/include/asm-x86/perfc.h | 12 - xen/include/asm-x86/perfc_defn.h | 120 --- xen/include/asm-x86/processor.h | 650 ------------- xen/include/asm-x86/psr.h | 99 -- xen/include/asm-x86/pv/domain.h | 120 --- xen/include/asm-x86/pv/grant_table.h | 60 -- xen/include/asm-x86/pv/mm.h | 60 -- xen/include/asm-x86/pv/shim.h | 119 --- xen/include/asm-x86/pv/trace.h | 48 - xen/include/asm-x86/pv/traps.h | 71 -- xen/include/asm-x86/random.h | 16 - xen/include/asm-x86/regs.h | 33 - xen/include/asm-x86/setup.h | 75 -- xen/include/asm-x86/shadow.h | 273 ------ xen/include/asm-x86/shared.h | 79 -- xen/include/asm-x86/smp.h | 90 -- xen/include/asm-x86/softirq.h | 14 - xen/include/asm-x86/spec_ctrl.h | 151 --- xen/include/asm-x86/spec_ctrl_asm.h | 342 ------- xen/include/asm-x86/spinlock.h | 27 - xen/include/asm-x86/string.h | 12 - xen/include/asm-x86/system.h | 295 ------ xen/include/asm-x86/tboot.h | 160 --- xen/include/asm-x86/time.h | 76 -- xen/include/asm-x86/trace.h | 4 - xen/include/asm-x86/traps.h | 34 - xen/include/asm-x86/types.h | 50 - xen/include/asm-x86/uaccess.h | 429 -------- xen/include/asm-x86/unaligned.h | 6 - xen/include/asm-x86/vm_event.h | 59 -- xen/include/asm-x86/vpmu.h | 140 --- xen/include/asm-x86/x86-defns.h | 156 --- xen/include/asm-x86/x86-vendors.h | 39 - xen/include/asm-x86/x86_64/efibind.h | 280 ------ xen/include/asm-x86/x86_64/elf.h | 85 -- xen/include/asm-x86/x86_64/page.h | 166 ---- xen/include/asm-x86/x86_64/regs.h | 28 - xen/include/asm-x86/x86_64/system.h | 62 -- xen/include/asm-x86/x86_64/uaccess.h | 70 -- xen/include/asm-x86/x86_emulate.h | 21 - xen/include/asm-x86/xenoprof.h | 107 -- xen/include/asm-x86/xstate.h | 141 --- xen/include/xen/acpi.h | 5 +- xen/include/xen/bitmap.h | 2 +- 641 files changed, 40578 insertions(+), 40579 deletions(-) diff --git a/.gitignore b/.gitignore index 111eb03b86..e13cbf84b2 100644 --- a/.gitignore +++ b/.gitignore @@ -314,6 +314,7 @@ xen/arch/x86/boot/*.lnk xen/arch/x86/efi.lds xen/arch/x86/efi/check.efi xen/arch/x86/efi/mkreloc +xen/arch/x86/include/asm/asm-macros.h xen/arch/*/xen.lds xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c @@ -321,12 +322,10 @@ xen/arch/*/efi/ebmalloc.c xen/arch/*/efi/efi.h xen/arch/*/efi/pe.c xen/arch/*/efi/runtime.c +xen/arch/*/include/asm/asm-offsets.h xen/common/config_data.S xen/common/config.gz xen/include/headers*.chk -xen/include/asm -xen/include/asm-*/asm-offsets.h -xen/include/asm-x86/asm-macros.h xen/include/compat/* xen/include/config/ xen/include/generated/ diff --git a/MAINTAINERS b/MAINTAINERS index 22ea62d964..6e84a05760 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -245,7 +245,6 @@ F: xen/drivers/char/omap-uart.c F: xen/drivers/char/pl011.c F: xen/drivers/char/scif-uart.c F: xen/drivers/passthrough/arm/ -F: xen/include/asm-arm/ F: xen/include/public/arch-arm/ F: xen/include/public/arch-arm.h @@ -290,10 +289,10 @@ EFI M: Jan Beulich S: Supported F: xen/arch/x86/efi/ +F: xen/arch/x86/include/asm/efi*.h +F: xen/arch/x86/include/asm/x86_*/efi*.h F: xen/common/efi/ F: xen/include/efi/ -F: xen/include/asm-x86/efi*.h -F: xen/include/asm-x86/x86_*/efi*.h GDBSX DEBUGGER M: Elena Ufimtseva @@ -319,8 +318,8 @@ F: xen/include/xen/hypfs.h INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) R: Lukasz Hawrylko S: Odd Fixes +F: xen/arch/x86/include/asm/tboot.h F: xen/arch/x86/tboot.c -F: xen/include/asm-x86/tboot.h INTEL(R) VT FOR DIRECTED I/O (VT-D) M: Kevin Tian @@ -331,10 +330,10 @@ INTEL(R) VT FOR X86 (VT-X) M: Jun Nakajima M: Kevin Tian S: Supported +F: xen/arch/x86/cpu/vpmu_intel.c F: xen/arch/x86/hvm/vmx/ +F: xen/arch/x86/include/asm/hvm/vmx/ F: xen/arch/x86/mm/p2m-ept.c -F: xen/include/asm-x86/hvm/vmx/ -F: xen/arch/x86/cpu/vpmu_intel.c IOMMU VENDOR INDEPENDENT CODE M: Jan Beulich @@ -401,10 +400,10 @@ M: Ross Lagerwall S: Supported F: docs/misc/livepatch.pandoc F: tools/misc/xen-livepatch.c +F: xen/arch/*/include/asm/livepatch.h F: xen/arch/*/livepatch* F: xen/arch/*/*/livepatch* F: xen/common/livepatch* -F: xen/include/asm-*/livepatch.h F: xen/include/xen/livepatch* F: xen/test/livepatch/* @@ -473,7 +472,6 @@ R: Connor Davis S: Supported F: config/riscv64.mk F: xen/arch/riscv/ -F: xen/include/asm-riscv/ RTDS SCHEDULER M: Dario Faggioli @@ -502,8 +500,8 @@ F: stubdom/ TEE MEDIATORS M: Volodymyr Babchuk S: Supported +F: xen/arch/arm/include/asm/tee F: xen/arch/arm/tee/ -F: xen/include/asm-arm/tee TOOLSTACK M: Wei Liu @@ -531,6 +529,8 @@ F: tools/misc/xen-access.c F: xen/arch/*/monitor.c F: xen/arch/*/vm_event.c F: xen/arch/arm/mem_access.c +F: xen/arch/x86/include/asm/hvm/monitor.h +F: xen/arch/x86/include/asm/hvm/vm_event.h F: xen/arch/x86/mm/mem_access.c F: xen/arch/x86/hvm/monitor.c F: xen/arch/x86/hvm/vm_event.c @@ -540,8 +540,6 @@ F: xen/common/vm_event.c F: xen/include/*/mem_access.h F: xen/include/*/monitor.h F: xen/include/*/vm_event.h -F: xen/include/asm-x86/hvm/monitor.h -F: xen/include/asm-x86/hvm/vm_event.h VPCI M: Roger Pau Monné @@ -567,7 +565,6 @@ R: Wei Liu S: Supported L: xen-devel@lists.xenproject.org F: xen/arch/x86/ -F: xen/include/asm-x86/ F: xen/include/public/arch-x86/ F: xen/include/xen/lib/x86 F: xen/lib/x86 @@ -587,10 +584,10 @@ F: xen/arch/x86/hvm/emulate.c F: xen/arch/x86/hvm/intercept.c F: xen/arch/x86/hvm/io.c F: xen/arch/x86/hvm/ioreq.c -F: xen/include/asm-x86/hvm/emulate.h -F: xen/include/asm-x86/hvm/io.h -F: xen/include/asm-x86/hvm/ioreq.h -F: xen/include/asm-x86/ioreq.h +F: xen/arch/x86/include/asm/hvm/emulate.h +F: xen/arch/x86/include/asm/hvm/io.h +F: xen/arch/x86/include/asm/hvm/ioreq.h +F: xen/arch/x86/include/asm/ioreq.h X86 MEMORY MANAGEMENT M: Jan Beulich @@ -622,10 +619,10 @@ M: Wei Liu S: Supported F: xen/arch/x86/guest/hyperv/ F: xen/arch/x86/hvm/viridian/ -F: xen/include/asm-x86/guest/hyperv.h -F: xen/include/asm-x86/guest/hyperv-hcall.h -F: xen/include/asm-x86/guest/hyperv-tlfs.h -F: xen/include/asm-x86/hvm/viridian.h +F: xen/arch/x86/include/asm/guest/hyperv.h +F: xen/arch/x86/include/asm/guest/hyperv-hcall.h +F: xen/arch/x86/include/asm/guest/hyperv-tlfs.h +F: xen/arch/x86/include/asm/hvm/viridian.h XENSTORE M: Wei Liu diff --git a/tools/include/Makefile b/tools/include/Makefile index 42605d46b9..d7b51006e0 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -30,7 +30,7 @@ xen-dir: ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/ ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/ ifeq ($(CONFIG_X86),y) - ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm + ln -s $(XEN_ROOT)/xen/arch/x86/include/asm xen/ mkdir -p xen/lib/x86 ln -s $(filter-out %autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/ ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/ diff --git a/tools/misc/xen-access.c b/tools/misc/xen-access.c index 4bbef0bd2e..0731c20b83 100644 --- a/tools/misc/xen-access.c +++ b/tools/misc/xen-access.c @@ -56,11 +56,11 @@ #define ERROR(a, b...) fprintf(stderr, a "\n", ## b) #define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) -/* From xen/include/asm-x86/processor.h */ +/* From xen/arch/x86/include/asm/processor.h */ #define X86_TRAP_DEBUG 1 #define X86_TRAP_INT3 3 -/* From xen/include/asm-x86/x86-defns.h */ +/* From xen/arch/x86/include/asm/x86-defns.h */ #define X86_CR4_PGE 0x00000080 /* enable global pages */ typedef struct vm_event { diff --git a/tools/tests/vhpet/Makefile b/tools/tests/vhpet/Makefile index cb88dd01c5..2d56ffdfd9 100644 --- a/tools/tests/vhpet/Makefile +++ b/tools/tests/vhpet/Makefile @@ -32,7 +32,7 @@ distclean: clean .PHONY: install install: -hpet.h: $(XEN_ROOT)/xen/include/asm-x86/hpet.h +hpet.h: $(XEN_ROOT)/xen/arch/x86/include/asm/hpet.h cp $< $@ hpet.c: $(XEN_ROOT)/xen/arch/x86/hvm/hpet.c diff --git a/xen/Makefile b/xen/Makefile index 1fd48af7ae..b2a63edca1 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -166,7 +166,7 @@ ifeq ($(TARGET_ARCH),x86) t1 = $(call as-insn,$(CC),".L0: .L1: .skip (.L1 - .L0)",,-no-integrated-as) # Check whether clang asm()-s support .include. -t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/asm-defns.h\"",,-no-integrated-as) +t2 = $(call as-insn,$(CC) -I$(BASEDIR)/arch/x86/include,".include \"asm/asm-defns.h\"",,-no-integrated-as) # Check whether clang keeps .macro-s between asm()-s: # https://bugs.llvm.org/show_bug.cgi?id=36110 @@ -382,7 +382,7 @@ _clean: delete-unfresh-files -o -name ".*.o.tmp" -o -name "*~" -o -name "core" \ -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core - rm -f asm-offsets.s include/asm-*/asm-offsets.h + rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h rm -f .banner .allconfig.tmp .PHONY: _distclean @@ -396,7 +396,6 @@ $(TARGET).gz: $(TARGET) $(TARGET): delete-unfresh-files $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h - [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \ do test -r arch/$(TARGET_ARCH)/efi/$$f || \ ln -nsf ../../../common/efi/$$f arch/$(TARGET_ARCH)/efi/; \ @@ -404,7 +403,7 @@ $(TARGET): delete-unfresh-files true $(MAKE) -f $(BASEDIR)/Rules.mk -C include $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) include - $(MAKE) -f $(BASEDIR)/Rules.mk include/asm-$(TARGET_ARCH)/asm-offsets.h + $(MAKE) -f $(BASEDIR)/Rules.mk arch/$(TARGET_ARCH)/include/asm/asm-offsets.h $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) $@ # drivers/char/console.o contains static banner/compile info. Blow it away. @@ -450,7 +449,7 @@ asm-offsets.s: arch/$(TARGET_ARCH)/$(TARGET_SUBARCH)/asm-offsets.c $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< $(call move-if-changed,$@.new,$@) -include/asm-$(TARGET_ARCH)/asm-offsets.h: asm-offsets.s +arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s @(set -e; \ echo "/*"; \ echo " * DO NOT MODIFY."; \ @@ -468,8 +467,8 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: asm-offsets.s SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers lib test define all_sources - ( find include/asm-$(TARGET_ARCH) -name '*.h' -print; \ - find include -name 'asm-*' -prune -o -name '*.h' -print; \ + ( find arch/$(TARGET_ARCH)/include -name '*.h' -print; \ + find include -name '*.h' -print; \ find $(SUBDIRS) -name '*.[chS]' -print ) endef diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 664a9f89ed..1d53e6a898 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -8,19 +8,19 @@ arm64: bitops: last sync @ v3.16-rc6 (last commit: 8715466b6027) -linux/arch/arm64/include/asm/bitops.h xen/include/asm-arm/arm64/bitops.h +linux/arch/arm64/include/asm/bitops.h xen/arch/arm/include/asm/arm64/bitops.h --------------------------------------------------------------------- cmpxchg: last sync @ v3.16-rc6 (last commit: e1dfda9ced9b) -linux/arch/arm64/include/asm/cmpxchg.h xen/include/asm-arm/arm64/cmpxchg.h +linux/arch/arm64/include/asm/cmpxchg.h xen/arch/arm/include/asm/arm64/cmpxchg.h --------------------------------------------------------------------- atomics: last sync @ v3.16-rc6 (last commit: 8715466b6027) -linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h +linux/arch/arm64/include/asm/atomic.h xen/arch/arm/include/asm/arm64/atomic.h The following functions were taken from Linux: atomic_add(), atomic_add_return(), atomic_sub(), atomic_sub_return(), @@ -76,13 +76,13 @@ diff -u ../linux/arch/arm/lib/findbit.S xen/arch/arm/arm32/lib/findbit.S cmpxchg: last sync @ v3.16-rc6 (last commit: c32ffce0f66e) -linux/arch/arm/include/asm/cmpxchg.h xen/include/asm-arm/arm32/cmpxchg.h +linux/arch/arm/include/asm/cmpxchg.h xen/arch/arm/include/asm/arm32/cmpxchg.h --------------------------------------------------------------------- atomics: last sync @ v3.16-rc6 (last commit: 030d0178bdbd) -linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h +linux/arch/arm/include/asm/atomic.h xen/arch/arm/include/asm/arm32/atomic.h The following functions were taken from Linux: atomic_add(), atomic_add_return(), atomic_sub(), atomic_sub_return(), diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk index 6a29820594..c3ac443b37 100644 --- a/xen/arch/arm/arch.mk +++ b/xen/arch/arm/arch.mk @@ -2,6 +2,7 @@ # arm-specific definitions CFLAGS += -I$(BASEDIR)/include +CFLAGS += -I$(BASEDIR)/arch/$(TARGET_ARCH)/include $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) $(call cc-option-add,CFLAGS,CC,-Wnested-externs) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 7178865f48..b5912d381b 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -599,7 +599,7 @@ remove_identity_mapping: strd r2, r3, [r0, r1] identity_mapping_removed: - /* See asm-arm/arm32/flushtlb.h for the explanation of the sequence. */ + /* See asm/arm32/flushtlb.h for the explanation of the sequence. */ dsb nshst mcr CP32(r0, TLBIALLH) dsb nsh diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index aa1f88c764..51b00ab0be 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -737,7 +737,7 @@ remove_identity_mapping: str xzr, [x0, x1, lsl #3] identity_mapping_removed: - /* See asm-arm/arm64/flushtlb.h for the explanation of the sequence. */ + /* See asm/arm64/flushtlb.h for the explanation of the sequence. */ dsb nshst tlbi alle2 dsb nsh diff --git a/xen/arch/arm/include/asm/acpi.h b/xen/arch/arm/include/asm/acpi.h new file mode 100644 index 0000000000..e53973e054 --- /dev/null +++ b/xen/arch/arm/include/asm/acpi.h @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2015, Shannon Zhao + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * 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 . + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ + +#ifndef _ASM_ARM_ACPI_H +#define _ASM_ARM_ACPI_H + +#include + +#define COMPILER_DEPENDENT_INT64 long long +#define COMPILER_DEPENDENT_UINT64 unsigned long long +#define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR + +/* Tables marked as reserved in efi table */ +typedef enum { + TBL_FADT, + TBL_MADT, + TBL_STAO, + TBL_XSDT, + TBL_RSDP, + TBL_EFIT, + TBL_MMAP, + TBL_MMAX, +} EFI_MEM_RES; + +bool acpi_psci_present(void); +bool acpi_psci_hvc_present(void); +void acpi_smp_init_cpus(void); + +/* + * This function returns the offset of a given ACPI/EFI table in the allocated + * memory region. Currently, the tables should be created in the same order as + * their associated 'index' in the enum EFI_MEM_RES. This means the function + * won't return the correct offset until all the tables before a given 'index' + * are created. + */ +paddr_t acpi_get_table_offset(struct membank tbl_add[], EFI_MEM_RES index); + +/* Macros for consistency checks of the GICC subtable of MADT */ +#define ACPI_MADT_GICC_LENGTH \ + (acpi_gbl_FADT.header.revision < 6 ? 76 : 80) + +#define BAD_MADT_GICC_ENTRY(entry, end) \ + (!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) || \ + (entry)->header.length != ACPI_MADT_GICC_LENGTH) + +#ifdef CONFIG_ACPI +extern bool acpi_disabled; +/* Basic configuration for ACPI */ +static inline void disable_acpi(void) +{ + acpi_disabled = true; +} + +static inline void enable_acpi(void) +{ + acpi_disabled = false; +} +#else +#define acpi_disabled (true) +#define disable_acpi() +#define enable_acpi() +#endif + +#endif /*_ASM_ARM_ACPI_H*/ diff --git a/xen/arch/arm/include/asm/alternative.h b/xen/arch/arm/include/asm/alternative.h new file mode 100644 index 0000000000..1eb4b60fbb --- /dev/null +++ b/xen/arch/arm/include/asm/alternative.h @@ -0,0 +1,221 @@ +#ifndef __ASM_ALTERNATIVE_H +#define __ASM_ALTERNATIVE_H + +#include +#include + +#define ARM_CB_PATCH ARM_NCAPS + +#ifndef __ASSEMBLY__ + +#include +#include + +struct alt_instr { + s32 orig_offset; /* offset to original instruction */ + s32 alt_offset; /* offset to replacement instruction */ + u16 cpufeature; /* cpufeature bit set for replacement */ + u8 orig_len; /* size of original instruction(s) */ + u8 alt_len; /* size of new instruction(s), <= orig_len */ +}; + +/* Xen: helpers used by common code. */ +#define __ALT_PTR(a,f) ((void *)&(a)->f + (a)->f) +#define ALT_ORIG_PTR(a) __ALT_PTR(a, orig_offset) +#define ALT_REPL_PTR(a) __ALT_PTR(a, alt_offset) + +typedef void (*alternative_cb_t)(const struct alt_instr *alt, + const uint32_t *origptr, uint32_t *updptr, + int nr_inst); + +void apply_alternatives_all(void); +int apply_alternatives(const struct alt_instr *start, const struct alt_instr *end); + +#define ALTINSTR_ENTRY(feature, cb) \ + " .word 661b - .\n" /* label */ \ + " .if " __stringify(cb) " == 0\n" \ + " .word 663f - .\n" /* new instruction */ \ + " .else\n" \ + " .word " __stringify(cb) "- .\n" /* callback */ \ + " .endif\n" \ + " .hword " __stringify(feature) "\n" /* feature bit */ \ + " .byte 662b-661b\n" /* source len */ \ + " .byte 664f-663f\n" /* replacement len */ + +/* + * alternative assembly primitive: + * + * If any of these .org directive fail, it means that insn1 and insn2 + * don't have the same length. This used to be written as + * + * .if ((664b-663b) != (662b-661b)) + * .error "Alternatives instruction length mismatch" + * .endif + * + * but most assemblers die if insn1 or insn2 have a .inst. This should + * be fixed in a binutils release posterior to 2.25.51.0.2 (anything + * containing commit 4e4d08cf7399b606 or c1baaddf8861). + * + * Alternatives with callbacks do not generate replacement instructions. + */ +#define __ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg_enabled, cb) \ + ".if "__stringify(cfg_enabled)" == 1\n" \ + "661:\n\t" \ + oldinstr "\n" \ + "662:\n" \ + ".pushsection .altinstructions,\"a\"\n" \ + ALTINSTR_ENTRY(feature,cb) \ + ".popsection\n" \ + " .if " __stringify(cb) " == 0\n" \ + ".pushsection .altinstr_replacement, \"ax\"\n" \ + "663:\n\t" \ + newinstr "\n" \ + "664:\n\t" \ + ".popsection\n\t" \ + ".org . - (664b-663b) + (662b-661b)\n\t" \ + ".org . - (662b-661b) + (664b-663b)\n" \ + ".else\n\t" \ + "663:\n\t" \ + "664:\n\t" \ + ".endif\n" \ + ".endif\n" + +#define _ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg, ...) \ + __ALTERNATIVE_CFG(oldinstr, newinstr, feature, IS_ENABLED(cfg), 0) + +#define ALTERNATIVE_CB(oldinstr, cb) \ + __ALTERNATIVE_CFG(oldinstr, "NOT_AN_INSTRUCTION", ARM_CB_PATCH, 1, cb) +#else + +#include +#include + +.macro altinstruction_entry orig_offset alt_offset feature orig_len alt_len + .word \orig_offset - . + .word \alt_offset - . + .hword \feature + .byte \orig_len + .byte \alt_len +.endm + +.macro alternative_insn insn1, insn2, cap, enable = 1 + .if \enable +661: \insn1 +662: .pushsection .altinstructions, "a" + altinstruction_entry 661b, 663f, \cap, 662b-661b, 664f-663f + .popsection + .pushsection .altinstr_replacement, "ax" +663: \insn2 +664: .popsection + .org . - (664b-663b) + (662b-661b) + .org . - (662b-661b) + (664b-663b) + .endif +.endm + +/* + * Alternative sequences + * + * The code for the case where the capability is not present will be + * assembled and linked as normal. There are no restrictions on this + * code. + * + * The code for the case where the capability is present will be + * assembled into a special section to be used for dynamic patching. + * Code for that case must: + * + * 1. Be exactly the same length (in bytes) as the default code + * sequence. + * + * 2. Not contain a branch target that is used outside of the + * alternative sequence it is defined in (branches into an + * alternative sequence are not fixed up). + */ + +/* + * Begin an alternative code sequence. + */ +.macro alternative_if_not cap + .set .Lasm_alt_mode, 0 + .pushsection .altinstructions, "a" + altinstruction_entry 661f, 663f, \cap, 662f-661f, 664f-663f + .popsection +661: +.endm + +.macro alternative_if cap + .set .Lasm_alt_mode, 1 + .pushsection .altinstructions, "a" + altinstruction_entry 663f, 661f, \cap, 664f-663f, 662f-661f + .popsection + .pushsection .altinstr_replacement, "ax" + .align 2 /* So GAS knows label 661 is suitably aligned */ +661: +.endm + +/* + * Provide the other half of the alternative code sequence. + */ +.macro alternative_else +662: + .if .Lasm_alt_mode==0 + .pushsection .altinstr_replacement, "ax" + .else + .popsection + .endif +663: +.endm + +.macro alternative_cb cb + .set .Lasm_alt_mode, 0 + .pushsection .altinstructions, "a" + altinstruction_entry 661f, \cb, ARM_CB_PATCH, 662f-661f, 0 + .popsection +661: +.endm + +/* + * Complete an alternative code sequence. + */ +.macro alternative_endif +664: + .if .Lasm_alt_mode==0 + .popsection + .endif + .org . - (664b-663b) + (662b-661b) + .org . - (662b-661b) + (664b-663b) +.endm + +/* + * Provides a trivial alternative or default sequence consisting solely + * of NOPs. The number of NOPs is chosen automatically to match the + * previous case. + */ +.macro alternative_else_nop_endif +alternative_else + nops (662b-661b) / ARCH_PATCH_INSN_SIZE +alternative_endif +.endm + +/* + * Callback-based alternative epilogue + */ +.macro alternative_cb_end +662: +.endm + +#define _ALTERNATIVE_CFG(insn1, insn2, cap, cfg, ...) \ + alternative_insn insn1, insn2, cap, IS_ENABLED(cfg) + +#endif /* __ASSEMBLY__ */ + +/* + * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature)); + * + * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature, CONFIG_FOO)); + * N.B. If CONFIG_FOO is specified, but not selected, the whole block + * will be omitted, including oldinstr. + */ +#define ALTERNATIVE(oldinstr, newinstr, ...) \ + _ALTERNATIVE_CFG(oldinstr, newinstr, __VA_ARGS__, 1) + +#endif /* __ASM_ALTERNATIVE_H */ diff --git a/xen/arch/arm/include/asm/altp2m.h b/xen/arch/arm/include/asm/altp2m.h new file mode 100644 index 0000000000..df50cb2f09 --- /dev/null +++ b/xen/arch/arm/include/asm/altp2m.h @@ -0,0 +1,39 @@ +/* + * Alternate p2m + * + * Copyright (c) 2014, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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 . + */ + +#ifndef __ASM_ARM_ALTP2M_H +#define __ASM_ARM_ALTP2M_H + +#include + +/* Alternate p2m on/off per domain */ +static inline bool altp2m_active(const struct domain *d) +{ + /* Not implemented on ARM. */ + return false; +} + +/* Alternate p2m VCPU */ +static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +{ + /* Not implemented on ARM, should not be reached. */ + BUG(); + return 0; +} + +#endif /* __ASM_ARM_ALTP2M_H */ diff --git a/xen/arch/arm/include/asm/arm32/atomic.h b/xen/arch/arm/include/asm/arm32/atomic.h new file mode 100644 index 0000000000..2832a72792 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/atomic.h @@ -0,0 +1,175 @@ +/* + * arch/arm/include/asm/atomic.h + * + * Copyright (C) 1996 Russell King. + * Copyright (C) 2002 Deep Blue Solutions Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ARCH_ARM_ARM32_ATOMIC__ +#define __ARCH_ARM_ARM32_ATOMIC__ + +/* + * ARMv6 UP and SMP safe atomic ops. We use load exclusive and + * store exclusive to ensure that these are atomic. We may loop + * to ensure that the update happens. + */ +static inline void atomic_add(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + prefetchw(&v->counter); + __asm__ __volatile__("@ atomic_add\n" +"1: ldrex %0, [%3]\n" +" add %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); +} + +static inline int atomic_add_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + smp_mb(); + prefetchw(&v->counter); + + __asm__ __volatile__("@ atomic_add_return\n" +"1: ldrex %0, [%3]\n" +" add %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); + + smp_mb(); + + return result; +} + +static inline void atomic_sub(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + prefetchw(&v->counter); + __asm__ __volatile__("@ atomic_sub\n" +"1: ldrex %0, [%3]\n" +" sub %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); +} + +static inline int atomic_sub_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + smp_mb(); + prefetchw(&v->counter); + + __asm__ __volatile__("@ atomic_sub_return\n" +"1: ldrex %0, [%3]\n" +" sub %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); + + smp_mb(); + + return result; +} + +static inline void atomic_and(int m, atomic_t *v) +{ + unsigned long tmp; + int result; + + prefetchw(&v->counter); + __asm__ __volatile__("@ atomic_and\n" +"1: ldrex %0, [%3]\n" +" and %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (m) + : "cc"); +} + +static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) +{ + int oldval; + unsigned long res; + + smp_mb(); + prefetchw(&ptr->counter); + + do { + __asm__ __volatile__("@ atomic_cmpxchg\n" + "ldrex %1, [%3]\n" + "mov %0, #0\n" + "teq %1, %4\n" + "strexeq %0, %5, [%3]\n" + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter) + : "r" (&ptr->counter), "Ir" (old), "r" (new) + : "cc"); + } while (res); + + smp_mb(); + + return oldval; +} + +static inline int __atomic_add_unless(atomic_t *v, int a, int u) +{ + int oldval, newval; + unsigned long tmp; + + smp_mb(); + prefetchw(&v->counter); + + __asm__ __volatile__ ("@ atomic_add_unless\n" +"1: ldrex %0, [%4]\n" +" teq %0, %5\n" +" beq 2f\n" +" add %1, %0, %6\n" +" strex %2, %1, [%4]\n" +" teq %2, #0\n" +" bne 1b\n" +"2:" + : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "r" (u), "r" (a) + : "cc"); + + if (oldval != u) + smp_mb(); + + return oldval; +} + +#endif /* __ARCH_ARM_ARM32_ATOMIC__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * indent-tabs-mode: t + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/bitops.h b/xen/arch/arm/include/asm/arm32/bitops.h new file mode 100644 index 0000000000..57938a5874 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/bitops.h @@ -0,0 +1,42 @@ +#ifndef _ARM_ARM32_BITOPS_H +#define _ARM_ARM32_BITOPS_H + +#define flsl fls + +/* + * Little endian assembly bitops. nr = 0 -> byte 0 bit 0. + */ +extern int _find_first_zero_bit_le(const void * p, unsigned size); +extern int _find_next_zero_bit_le(const void * p, int size, int offset); +extern int _find_first_bit_le(const unsigned long *p, unsigned size); +extern int _find_next_bit_le(const unsigned long *p, int size, int offset); + +/* + * Big endian assembly bitops. nr = 0 -> byte 3 bit 0. + */ +extern int _find_first_zero_bit_be(const void * p, unsigned size); +extern int _find_next_zero_bit_be(const void * p, int size, int offset); +extern int _find_first_bit_be(const unsigned long *p, unsigned size); +extern int _find_next_bit_be(const unsigned long *p, int size, int offset); + +#ifndef __ARMEB__ +/* + * These are the little endian, atomic definitions. + */ +#define find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz) +#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_le(p,sz,off) +#define find_first_bit(p,sz) _find_first_bit_le(p,sz) +#define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off) + +#else +/* + * These are the big endian, atomic definitions. + */ +#define find_first_zero_bit(p,sz) _find_first_zero_bit_be(p,sz) +#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_be(p,sz,off) +#define find_first_bit(p,sz) _find_first_bit_be(p,sz) +#define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off) + +#endif + +#endif /* _ARM_ARM32_BITOPS_H */ diff --git a/xen/arch/arm/include/asm/arm32/bug.h b/xen/arch/arm/include/asm/arm32/bug.h new file mode 100644 index 0000000000..25cce151dc --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/bug.h @@ -0,0 +1,15 @@ +#ifndef __ARM_ARM32_BUG_H__ +#define __ARM_ARM32_BUG_H__ + +#include + +/* ARMv7 provides a list of undefined opcode (see A8.8.247 DDI 0406C.b) + * Use one them encoding A1 to go in exception mode + */ +#define BUG_OPCODE 0xe7f000f0 + +#define BUG_INSTR ".word " __stringify(BUG_OPCODE) + +#define BUG_FN_REG r0 + +#endif /* __ARM_ARM32_BUG_H__ */ diff --git a/xen/arch/arm/include/asm/arm32/cmpxchg.h b/xen/arch/arm/include/asm/arm32/cmpxchg.h new file mode 100644 index 0000000000..b0bd1d8b68 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/cmpxchg.h @@ -0,0 +1,229 @@ +#ifndef __ASM_ARM32_CMPXCHG_H +#define __ASM_ARM32_CMPXCHG_H + +#include + +extern void __bad_xchg(volatile void *, int); + +static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) +{ + unsigned long ret; + unsigned int tmp; + + smp_mb(); + prefetchw((const void *)ptr); + + switch (size) { + case 1: + asm volatile("@ __xchg1\n" + "1: ldrexb %0, [%3]\n" + " strexb %1, %2, [%3]\n" + " teq %1, #0\n" + " bne 1b" + : "=&r" (ret), "=&r" (tmp) + : "r" (x), "r" (ptr) + : "memory", "cc"); + break; + case 4: + asm volatile("@ __xchg4\n" + "1: ldrex %0, [%3]\n" + " strex %1, %2, [%3]\n" + " teq %1, #0\n" + " bne 1b" + : "=&r" (ret), "=&r" (tmp) + : "r" (x), "r" (ptr) + : "memory", "cc"); + break; + default: + __bad_xchg(ptr, size), ret = 0; + break; + } + smp_mb(); + + return ret; +} + +#define xchg(ptr,x) \ + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) + +/* + * Atomic compare and exchange. Compare OLD with MEM, if identical, + * store NEW in MEM. Return the initial value in MEM. Success is + * indicated by comparing RETURN with OLD. + */ + +extern unsigned long __bad_cmpxchg(volatile void *ptr, int size); + +#define __CMPXCHG_CASE(sz, name) \ +static inline bool __cmpxchg_case_##name(volatile void *ptr, \ + unsigned long *old, \ + unsigned long new, \ + bool timeout, \ + unsigned int max_try) \ +{ \ + unsigned long oldval; \ + unsigned long res; \ + \ + do { \ + asm volatile("@ __cmpxchg_case_" #name "\n" \ + " ldrex" #sz " %1, [%2]\n" \ + " mov %0, #0\n" \ + " teq %1, %3\n" \ + " strex" #sz "eq %0, %4, [%2]\n" \ + : "=&r" (res), "=&r" (oldval) \ + : "r" (ptr), "Ir" (*old), "r" (new) \ + : "memory", "cc"); \ + \ + if (!res) \ + break; \ + } while (!timeout || ((--max_try) > 0)); \ + \ + *old = oldval; \ + \ + return !res; \ +} + +__CMPXCHG_CASE(b, 1) +__CMPXCHG_CASE(h, 2) +__CMPXCHG_CASE( , 4) + +static inline bool __cmpxchg_case_8(volatile uint64_t *ptr, + uint64_t *old, + uint64_t new, + bool timeout, + unsigned int max_try) +{ + uint64_t oldval; + uint64_t res; + + do { + asm volatile( + " ldrexd %1, %H1, [%3]\n" + " teq %1, %4\n" + " teqeq %H1, %H4\n" + " movne %0, #0\n" + " movne %H0, #0\n" + " bne 2f\n" + " strexd %0, %5, %H5, [%3]\n" + "2:" + : "=&r" (res), "=&r" (oldval), "+Qo" (*ptr) + : "r" (ptr), "r" (*old), "r" (new) + : "memory", "cc"); + if (!res) + break; + } while (!timeout || ((--max_try) > 0)); + + *old = oldval; + + return !res; +} + +static always_inline bool __int_cmpxchg(volatile void *ptr, unsigned long *old, + unsigned long new, int size, + bool timeout, unsigned int max_try) +{ + prefetchw((const void *)ptr); + + switch (size) { + case 1: + return __cmpxchg_case_1(ptr, old, new, timeout, max_try); + case 2: + return __cmpxchg_case_2(ptr, old, new, timeout, max_try); + case 4: + return __cmpxchg_case_4(ptr, old, new, timeout, max_try); + default: + return __bad_cmpxchg(ptr, size); + } + + ASSERT_UNREACHABLE(); +} + +static always_inline unsigned long __cmpxchg(volatile void *ptr, + unsigned long old, + unsigned long new, + int size) +{ + smp_mb(); + if (!__int_cmpxchg(ptr, &old, new, size, false, 0)) + ASSERT_UNREACHABLE(); + smp_mb(); + + return old; +} + +/* + * The helper may fail to update the memory if the action takes too long. + * + * @old: On call the value pointed contains the expected old value. It will be + * updated to the actual old value. + * @max_try: Maximum number of iterations + * + * The helper will return true when the update has succeeded (i.e no + * timeout) and false if the update has failed. + */ +static always_inline bool __cmpxchg_timeout(volatile void *ptr, + unsigned long *old, + unsigned long new, + int size, + unsigned int max_try) +{ + bool ret; + + smp_mb(); + ret = __int_cmpxchg(ptr, old, new, size, true, max_try); + smp_mb(); + + return ret; +} + +/* + * The helper may fail to update the memory if the action takes too long. + * + * @old: On call the value pointed contains the expected old value. It will be + * updated to the actual old value. + * @max_try: Maximum number of iterations + * + * The helper will return true when the update has succeeded (i.e no + * timeout) and false if the update has failed. + */ +static always_inline bool __cmpxchg64_timeout(volatile uint64_t *ptr, + uint64_t *old, + uint64_t new, + unsigned int max_try) +{ + bool ret; + + smp_mb(); + ret = __cmpxchg_case_8(ptr, old, new, true, max_try); + smp_mb(); + + return ret; +} + +#define cmpxchg(ptr,o,n) \ + ((__typeof__(*(ptr)))__cmpxchg((ptr), \ + (unsigned long)(o), \ + (unsigned long)(n), \ + sizeof(*(ptr)))) + +static inline uint64_t cmpxchg64(volatile uint64_t *ptr, + uint64_t old, + uint64_t new) +{ + smp_mb(); + if (!__cmpxchg_case_8(ptr, &old, new, false, 0)) + ASSERT_UNREACHABLE(); + smp_mb(); + + return old; +} + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * indent-tabs-mode: t + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/flushtlb.h b/xen/arch/arm/include/asm/arm32/flushtlb.h new file mode 100644 index 0000000000..9085e65011 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/flushtlb.h @@ -0,0 +1,63 @@ +#ifndef __ASM_ARM_ARM32_FLUSHTLB_H__ +#define __ASM_ARM_ARM32_FLUSHTLB_H__ + +/* + * Every invalidation operation use the following patterns: + * + * DSB ISHST // Ensure prior page-tables updates have completed + * TLBI... // Invalidate the TLB + * DSB ISH // Ensure the TLB invalidation has completed + * ISB // See explanation below + * + * For Xen page-tables the ISB will discard any instructions fetched + * from the old mappings. + * + * For the Stage-2 page-tables the ISB ensures the completion of the DSB + * (and therefore the TLB invalidation) before continuing. So we know + * the TLBs cannot contain an entry for a mapping we may have removed. + */ +#define TLB_HELPER(name, tlbop) \ +static inline void name(void) \ +{ \ + dsb(ishst); \ + WRITE_CP32(0, tlbop); \ + dsb(ish); \ + isb(); \ +} + +/* Flush local TLBs, current VMID only */ +TLB_HELPER(flush_guest_tlb_local, TLBIALL); + +/* Flush inner shareable TLBs, current VMID only */ +TLB_HELPER(flush_guest_tlb, TLBIALLIS); + +/* Flush local TLBs, all VMIDs, non-hypervisor mode */ +TLB_HELPER(flush_all_guests_tlb_local, TLBIALLNSNH); + +/* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ +TLB_HELPER(flush_all_guests_tlb, TLBIALLNSNHIS); + +/* Flush all hypervisor mappings from the TLB of the local processor. */ +TLB_HELPER(flush_xen_tlb_local, TLBIALLH); + +/* Flush TLB of local processor for address va. */ +static inline void __flush_xen_tlb_one_local(vaddr_t va) +{ + asm volatile(STORE_CP32(0, TLBIMVAH) : : "r" (va) : "memory"); +} + +/* Flush TLB of all processors in the inner-shareable domain for address va. */ +static inline void __flush_xen_tlb_one(vaddr_t va) +{ + asm volatile(STORE_CP32(0, TLBIMVAHIS) : : "r" (va) : "memory"); +} + +#endif /* __ASM_ARM_ARM32_FLUSHTLB_H__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/insn.h b/xen/arch/arm/include/asm/arm32/insn.h new file mode 100644 index 0000000000..c800cbfff5 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/insn.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2017 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 . + */ +#ifndef __ARCH_ARM_ARM32_INSN +#define __ARCH_ARM_ARM32_INSN + +#include + +int32_t aarch32_get_branch_offset(uint32_t insn); +uint32_t aarch32_set_branch_offset(uint32_t insn, int32_t offset); + +/* Wrapper for common code */ +static inline bool insn_is_branch_imm(uint32_t insn) +{ + /* + * Xen is using ARM execution state only on ARM32 platform. So, the + * Thumb branch instructions (CBZ, CBNZ, TBB and TBH) will not be used + * in Xen. The left ARM32 branch instructions are BX, BLX, BL and B. + * BX is using register as parameter, we don't need to rewrite it. So, + * we only need to check BLX, BL and B encodings in this function. + * + * From ARM DDI 0406C.c Section A8.8.18 and A8.8.25, we can see these + * three branch instructions' encodings: + * - b cccc1010xxxxxxxxxxxxxxxxxxxxxxxx + * - bl cccc1011xxxxxxxxxxxxxxxxxxxxxxxx + * - blx 1111101Hxxxxxxxxxxxxxxxxxxxxxxxx + * + * The H bit of blx can be 0 or 1, it depends on the Instruction Sets of + * target instruction. Regardless, if we mask the conditional bits and + * bit 24 (H bit of blx), we can see all above branch instructions have + * the same value 0x0A000000. + * + * And from ARM DDI 0406C.c Section A5.7 Table A5-23, we can see that the + * blx is the only one unconditional instruction has the same value as + * conditional branch instructions. So, mask the conditional bits will not + * make other unconditional instruction to hit this check. + */ + return ( (insn & 0x0E000000) == 0x0A000000 ); +} + +static inline int32_t insn_get_branch_offset(uint32_t insn) +{ + return aarch32_get_branch_offset(insn); +} + +static inline uint32_t insn_set_branch_offset(uint32_t insn, int32_t offset) +{ + return aarch32_set_branch_offset(insn, offset); +} + +#endif /* !__ARCH_ARM_ARM32_INSN */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/io.h b/xen/arch/arm/include/asm/arm32/io.h new file mode 100644 index 0000000000..73a879e9fb --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/io.h @@ -0,0 +1,96 @@ +/* + * Based on linux arch/arm/include/asm/io.h + * + * Copyright (C) 1996-2000 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Modifications: + * 16-Sep-1996 RMK Inlined the inx/outx functions & optimised for both + * constant addresses and variable addresses. + * 04-Dec-1997 RMK Moved a lot of this stuff to the new architecture + * specific IO header files. + * 27-Mar-1999 PJB Second parameter of memcpy_toio is const.. + * 04-Apr-1999 PJB Added check_signature. + * 12-Dec-1999 RMK More cleanups + * 18-Jun-2000 RMK Removed virt_to_* and friends definitions + * 05-Oct-2004 BJD Moved memory string functions to use void __iomem + */ +#ifndef _ARM_ARM32_IO_H +#define _ARM_ARM32_IO_H + +#include +#include + +static inline void __raw_writeb(u8 val, volatile void __iomem *addr) +{ + asm volatile("strb %1, %0" + : "+Qo" (*(volatile u8 __force *)addr) + : "r" (val)); +} + +static inline void __raw_writew(u16 val, volatile void __iomem *addr) +{ + asm volatile("strh %1, %0" + : "+Q" (*(volatile u16 __force *)addr) + : "r" (val)); +} + +static inline void __raw_writel(u32 val, volatile void __iomem *addr) +{ + asm volatile("str %1, %0" + : "+Qo" (*(volatile u32 __force *)addr) + : "r" (val)); +} + +static inline u8 __raw_readb(const volatile void __iomem *addr) +{ + u8 val; + asm volatile("ldrb %1, %0" + : "+Qo" (*(volatile u8 __force *)addr), + "=r" (val)); + return val; +} + +static inline u16 __raw_readw(const volatile void __iomem *addr) +{ + u16 val; + asm volatile("ldrh %1, %0" + : "+Q" (*(volatile u16 __force *)addr), + "=r" (val)); + return val; +} + +static inline u32 __raw_readl(const volatile void __iomem *addr) +{ + u32 val; + asm volatile("ldr %1, %0" + : "+Qo" (*(volatile u32 __force *)addr), + "=r" (val)); + return val; +} + +#define __iormb() rmb() +#define __iowmb() wmb() + +#define readb_relaxed(c) ({ u8 __r = __raw_readb(c); __r; }) +#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16) \ + __raw_readw(c)); __r; }) +#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \ + __raw_readl(c)); __r; }) + +#define writeb_relaxed(v,c) __raw_writeb(v,c) +#define writew_relaxed(v,c) __raw_writew((__force u16) cpu_to_le16(v),c) +#define writel_relaxed(v,c) __raw_writel((__force u32) cpu_to_le32(v),c) + +#define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) +#define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) +#define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) + +#define writeb(v,c) ({ __iowmb(); writeb_relaxed(v,c); }) +#define writew(v,c) ({ __iowmb(); writew_relaxed(v,c); }) +#define writel(v,c) ({ __iowmb(); writel_relaxed(v,c); }) + +#endif /* _ARM_ARM32_IO_H */ diff --git a/xen/arch/arm/include/asm/arm32/macros.h b/xen/arch/arm/include/asm/arm32/macros.h new file mode 100644 index 0000000000..a4e20aa520 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/macros.h @@ -0,0 +1,8 @@ +#ifndef __ASM_ARM_ARM32_MACROS_H +#define __ASM_ARM_ARM32_MACROS_H + + .macro ret + mov pc, lr + .endm + +#endif /* __ASM_ARM_ARM32_MACROS_H */ diff --git a/xen/arch/arm/include/asm/arm32/mm.h b/xen/arch/arm/include/asm/arm32/mm.h new file mode 100644 index 0000000000..68612499bf --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/mm.h @@ -0,0 +1,23 @@ +#ifndef __ARM_ARM32_MM_H__ +#define __ARM_ARM32_MM_H__ + +/* + * Only a limited amount of RAM, called xenheap, is always mapped on ARM32. + * For convenience always return false. + */ +static inline bool arch_mfn_in_directmap(unsigned long mfn) +{ + return false; +} + +#endif /* __ARM_ARM32_MM_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/page.h b/xen/arch/arm/include/asm/arm32/page.h new file mode 100644 index 0000000000..715a9e4fef --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/page.h @@ -0,0 +1,118 @@ +#ifndef __ARM_ARM32_PAGE_H__ +#define __ARM_ARM32_PAGE_H__ + +#ifndef __ASSEMBLY__ + +/* Write a pagetable entry. + * + * If the table entry is changing a text mapping, it is responsibility + * of the caller to issue an ISB after write_pte. + */ +static inline void write_pte(lpae_t *p, lpae_t pte) +{ + asm volatile ( + /* Ensure any writes have completed with the old mappings. */ + "dsb;" + /* Safely write the entry (STRD is atomic on CPUs that support LPAE) */ + "strd %0, %H0, [%1];" + "dsb;" + : : "r" (pte.bits), "r" (p) : "memory"); +} + +/* Inline ASM to invalidate dcache on register R (may be an inline asm operand) */ +#define __invalidate_dcache_one(R) STORE_CP32(R, DCIMVAC) + +/* Inline ASM to flush dcache on register R (may be an inline asm operand) */ +#define __clean_dcache_one(R) STORE_CP32(R, DCCMVAC) + +/* Inline ASM to clean and invalidate dcache on register R (may be an + * inline asm operand) */ +#define __clean_and_invalidate_dcache_one(R) STORE_CP32(R, DCCIMVAC) + +/* + * Invalidate all instruction caches in Inner Shareable domain to PoU. + * We also need to flush the branch predictor for ARMv7 as it may be + * architecturally visible to the software (see B2.2.4 in ARM DDI 0406C.b). + */ +static inline void invalidate_icache(void) +{ + asm volatile ( + CMD_CP32(ICIALLUIS) /* Flush I-cache. */ + CMD_CP32(BPIALLIS) /* Flush branch predictor. */ + : : : "memory"); + + dsb(ish); /* Ensure completion of the flush I-cache */ + isb(); /* Synchronize fetched instruction stream. */ +} + +/* + * Invalidate all instruction caches on the local processor to PoU. + * We also need to flush the branch predictor for ARMv7 as it may be + * architecturally visible to the software (see B2.2.4 in ARM DDI 0406C.b). + */ +static inline void invalidate_icache_local(void) +{ + asm volatile ( + CMD_CP32(ICIALLU) /* Flush I-cache. */ + CMD_CP32(BPIALL) /* Flush branch predictor. */ + : : : "memory"); + + dsb(nsh); /* Ensure completion of the flush I-cache */ + isb(); /* Synchronize fetched instruction stream. */ +} + +/* Ask the MMU to translate a VA for us */ +static inline uint64_t __va_to_par(vaddr_t va) +{ + uint64_t par, tmp; + tmp = READ_CP64(PAR); + WRITE_CP32(va, ATS1HR); + isb(); /* Ensure result is available. */ + par = READ_CP64(PAR); + WRITE_CP64(tmp, PAR); + return par; +} + +/* Ask the MMU to translate a Guest VA for us */ +static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) +{ + uint64_t par, tmp; + tmp = READ_CP64(PAR); + if ( (flags & GV2M_WRITE) == GV2M_WRITE ) + WRITE_CP32(va, ATS12NSOPW); + else + WRITE_CP32(va, ATS12NSOPR); + isb(); /* Ensure result is available. */ + par = READ_CP64(PAR); + WRITE_CP64(tmp, PAR); + return par; +} +static inline uint64_t gva_to_ipa_par(vaddr_t va, unsigned int flags) +{ + uint64_t par, tmp; + tmp = READ_CP64(PAR); + if ( (flags & GV2M_WRITE) == GV2M_WRITE ) + WRITE_CP32(va, ATS1CPW); + else + WRITE_CP32(va, ATS1CPR); + isb(); /* Ensure result is available. */ + par = READ_CP64(PAR); + WRITE_CP64(tmp, PAR); + return par; +} + +#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) + +#endif /* __ASSEMBLY__ */ + +#endif /* __ARM_ARM32_PAGE_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/processor.h b/xen/arch/arm/include/asm/arm32/processor.h new file mode 100644 index 0000000000..4e679f3273 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/processor.h @@ -0,0 +1,69 @@ +#ifndef __ASM_ARM_ARM32_PROCESSOR_H +#define __ASM_ARM_ARM32_PROCESSOR_H + +#define ACTLR_CAXX_SMP (1<<6) + +#ifndef __ASSEMBLY__ +/* On stack VCPU state */ +struct cpu_user_regs +{ + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + union { + uint32_t r11; + uint32_t fp; + }; + uint32_t r12; + + uint32_t sp; /* r13 - SP: Valid for Hyp. frames only, o/w banked (see below) */ + + /* r14 - LR: is the same physical register as LR_usr */ + union { + uint32_t lr; /* r14 - LR: Valid for Hyp. Same physical register as lr_usr. */ + + uint32_t lr_usr; + }; + + union { /* Return IP, pc32 is used to allow code to be common with 64-bit */ + uint32_t pc, pc32; + }; + uint32_t cpsr; /* Return mode */ + uint32_t hsr; /* Exception Syndrome */ + + /* Outer guest frame only from here on... */ + + uint32_t sp_usr; /* LR_usr is the same register as LR, see above */ + + uint32_t sp_irq, lr_irq; + uint32_t sp_svc, lr_svc; + uint32_t sp_abt, lr_abt; + uint32_t sp_und, lr_und; + + uint32_t r8_fiq, r9_fiq, r10_fiq, r11_fiq, r12_fiq; + uint32_t sp_fiq, lr_fiq; + + uint32_t spsr_svc, spsr_abt, spsr_und, spsr_irq, spsr_fiq; + + uint32_t pad1; /* Doubleword-align the user half of the frame */ +}; + +#endif + +#endif /* __ASM_ARM_ARM32_PROCESSOR_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/sysregs.h b/xen/arch/arm/include/asm/arm32/sysregs.h new file mode 100644 index 0000000000..6841d5de43 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/sysregs.h @@ -0,0 +1,78 @@ +#ifndef __ASM_ARM_ARM32_SYSREGS_H +#define __ASM_ARM_ARM32_SYSREGS_H + +#include +#include + +/* Layout as used in assembly, with src/dest registers mixed in */ +#define __CP32(r, coproc, opc1, crn, crm, opc2) coproc, opc1, r, crn, crm, opc2 +#define __CP64(r1, r2, coproc, opc, crm) coproc, opc, r1, r2, crm +#define CP32(r, name...) __CP32(r, name) +#define CP64(r, name...) __CP64(r, name) + +/* Stringified for inline assembly */ +#define LOAD_CP32(r, name...) "mrc " __stringify(CP32(%r, name)) ";" +#define STORE_CP32(r, name...) "mcr " __stringify(CP32(%r, name)) ";" +#define LOAD_CP64(r, name...) "mrrc " __stringify(CP64(%r, %H##r, name)) ";" +#define STORE_CP64(r, name...) "mcrr " __stringify(CP64(%r, %H##r, name)) ";" + +/* Issue a CP operation which takes no argument, + * uses r0 as a placeholder register. */ +#define CMD_CP32(name...) "mcr " __stringify(CP32(r0, name)) ";" + +#ifndef __ASSEMBLY__ + +/* C wrappers */ +#define READ_CP32(name...) ({ \ + register uint32_t _r; \ + asm volatile(LOAD_CP32(0, name) : "=r" (_r)); \ + _r; }) + +#define WRITE_CP32(v, name...) do { \ + register uint32_t _r = (v); \ + asm volatile(STORE_CP32(0, name) : : "r" (_r)); \ +} while (0) + +#define READ_CP64(name...) ({ \ + register uint64_t _r; \ + asm volatile(LOAD_CP64(0, name) : "=r" (_r)); \ + _r; }) + +#define WRITE_CP64(v, name...) do { \ + register uint64_t _r = (v); \ + asm volatile(STORE_CP64(0, name) : : "r" (_r)); \ +} while (0) + +/* + * C wrappers for accessing system registers. + * + * Registers come in 3 types: + * - those which are always 32-bit regardless of AArch32 vs AArch64 + * (use {READ,WRITE}_SYSREG32). + * - those which are always 64-bit regardless of AArch32 vs AArch64 + * (use {READ,WRITE}_SYSREG64). + * - those which vary between AArch32 and AArch64 (use {READ,WRITE}_SYSREG). + */ +#define READ_SYSREG32(R...) READ_CP32(R) +#define WRITE_SYSREG32(V, R...) WRITE_CP32(V, R) + +#define READ_SYSREG64(R...) READ_CP64(R) +#define WRITE_SYSREG64(V, R...) WRITE_CP64(V, R) + +#define READ_SYSREG(R...) READ_SYSREG32(R) +#define WRITE_SYSREG(V, R...) WRITE_SYSREG32(V, R) + +/* MVFR2 is not defined on ARMv7 */ +#define MVFR2_MAYBE_UNDEFINED + +#endif /* __ASSEMBLY__ */ + +#endif /* __ASM_ARM_ARM32_SYSREGS_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/system.h b/xen/arch/arm/include/asm/arm32/system.h new file mode 100644 index 0000000000..ab57abfbc5 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/system.h @@ -0,0 +1,77 @@ +/* Portions taken from Linux arch arm */ +#ifndef __ASM_ARM32_SYSTEM_H +#define __ASM_ARM32_SYSTEM_H + +#include + +#define local_irq_disable() asm volatile ( "cpsid i @ local_irq_disable\n" : : : "cc" ) +#define local_irq_enable() asm volatile ( "cpsie i @ local_irq_enable\n" : : : "cc" ) + +#define local_save_flags(x) \ +({ \ + BUILD_BUG_ON(sizeof(x) != sizeof(long)); \ + asm volatile ( "mrs %0, cpsr @ local_save_flags\n" \ + : "=r" (x) :: "memory", "cc" ); \ +}) +#define local_irq_save(x) \ +({ \ + local_save_flags(x); \ + local_irq_disable(); \ +}) +#define local_irq_restore(x) \ +({ \ + BUILD_BUG_ON(sizeof(x) != sizeof(long)); \ + asm volatile ( \ + "msr cpsr_c, %0 @ local_irq_restore\n" \ + : \ + : "r" (x) \ + : "memory", "cc"); \ +}) + +static inline int local_irq_is_enabled(void) +{ + unsigned long flags; + local_save_flags(flags); + return !(flags & PSR_IRQ_MASK); +} + +#define local_fiq_enable() __asm__("cpsie f @ __stf\n" : : : "memory", "cc") +#define local_fiq_disable() __asm__("cpsid f @ __clf\n" : : : "memory", "cc") + +#define local_abort_enable() __asm__("cpsie a @ __sta\n" : : : "memory", "cc") +#define local_abort_disable() __asm__("cpsid a @ __sta\n" : : : "memory", "cc") + +static inline int local_fiq_is_enabled(void) +{ + unsigned long flags; + local_save_flags(flags); + return !(flags & PSR_FIQ_MASK); +} + +#define CSDB ".inst 0xe320f014" + +static inline unsigned long array_index_mask_nospec(unsigned long idx, + unsigned long sz) +{ + unsigned long mask; + + asm volatile( "cmp %1, %2\n" + "sbc %0, %1, %1\n" + CSDB + : "=r" (mask) + : "r" (idx), "Ir" (sz) + : "cc" ); + + return mask; +} +#define array_index_mask_nospec array_index_mask_nospec + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/traps.h b/xen/arch/arm/include/asm/arm32/traps.h new file mode 100644 index 0000000000..e3c4a8b473 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/traps.h @@ -0,0 +1,13 @@ +#ifndef __ASM_ARM32_TRAPS__ +#define __ASM_ARM32_TRAPS__ + +#endif /* __ASM_ARM32_TRAPS__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ + diff --git a/xen/arch/arm/include/asm/arm32/vfp.h b/xen/arch/arm/include/asm/arm32/vfp.h new file mode 100644 index 0000000000..bade3bc66e --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/vfp.h @@ -0,0 +1,41 @@ +#ifndef _ARM_ARM32_VFP_H +#define _ARM_ARM32_VFP_H + +#define FPEXC_EX (1u << 31) +#define FPEXC_EN (1u << 30) +#define FPEXC_FP2V (1u << 28) + +#define MVFR0_A_SIMD_MASK (0xf << 0) + + +#define FPSID_IMPLEMENTER_BIT (24) +#define FPSID_IMPLEMENTER_MASK (0xff << FPSID_IMPLEMENTER_BIT) +#define FPSID_ARCH_BIT (16) +#define FPSID_ARCH_MASK (0xf << FPSID_ARCH_BIT) +#define FPSID_PART_BIT (8) +#define FPSID_PART_MASK (0xff << FPSID_PART_BIT) +#define FPSID_VARIANT_BIT (4) +#define FPSID_VARIANT_MASK (0xf << FPSID_VARIANT_BIT) +#define FPSID_REV_BIT (0) +#define FPSID_REV_MASK (0xf << FPSID_REV_BIT) + +struct vfp_state +{ + uint64_t fpregs1[16]; /* {d0-d15} */ + uint64_t fpregs2[16]; /* {d16-d31} */ + uint32_t fpexc; + uint32_t fpscr; + /* VFP implementation specific state */ + uint32_t fpinst; + uint32_t fpinst2; +}; + +#endif /* _ARM_ARM32_VFP_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/atomic.h b/xen/arch/arm/include/asm/arm64/atomic.h new file mode 100644 index 0000000000..2d42567866 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/atomic.h @@ -0,0 +1,148 @@ +/* + * Based on arch/arm64/include/asm/atomic.h + * which in turn is + * Based on arch/arm/include/asm/atomic.h + * + * Copyright (C) 1996 Russell King. + * Copyright (C) 2002 Deep Blue Solutions Ltd. + * Copyright (C) 2012 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 . + */ +#ifndef __ARCH_ARM_ARM64_ATOMIC +#define __ARCH_ARM_ARM64_ATOMIC + +/* + * AArch64 UP and SMP safe atomic ops. We use load exclusive and + * store exclusive to ensure that these are atomic. We may loop + * to ensure that the update happens. + */ +static inline void atomic_add(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_add\n" +"1: ldxr %w0, %2\n" +" add %w0, %w0, %w3\n" +" stxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i)); +} + +static inline int atomic_add_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_add_return\n" +"1: ldxr %w0, %2\n" +" add %w0, %w0, %w3\n" +" stlxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i) + : "memory"); + + smp_mb(); + return result; +} + +static inline void atomic_sub(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_sub\n" +"1: ldxr %w0, %2\n" +" sub %w0, %w0, %w3\n" +" stxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i)); +} + +static inline int atomic_sub_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_sub_return\n" +"1: ldxr %w0, %2\n" +" sub %w0, %w0, %w3\n" +" stlxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i) + : "memory"); + + smp_mb(); + return result; +} + +static inline void atomic_and(int m, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_and\n" +"1: ldxr %w0, %2\n" +" and %w0, %w0, %w3\n" +" stxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (m)); +} + +static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) +{ + unsigned long tmp; + int oldval; + + smp_mb(); + + asm volatile("// atomic_cmpxchg\n" +"1: ldxr %w1, %2\n" +" cmp %w1, %w3\n" +" b.ne 2f\n" +" stxr %w0, %w4, %2\n" +" cbnz %w0, 1b\n" +"2:" + : "=&r" (tmp), "=&r" (oldval), "+Q" (ptr->counter) + : "Ir" (old), "r" (new) + : "cc"); + + smp_mb(); + return oldval; +} + +static inline int __atomic_add_unless(atomic_t *v, int a, int u) +{ + int c, old; + + c = atomic_read(v); + while (c != u && (old = atomic_cmpxchg((v), c, c + a)) != c) + c = old; + return c; +} + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * indent-tabs-mode: t + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/bitops.h b/xen/arch/arm/include/asm/arm64/bitops.h new file mode 100644 index 0000000000..d85a49bca4 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/bitops.h @@ -0,0 +1,98 @@ +#ifndef _ARM_ARM64_BITOPS_H +#define _ARM_ARM64_BITOPS_H + +/* Based on linux/include/asm-generic/bitops/builtin-__ffs.h */ +/** + * __ffs - find first bit in word. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static /*__*/always_inline unsigned long __ffs(unsigned long word) +{ + return __builtin_ctzl(word); +} + +/* Based on linux/include/asm-generic/bitops/ffz.h */ +/* + * ffz - find first zero in word. + * @word: The word to search + * + * Undefined if no zero exists, so code should check against ~0UL first. + */ +#define ffz(x) __ffs(~(x)) + +static inline int flsl(unsigned long x) +{ + uint64_t ret; + + if (__builtin_constant_p(x)) + return generic_flsl(x); + + asm("clz\t%0, %1" : "=r" (ret) : "r" (x)); + + return BITS_PER_LONG - ret; +} + +/* Based on linux/include/asm-generic/bitops/find.h */ + +#ifndef find_next_bit +/** + * find_next_bit - find the next set bit in a memory region + * @addr: The address to base the search on + * @offset: The bitnumber to start searching at + * @size: The bitmap size in bits + */ +extern unsigned long find_next_bit(const unsigned long *addr, unsigned long + size, unsigned long offset); +#endif + +#ifndef find_next_zero_bit +/** + * find_next_zero_bit - find the next cleared bit in a memory region + * @addr: The address to base the search on + * @offset: The bitnumber to start searching at + * @size: The bitmap size in bits + */ +extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned + long size, unsigned long offset); +#endif + +#ifdef CONFIG_GENERIC_FIND_FIRST_BIT + +/** + * find_first_bit - find the first set bit in a memory region + * @addr: The address to start the search at + * @size: The maximum size to search + * + * Returns the bit number of the first set bit. + */ +extern unsigned long find_first_bit(const unsigned long *addr, + unsigned long size); + +/** + * find_first_zero_bit - find the first cleared bit in a memory region + * @addr: The address to start the search at + * @size: The maximum size to search + * + * Returns the bit number of the first cleared bit. + */ +extern unsigned long find_first_zero_bit(const unsigned long *addr, + unsigned long size); +#else /* CONFIG_GENERIC_FIND_FIRST_BIT */ + +#define find_first_bit(addr, size) find_next_bit((addr), (size), 0) +#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0) + +#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */ + + +#endif /* _ARM_ARM64_BITOPS_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/brk.h b/xen/arch/arm/include/asm/arm64/brk.h new file mode 100644 index 0000000000..04442c4b9f --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/brk.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2016 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __ASM_ARM_ARM64_BRK +#define __ASM_ARM_ARM64_BRK + +/* + * #imm16 values used for BRK instruction generation + * 0x001: xen-mode BUG() and WARN() traps + * 0x002: for triggering a fault on purpose (reserved) + */ +#define BRK_BUG_FRAME_IMM 1 +#define BRK_FAULT_IMM 2 + +/* + * BRK instruction encoding + * The #imm16 value should be placed at bits[20:5] within BRK ins + */ +#define AARCH64_BREAK_MON 0xd4200000 + +/* + * BRK instruction for provoking a fault on purpose + */ +#define AARCH64_BREAK_FAULT (AARCH64_BREAK_MON | (BRK_FAULT_IMM << 5)) + +#endif /* !__ASM_ARM_ARM64_BRK */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/bug.h b/xen/arch/arm/include/asm/arm64/bug.h new file mode 100644 index 0000000000..5e11c0dfd5 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/bug.h @@ -0,0 +1,11 @@ +#ifndef __ARM_ARM64_BUG_H__ +#define __ARM_ARM64_BUG_H__ + +#include +#include + +#define BUG_INSTR "brk " __stringify(BRK_BUG_FRAME_IMM) + +#define BUG_FN_REG x0 + +#endif /* __ARM_ARM64_BUG_H__ */ diff --git a/xen/arch/arm/include/asm/arm64/cmpxchg.h b/xen/arch/arm/include/asm/arm64/cmpxchg.h new file mode 100644 index 0000000000..10e4edc022 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/cmpxchg.h @@ -0,0 +1,183 @@ +#ifndef __ASM_ARM64_CMPXCHG_H +#define __ASM_ARM64_CMPXCHG_H + +extern void __bad_xchg(volatile void *, int); + +static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) +{ + unsigned long ret, tmp; + + switch (size) { + case 1: + asm volatile("// __xchg1\n" + "1: ldxrb %w0, %2\n" + " stlxrb %w1, %w3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u8 *)ptr) + : "r" (x) + : "memory"); + break; + case 2: + asm volatile("// __xchg2\n" + "1: ldxrh %w0, %2\n" + " stlxrh %w1, %w3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u16 *)ptr) + : "r" (x) + : "memory"); + break; + case 4: + asm volatile("// __xchg4\n" + "1: ldxr %w0, %2\n" + " stlxr %w1, %w3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u32 *)ptr) + : "r" (x) + : "memory"); + break; + case 8: + asm volatile("// __xchg8\n" + "1: ldxr %0, %2\n" + " stlxr %w1, %3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u64 *)ptr) + : "r" (x) + : "memory"); + break; + default: + __bad_xchg(ptr, size), ret = 0; + break; + } + + smp_mb(); + return ret; +} + +#define xchg(ptr,x) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __ret; \ +}) + +extern unsigned long __bad_cmpxchg(volatile void *ptr, int size); + +#define __CMPXCHG_CASE(w, sz, name) \ +static inline bool __cmpxchg_case_##name(volatile void *ptr, \ + unsigned long *old, \ + unsigned long new, \ + bool timeout, \ + unsigned int max_try) \ +{ \ + unsigned long oldval; \ + unsigned long res; \ + \ + do { \ + asm volatile("// __cmpxchg_case_" #name "\n" \ + " ldxr" #sz " %" #w "1, %2\n" \ + " mov %w0, #0\n" \ + " cmp %" #w "1, %" #w "3\n" \ + " b.ne 1f\n" \ + " stxr" #sz " %w0, %" #w "4, %2\n" \ + "1:\n" \ + : "=&r" (res), "=&r" (oldval), \ + "+Q" (*(unsigned long *)ptr) \ + : "Ir" (*old), "r" (new) \ + : "cc"); \ + \ + if (!res) \ + break; \ + } while (!timeout || ((--max_try) > 0)); \ + \ From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:33:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:33:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247278.426357 (Exim 4.92) (envelope-from ) id 1mxQf8-0005KH-2k; Wed, 15 Dec 2021 09:33:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247278.426357; Wed, 15 Dec 2021 09:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQf7-0005K9-W2; Wed, 15 Dec 2021 09:33:25 +0000 Received: by outflank-mailman (input) for mailman id 247278; Wed, 15 Dec 2021 09:33:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQf6-0005K1-NC for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQf6-0008K1-MQ for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQf6-0003pL-LW for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=1Fef/o2aAiMxgW11IC/49MKLMVyzKPMqO/BAhEepPqQ=; b=p3+zVB9lznxUs8dfeizZ1WEXCM anzdJY3KPXkkGbOCNn2J0JyWvtxPaExmseHy/F5HNktOhOUbWCxINyvm0evXvJA6A/GLdyaJDGZCh 4QZG7krtiNzLjRuMpNmRl8/aVOO3qkwKYrNAZnkU/nU0n7MPsAtNZUMfwe3C8lzf6vRc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: generate "include/xen/compile.h" with if_changed Message-Id: Date: Wed, 15 Dec 2021 09:33:24 +0000 commit 19427e439e01715c1a493c1528122234346efe38 Author: Anthony PERARD AuthorDate: Wed Dec 15 10:16:51 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:16:51 2021 +0100 build: generate "include/xen/compile.h" with if_changed This will avoid regenerating "compile.h" if the content hasn't changed. As it's currently the case, the file isn't regenerated during `sudo make install` if it exist and does belong to a different user, thus we can remove the target "delete-unfresh-files". Target "$(TARGET)" still need a phony dependency, so add "FORCE". Use "$(dot-target).tmp" as temporary file as this is already cover by ".*.tmp" partern in ".gitconfig". Signed-off-by: Anthony PERARD Acked-by: Jan Beulich --- xen/Makefile | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index b2a63edca1..2ad7da7ad6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -365,7 +365,7 @@ _debug: $(OBJDUMP) -D -S $(TARGET)-syms > $(TARGET).s .PHONY: _clean -_clean: delete-unfresh-files +_clean: $(MAKE) -C tools clean $(MAKE) $(clean) include $(MAKE) $(clean) common @@ -383,7 +383,7 @@ _clean: delete-unfresh-files -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h - rm -f .banner .allconfig.tmp + rm -f .banner .allconfig.tmp include/xen/compile.h .PHONY: _distclean _distclean: clean @@ -393,7 +393,7 @@ $(TARGET).gz: $(TARGET) gzip -n -f -9 < $< > $@.new mv $@.new $@ -$(TARGET): delete-unfresh-files +$(TARGET): FORCE $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \ @@ -406,14 +406,6 @@ $(TARGET): delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk arch/$(TARGET_ARCH)/include/asm/asm-offsets.h $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) $@ -# drivers/char/console.o contains static banner/compile info. Blow it away. -# Don't refresh these files during e.g., 'sudo make install' -.PHONY: delete-unfresh-files -delete-unfresh-files: - @if [ ! -r include/xen/compile.h -o -O include/xen/compile.h ]; then \ - rm -f include/xen/compile.h; \ - fi - quiet_cmd_banner = BANNER $@ define cmd_banner if which figlet >/dev/null 2>&1 ; then \ @@ -428,9 +420,11 @@ endef $(call if_changed,banner) targets += .banner -# compile.h contains dynamic build info. Rebuilt on every 'make' invocation. -include/xen/compile.h: include/xen/compile.h.in .banner - @sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ +# Don't refresh this files during e.g., 'sudo make install' +quiet_cmd_compile.h = UPD $@ +define cmd_compile.h + if [ ! -r $@ -o -O $@ ]; then \ + sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ -e 's/@@time@@/$(XEN_BUILD_TIME)/g' \ -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -e 's/@@domain@@/$(XEN_DOMAIN)/g' \ @@ -440,10 +434,17 @@ include/xen/compile.h: include/xen/compile.h.in .banner -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \ - < include/xen/compile.h.in > $@.new + < $< > $(dot-target).tmp; \ + sed -rf tools/process-banner.sed < .banner >> $(dot-target).tmp; \ + mv -f $(dot-target).tmp $@; \ + fi +endef + +include/xen/compile.h: include/xen/compile.h.in .banner FORCE @cat .banner - @sed -rf tools/process-banner.sed < .banner >> $@.new - @mv -f $@.new $@ + $(call if_changed,compile.h) + +targets += include/xen/compile.h asm-offsets.s: arch/$(TARGET_ARCH)/$(TARGET_SUBARCH)/asm-offsets.c $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:33:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:33:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247279.426361 (Exim 4.92) (envelope-from ) id 1mxQfI-0005No-41; Wed, 15 Dec 2021 09:33:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247279.426361; Wed, 15 Dec 2021 09:33:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfI-0005Ng-19; Wed, 15 Dec 2021 09:33:36 +0000 Received: by outflank-mailman (input) for mailman id 247279; Wed, 15 Dec 2021 09:33:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfG-0005NT-QU for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfG-0008KX-Pk for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQfG-0003qB-OW for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kbnM3PErPlK4nqv9CRDvH1UaA0MkA9unt5xfsKShRT4=; b=tyNstjIJbjOsKA2lo8pSPh9A0U BHqEVVl9cUFjC8evEug9XDsye7VOhoh67zBn7QapzTjo3pDGTTvYaR7KMON3IvJTIXdDzL1eZl5Js Ce+fJGAdi20VgQWgQrQ4nuN1VogKgW4XNzCXJqx0qmTE3WMb/fiKAj+T4EfEkTLpEnbQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] build: adjust $(TARGET).efi creation in arch/arm Message-Id: Date: Wed, 15 Dec 2021 09:33:34 +0000 commit a6d21af4a12d310fec72ca3e87e2a3b045643a25 Author: Anthony PERARD AuthorDate: Wed Dec 15 10:17:34 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:17:34 2021 +0100 build: adjust $(TARGET).efi creation in arch/arm There is no need to try to guess a relative path to the "xen.efi" file, we can simply use $@. Also, there's no need to use `notdir`, make already do that work via $(@F). Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index a3a497bafe..d0dee10102 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -95,7 +95,7 @@ endif $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ ifeq ($(CONFIG_ARM_64),y) - ln -sf $(notdir $@) ../../$(notdir $@).efi + ln -sf $(@F) $@.efi endif ifeq ($(CONFIG_LTO),y) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:33:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:33:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247280.426365 (Exim 4.92) (envelope-from ) id 1mxQfS-0005Ql-5l; Wed, 15 Dec 2021 09:33:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247280.426365; Wed, 15 Dec 2021 09:33:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfS-0005Qb-2a; Wed, 15 Dec 2021 09:33:46 +0000 Received: by outflank-mailman (input) for mailman id 247280; Wed, 15 Dec 2021 09:33:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfQ-0005QJ-Tz for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfQ-0008Kj-TC for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQfQ-0003qu-S7 for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D33PonGclt8fVMLmWAqJN7b5Rl62JtvBNAneZYcMPsY=; b=slz2kuK0uHgveeyakBG7YUdADK LdJ3xY3l2EgTD4T7tBp3UMGKcNBkgJDx1HVNT37MAPiqzHF1YrQeESJjFf2u3qQetHI0N0eFEwp/I YP070SWGasaGzhb1qav8g5D+Jr8B8v7uUxnDaHzn3APIyeH9a3L0inB3lz9QyvHGMulQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PVH: improve Dom0 memory size calculation Message-Id: Date: Wed, 15 Dec 2021 09:33:44 +0000 commit 5b226ca74bb2c5cd84ede5c1f2b859c2e3bcd8a0 Author: Jan Beulich AuthorDate: Wed Dec 15 10:19:54 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:19:54 2021 +0100 x86/PVH: improve Dom0 memory size calculation Assuming that the accounting for IOMMU page tables will also take care of the P2M needs was wrong: dom0_paging_pages() can determine a far higher value, high enough for the system to run out of memory while setting up Dom0. Hence in the case of shared page tables the larger of the two values needs to be used (without shared page tables the sum of both continues to be applicable). To not further complicate the logic, eliminate the up-to-2-iteration loop in favor of doing a few calculations twice (before and after calling dom0_paging_pages()). While this will lead to slightly too high a value in "cpu_pages", it is deemed better to account a few too many than a few too little. As a result the calculation is now deemed good enough to no longer warrant the warning message, which therefore gets dropped. Also uniformly use paging_mode_enabled(), not is_hvm_domain(). While there also account for two further aspects in the PV case: With "iommu=dom0-passthrough" no IOMMU page tables would get allocated, so none need accounting for. And if shadow mode is to be enabled (including only potentially, because of "pv-l1tf=dom0"), setting aside a suitable amount for the P2M pool to get populated is also necessary (i.e. similar to the non-shared-page-tables case of PVH). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/dom0_build.c | 73 +++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 5a7441ed5b..a7fec05956 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -19,6 +19,7 @@ #include #include #include +#include struct memsize { long nr_pages; @@ -321,12 +322,22 @@ unsigned long __init dom0_paging_pages(const struct domain *d, return ((memkb + 1023) / 1024) << (20 - PAGE_SHIFT); } + +/* + * If allocation isn't specified, reserve 1/16th of available memory for + * things like DMA buffers. This reservation is clamped to a maximum of 128MB. + */ +static unsigned long __init default_nr_pages(unsigned long avail) +{ + return avail - (pv_shim ? pv_shim_mem(avail) + : min(avail / 16, 128UL << (20 - PAGE_SHIFT))); +} + unsigned long __init dom0_compute_nr_pages( struct domain *d, struct elf_dom_parms *parms, unsigned long initrd_len) { nodeid_t node; - unsigned long avail = 0, nr_pages, min_pages, max_pages; - bool need_paging; + unsigned long avail = 0, nr_pages, min_pages, max_pages, iommu_pages = 0; /* The ordering of operands is to work around a clang5 issue. */ if ( CONFIG_DOM0_MEM[0] && !dom0_mem_set ) @@ -344,53 +355,47 @@ unsigned long __init dom0_compute_nr_pages( avail -= d->max_vcpus - 1; /* Reserve memory for iommu_dom0_init() (rough estimate). */ - if ( is_iommu_enabled(d) ) + if ( is_iommu_enabled(d) && !iommu_hwdom_passthrough ) { unsigned int s; for ( s = 9; s < BITS_PER_LONG; s += 9 ) - avail -= max_pdx >> s; + iommu_pages += max_pdx >> s; + + avail -= iommu_pages; } - need_paging = is_hvm_domain(d) && - (!iommu_use_hap_pt(d) || !paging_mode_hap(d)); - for ( ; ; need_paging = false ) + if ( paging_mode_enabled(d) || opt_dom0_shadow || opt_pv_l1tf_hwdom ) { - nr_pages = get_memsize(&dom0_size, avail); - min_pages = get_memsize(&dom0_min_size, avail); - max_pages = get_memsize(&dom0_max_size, avail); + unsigned long cpu_pages; + + nr_pages = get_memsize(&dom0_size, avail) ?: default_nr_pages(avail); /* - * If allocation isn't specified, reserve 1/16th of available memory - * for things like DMA buffers. This reservation is clamped to a - * maximum of 128MB. + * Clamp according to min/max limits and available memory + * (preliminary). */ - if ( !nr_pages ) - { - nr_pages = avail - (pv_shim ? pv_shim_mem(avail) - : min(avail / 16, 128UL << (20 - PAGE_SHIFT))); - if ( is_hvm_domain(d) && !need_paging ) - /* - * Temporary workaround message until internal (paging) memory - * accounting required to build a pvh dom0 is improved. - */ - printk("WARNING: PVH dom0 without dom0_mem set is still unstable. " - "If you get crashes during boot, try adding a dom0_mem parameter\n"); - } - - - /* Clamp according to min/max limits and available memory. */ - nr_pages = max(nr_pages, min_pages); - nr_pages = min(nr_pages, max_pages); + nr_pages = max(nr_pages, get_memsize(&dom0_min_size, avail)); + nr_pages = min(nr_pages, get_memsize(&dom0_max_size, avail)); nr_pages = min(nr_pages, avail); - if ( !need_paging ) - break; + cpu_pages = dom0_paging_pages(d, nr_pages); - /* Reserve memory for shadow or HAP. */ - avail -= dom0_paging_pages(d, nr_pages); + if ( !iommu_use_hap_pt(d) ) + avail -= cpu_pages; + else if ( cpu_pages > iommu_pages ) + avail -= cpu_pages - iommu_pages; } + nr_pages = get_memsize(&dom0_size, avail) ?: default_nr_pages(avail); + min_pages = get_memsize(&dom0_min_size, avail); + max_pages = get_memsize(&dom0_max_size, avail); + + /* Clamp according to min/max limits and available memory (final). */ + nr_pages = max(nr_pages, min_pages); + nr_pages = min(nr_pages, max_pages); + nr_pages = min(nr_pages, avail); + if ( is_pv_domain(d) && (parms->p2m_base == UNSET_ADDR) && !memsize_gt_zero(&dom0_size) && (!memsize_gt_zero(&dom0_min_size) || (nr_pages > min_pages)) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:33:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:33:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247281.426369 (Exim 4.92) (envelope-from ) id 1mxQfc-0005Tq-7B; Wed, 15 Dec 2021 09:33:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247281.426369; Wed, 15 Dec 2021 09:33:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfc-0005Ti-4A; Wed, 15 Dec 2021 09:33:56 +0000 Received: by outflank-mailman (input) for mailman id 247281; Wed, 15 Dec 2021 09:33:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfb-0005TX-1j for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfb-0008Kt-0w for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQfa-0003s2-Vk for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:33:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aAgwDmj+Z7vHbe8npY9fhnc1eKlAo9r8MaXrf3JecXQ=; b=2yj3grfgJ5fxg4hJh2KvzaAU7C YlyY5Ce3ybmsAjtS9BrG9sOgGfDPdEl/Nn6DHU7U0kk7iBLG65E/8P5GMltARkK98MiVZMsqvH2tH IaX8OGYhzu1hlzTbLgl2qqJyeTF/LCXPpuzXsrJfQk6kP5NICmDGyeMilZEwIZvUVSB8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/PVH: permit more physdevop-s to be used by Dom0 Message-Id: Date: Wed, 15 Dec 2021 09:33:54 +0000 commit 163db6a72b660f0f3c9fe1d34e8f6b07ae6bd77d Author: Jan Beulich AuthorDate: Wed Dec 15 10:20:35 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:20:35 2021 +0100 x86/PVH: permit more physdevop-s to be used by Dom0 Certain notifications of Dom0 to Xen are independent of the mode Dom0 is running in. Permit further PCI related ones (only their modern forms). Also include the USB2 debug port operation at this occasion. While largely relevant for the latter, drop the has_vpci() part of the conditional as redundant with is_hardware_domain(): There's no PVH Dom0 without vPCI. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/hypercall.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index c4e5c34c37..384724ec41 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -94,7 +94,10 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(currd) || !is_hardware_domain(currd) ) + case PHYSDEVOP_pci_device_add: + case PHYSDEVOP_pci_device_remove: + case PHYSDEVOP_dbgp_op: + if ( !is_hardware_domain(currd) ) return -ENOSYS; break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:34:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:34:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247282.426373 (Exim 4.92) (envelope-from ) id 1mxQfm-0005WI-8Z; Wed, 15 Dec 2021 09:34:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247282.426373; Wed, 15 Dec 2021 09:34:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfm-0005WA-5Z; Wed, 15 Dec 2021 09:34:06 +0000 Received: by outflank-mailman (input) for mailman id 247282; Wed, 15 Dec 2021 09:34:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfl-0005Vu-5U for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:34:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfl-0008LG-4i for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQfl-0003tU-3g for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:34:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6Q2Q3d+Q4/h3rihgXRZVTn4j9REVIU7K6KE1SNtgpaU=; b=IjJFMkLqFWD/TgcS03tpXDiiXQ 3NiXzEMGwyy9Q9TdnjgWbZDXbbNzER/WE4yGIGLz/BUz2mDDmbPw3oCRNl7ZCpq4F2eiviOnp/RJg dTm4J6B/bIS2czoDs425TZb4om/rFP4Nfvo3oKfCDplKFi0p+zeC7h7f9UWyOOgmehPE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86: drop MEMORY_GUARD Message-Id: Date: Wed, 15 Dec 2021 09:34:05 +0000 commit fdf01494560219d10f92ce3419a5551e3ce5fe4f Author: Jan Beulich AuthorDate: Wed Dec 15 10:23:51 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:23:51 2021 +0100 x86: drop MEMORY_GUARD The functions it guards are dead code. Worse, while intended to exist in debug builds only, as of commit bacbf0cb7349 ("build: convert debug to Kconfig") they also get compiled in release builds. The remaining uses in show_stack_overflow() aren't really related to any memory guarding anymore - with CET-SS support the stacks now get set up the same in debug and release builds. Drop them as well; there's no harm providing the information there in all cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/include/asm/config.h | 4 ---- xen/arch/x86/include/asm/mm.h | 8 -------- xen/arch/x86/mm.c | 30 ------------------------------ xen/arch/x86/traps.c | 4 ---- 4 files changed, 46 deletions(-) diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h index 883c2ef0df..de20642524 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -57,10 +57,6 @@ #define NR_hypercalls 64 -#ifndef NDEBUG -#define MEMORY_GUARD -#endif - #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index cb90527499..5dbcee8696 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -530,14 +530,6 @@ extern struct rangeset *mmio_ro_ranges; #define compat_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define compat_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) -#ifdef MEMORY_GUARD -void memguard_guard_range(void *p, unsigned long l); -void memguard_unguard_range(void *p, unsigned long l); -#else -#define memguard_guard_range(_p,_l) ((void)0) -#define memguard_unguard_range(_p,_l) ((void)0) -#endif - void memguard_guard_stack(void *p); void memguard_unguard_stack(void *p); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4a9ac8d5e6..1397f83e41 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -6109,36 +6109,6 @@ void free_perdomain_mappings(struct domain *d) d->arch.perdomain_l3_pg = NULL; } -#ifdef MEMORY_GUARD - -static void __memguard_change_range(void *p, unsigned long l, int guard) -{ - unsigned long _p = (unsigned long)p; - unsigned long _l = (unsigned long)l; - unsigned int flags = __PAGE_HYPERVISOR_RW | MAP_SMALL_PAGES; - - /* Ensure we are dealing with a page-aligned whole number of pages. */ - ASSERT(IS_ALIGNED(_p, PAGE_SIZE)); - ASSERT(IS_ALIGNED(_l, PAGE_SIZE)); - - if ( guard ) - flags &= ~_PAGE_PRESENT; - - map_pages_to_xen(_p, virt_to_mfn(p), PFN_DOWN(_l), flags); -} - -void memguard_guard_range(void *p, unsigned long l) -{ - __memguard_change_range(p, l, 1); -} - -void memguard_unguard_range(void *p, unsigned long l) -{ - __memguard_change_range(p, l, 0); -} - -#endif - static void write_sss_token(unsigned long *ptr) { /* diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 2ddcd95dce..df7ffc448b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -642,15 +642,12 @@ void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) { unsigned long esp = regs->rsp; unsigned long curr_stack_base = esp & ~(STACK_SIZE - 1); -#ifdef MEMORY_GUARD unsigned long esp_top, esp_bottom; -#endif if ( _p(curr_stack_base) != stack_base[cpu] ) printk("Current stack base %p differs from expected %p\n", _p(curr_stack_base), stack_base[cpu]); -#ifdef MEMORY_GUARD esp_bottom = (esp | (STACK_SIZE - 1)) + 1; esp_top = esp_bottom - PRIMARY_STACK_SIZE; @@ -678,7 +675,6 @@ void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) _show_trace(esp, regs->rbp); printk("\n"); -#endif } void show_execution_state(const struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 09:34:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 09:34:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247283.426377 (Exim 4.92) (envelope-from ) id 1mxQfw-0005ZF-Az; Wed, 15 Dec 2021 09:34:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247283.426377; Wed, 15 Dec 2021 09:34:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfw-0005Z8-7D; Wed, 15 Dec 2021 09:34:16 +0000 Received: by outflank-mailman (input) for mailman id 247283; Wed, 15 Dec 2021 09:34:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfv-0005Yw-8y for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:34:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxQfv-0008LR-87 for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:34:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxQfv-0003ux-78 for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 09:34:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=N+VUCDNwOfS/GzdNQN3REitqTZKex22Z/JMDXctxOek=; b=1mducx1QyOCA3Lte+ILiOZtGYG h5o/Qec31T3teIEXRTNtSxXQ5fJWuJEjr7M4ZXlCyYTKUyMsTYAgW/pM7EpJU/sOwvLro6dAyhc/B /EOG910HXO2sC6pY6WWJXCAVr1JHqDXZZFvQ4OXMIAIYcCqdKisuh8CEjzHqvgc2wVJk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] Arm: drop memguard_{,un}guard_range() stubs Message-Id: Date: Wed, 15 Dec 2021 09:34:15 +0000 commit 9956fdc70f99b0f133be7f16f62417928a84622c Author: Jan Beulich AuthorDate: Wed Dec 15 10:24:45 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:24:45 2021 +0100 Arm: drop memguard_{,un}guard_range() stubs These exist for no reason: The code using them is only ever built for Arm32. And memguard_guard_stack() has no use outside of x86-specific code at all. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/mm.h | 4 ---- xen/common/page_alloc.c | 6 ------ 2 files changed, 10 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 7b5e7b7f69..424aaf2823 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -341,10 +341,6 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg); unsigned long domain_get_maximum_gpfn(struct domain *d); -#define memguard_guard_stack(_p) ((void)0) -#define memguard_guard_range(_p,_l) ((void)0) -#define memguard_unguard_range(_p,_l) ((void)0) - /* Release all __init and __initdata ranges to be reused */ void free_init_memory(void); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 653f1ab09f..38eea879c0 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2152,8 +2152,6 @@ void init_xenheap_pages(paddr_t ps, paddr_t pe) if ( !is_xen_heap_mfn(maddr_to_mfn(pe)) ) pe -= PAGE_SIZE; - memguard_guard_range(maddr_to_virt(ps), pe - ps); - init_heap_pages(maddr_to_page(ps), (pe - ps) >> PAGE_SHIFT); } @@ -2169,8 +2167,6 @@ void *alloc_xenheap_pages(unsigned int order, unsigned int memflags) if ( unlikely(pg == NULL) ) return NULL; - memguard_unguard_range(page_to_virt(pg), 1 << (order + PAGE_SHIFT)); - return page_to_virt(pg); } @@ -2182,8 +2178,6 @@ void free_xenheap_pages(void *v, unsigned int order) if ( v == NULL ) return; - memguard_guard_range(v, 1 << (order + PAGE_SHIFT)); - free_heap_pages(virt_to_page(v), order, false); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 12:22:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 12:22:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247359.426516 (Exim 4.92) (envelope-from ) id 1mxTIJ-0004pi-Pp; Wed, 15 Dec 2021 12:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247359.426516; Wed, 15 Dec 2021 12:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxTIJ-0004pa-Mq; Wed, 15 Dec 2021 12:22:03 +0000 Received: by outflank-mailman (input) for mailman id 247359; Wed, 15 Dec 2021 12:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxTII-0004pU-97 for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 12:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxTII-00032p-7c for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 12:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxTII-0006z7-6T for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 12:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EhyyLojvb0/eNFSaaUROIo/iAdYQQ2/XlxxqeIsTKlQ=; b=FLrVOJHvzQsb5L2Ea9vH/+Vprw 8KB/3CrEm5aS94dMY+KQLV7uQtS5XEg8sACoyNA2mui9prrQKKOUuyOgw8gM6T1/EgkzDm+NjdLiw D6UwkV+98bW9ivDY6JdhLQw9JXigavHQVa4dxVO3VPnWXhuG7dnZX9d/Hk96xjqSwUsM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.15] xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Message-Id: Date: Wed, 15 Dec 2021 12:22:02 +0000 commit aba22c67efe4404a2a84e378bfd98def5ec8e647 Author: Stefano Stabellini AuthorDate: Wed Aug 4 13:57:07 2021 -0700 Commit: Stefano Stabellini CommitDate: Tue Dec 14 12:29:28 2021 -0800 xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Set/Way flushes never work correctly in a virtualized environment. Our current implementation is based on clearing the valid bit in the p2m pagetable to track guest memory accesses. This technique doesn't work when the IOMMU is enabled for the domain and the pagetable is shared between IOMMU and MMU because it triggers IOMMU faults. Specifically, p2m_invalidate_root causes IOMMU faults if iommu_use_hap_pt returns true for the domain. Add a check in p2m_set_way_flush: if a set/way instruction is used and iommu_use_hap_pt returns true, rather than failing with obscure IOMMU faults, inject an undef exception straight away into the guest, and print a verbose error message to explain the problem. Also add an ASSERT in p2m_invalidate_root to make sure we don't inadvertently stumble across this problem again in the future. Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall (cherry picked from commit 2b45ff60301a988badec526846e77b538383ae63) --- xen/arch/arm/arm64/vsysreg.c | 2 +- xen/arch/arm/p2m.c | 17 ++++++++++++++++- xen/arch/arm/vcpreg.c | 2 +- xen/include/asm-arm/p2m.h | 4 +++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 41f18612c6..3743309107 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -106,7 +106,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_DCCSW: case HSR_SYSREG_DCCISW: if ( !hsr.sysreg.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ac50312620..eaa43c6181 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,6 +11,7 @@ #include #include #include +#include #define MAX_VMID_8_BIT (1UL << 8) #define MAX_VMID_16_BIT (1UL << 16) @@ -1166,11 +1167,16 @@ static void p2m_invalidate_table(struct p2m_domain *p2m, mfn_t mfn) /* * Invalidate all entries in the root page-tables. This is * useful to get fault on entry and do an action. + * + * p2m_invalid_root() should not be called when the P2M is shared with + * the IOMMU because it will cause IOMMU fault. */ void p2m_invalidate_root(struct p2m_domain *p2m) { unsigned int i; + ASSERT(!iommu_use_hap_pt(p2m->domain)); + p2m_write_lock(p2m); for ( i = 0; i < P2M_ROOT_LEVEL; i++ ) @@ -1815,11 +1821,20 @@ void p2m_flush_vm(struct vcpu *v) * * - Once the caches are enabled, we stop trapping VM ops. */ -void p2m_set_way_flush(struct vcpu *v) +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr) { /* This function can only work with the current vCPU. */ ASSERT(v == current); + if ( iommu_use_hap_pt(current->domain) ) + { + gprintk(XENLOG_ERR, + "The cache should be flushed by VA rather than by set/way.\n"); + inject_undef_exception(regs, hsr); + return; + } + if ( !(v->arch.hcr_el2 & HCR_TVM) ) { v->arch.need_flush_to_ram = true; diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index 55351fc087..67ff02f6f8 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -222,7 +222,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG32(DCCSW): case HSR_CPREG32(DCCISW): if ( !cp32.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 4f8b3b0ec7..6a2108398f 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -7,6 +7,7 @@ #include #include +#include #define paddr_bits PADDR_BITS @@ -272,7 +273,8 @@ void p2m_invalidate_root(struct p2m_domain *p2m); */ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end); -void p2m_set_way_flush(struct vcpu *v); +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr); void p2m_toggle_cache(struct vcpu *v, bool was_enabled); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.15 From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 13:11:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 13:11:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247387.426569 (Exim 4.92) (envelope-from ) id 1mxU3i-0003vd-Iy; Wed, 15 Dec 2021 13:11:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247387.426569; Wed, 15 Dec 2021 13:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxU3i-0003vU-GC; Wed, 15 Dec 2021 13:11:02 +0000 Received: by outflank-mailman (input) for mailman id 247387; Wed, 15 Dec 2021 13:11:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxU3h-0003vO-Cf for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 13:11:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxU3h-0003u9-Bs for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 13:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxU3h-0001y1-Aq for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 13:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gUS+b9sL5CVRex3pYGXRW43jW4aBSUu0fJ012xHweBc=; b=vOfKXmvUH871uUhfY71u8yNZQH BywolRnDDamIZv1VXbu5O2zQRdMJkAqHKIPycDc9kMMxphfdRBbGqJXXxqKszIasmPkrOzrOdkU/a fNIVus53SotqZWP0vX/lF4TdGWESnmmhcA/nFzElO2VvQtpUXImTUgFaW2/1sViVzODI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen stable-4.14] xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Message-Id: Date: Wed, 15 Dec 2021 13:11:01 +0000 commit cbadf67bcab4e29c883410db393f4f5ef34df04a Author: Stefano Stabellini AuthorDate: Wed Aug 4 13:57:07 2021 -0700 Commit: Stefano Stabellini CommitDate: Tue Dec 14 12:39:20 2021 -0800 xen/arm: Do not invalidate the P2M when the PT is shared with the IOMMU Set/Way flushes never work correctly in a virtualized environment. Our current implementation is based on clearing the valid bit in the p2m pagetable to track guest memory accesses. This technique doesn't work when the IOMMU is enabled for the domain and the pagetable is shared between IOMMU and MMU because it triggers IOMMU faults. Specifically, p2m_invalidate_root causes IOMMU faults if iommu_use_hap_pt returns true for the domain. Add a check in p2m_set_way_flush: if a set/way instruction is used and iommu_use_hap_pt returns true, rather than failing with obscure IOMMU faults, inject an undef exception straight away into the guest, and print a verbose error message to explain the problem. Also add an ASSERT in p2m_invalidate_root to make sure we don't inadvertently stumble across this problem again in the future. Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall (cherry picked from commit 2b45ff60301a988badec526846e77b538383ae63) --- xen/arch/arm/arm64/vsysreg.c | 2 +- xen/arch/arm/p2m.c | 17 ++++++++++++++++- xen/arch/arm/vcpreg.c | 2 +- xen/include/asm-arm/p2m.h | 4 +++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 8a85507d9d..69a91aaa84 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -98,7 +98,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_DCCSW: case HSR_SYSREG_DCCISW: if ( !hsr.sysreg.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 4eeb867ca1..ac821a9094 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -10,6 +10,7 @@ #include #include #include +#include #define MAX_VMID_8_BIT (1UL << 8) #define MAX_VMID_16_BIT (1UL << 16) @@ -1158,11 +1159,16 @@ static void p2m_invalidate_table(struct p2m_domain *p2m, mfn_t mfn) /* * Invalidate all entries in the root page-tables. This is * useful to get fault on entry and do an action. + * + * p2m_invalid_root() should not be called when the P2M is shared with + * the IOMMU because it will cause IOMMU fault. */ void p2m_invalidate_root(struct p2m_domain *p2m) { unsigned int i; + ASSERT(!iommu_use_hap_pt(p2m->domain)); + p2m_write_lock(p2m); for ( i = 0; i < P2M_ROOT_LEVEL; i++ ) @@ -1781,11 +1787,20 @@ void p2m_flush_vm(struct vcpu *v) * * - Once the caches are enabled, we stop trapping VM ops. */ -void p2m_set_way_flush(struct vcpu *v) +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr) { /* This function can only work with the current vCPU. */ ASSERT(v == current); + if ( iommu_use_hap_pt(current->domain) ) + { + gprintk(XENLOG_ERR, + "The cache should be flushed by VA rather than by set/way.\n"); + inject_undef_exception(regs, hsr); + return; + } + if ( !(v->arch.hcr_el2 & HCR_TVM) ) { v->arch.need_flush_to_ram = true; diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cdc91cdf5b..f4557b80a7 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -204,7 +204,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG32(DCCSW): case HSR_CPREG32(DCCISW): if ( !cp32.read ) - p2m_set_way_flush(current); + p2m_set_way_flush(current, regs, hsr); break; /* diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 28ca9a838e..ea8a03449d 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -7,6 +7,7 @@ #include #include +#include #define paddr_bits PADDR_BITS @@ -263,7 +264,8 @@ void p2m_invalidate_root(struct p2m_domain *p2m); */ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end); -void p2m_set_way_flush(struct vcpu *v); +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, + const union hsr hsr); void p2m_toggle_cache(struct vcpu *v, bool was_enabled); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.14 From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 14:33:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 14:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247415.426624 (Exim 4.92) (envelope-from ) id 1mxVL9-000661-EU; Wed, 15 Dec 2021 14:33:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247415.426624; Wed, 15 Dec 2021 14:33:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxVL9-00065t-BT; Wed, 15 Dec 2021 14:33:07 +0000 Received: by outflank-mailman (input) for mailman id 247415; Wed, 15 Dec 2021 14:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxVL7-00065m-BD for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 14:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxVL7-0005LU-78 for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 14:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxVL7-0007d8-5t for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 14:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+maRuv7cEUU7fhhcJ6lkg96O9bWA+Xj/hQftxLXpUJY=; b=i2u+F9NZpeK+msdI/mf6m/cZrY h+0lk1nh8ccC4xkEpcfAyfac5L/fa75GmnhAMazpOjY0fhiTwv2aBuBrNgn3uu3lP1F4WbKreaA5+ VoBixpsRFEO/sf+XB3ZA1A4v9OC4NgTdWIb2PvuQD9qUFABr5vS4MOsfUjYtbvUqHrPA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/traps: remove debugger_trap_fatal() calls Message-Id: Date: Wed, 15 Dec 2021 14:33:05 +0000 commit 8b3cbdbe782cae972e9a47cf22620ebee61a96a6 Author: Bobby Eshleman AuthorDate: Tue Sep 28 13:30:24 2021 -0700 Commit: Andrew Cooper CommitDate: Wed Dec 15 14:30:08 2021 +0000 arm/traps: remove debugger_trap_fatal() calls ARM doesn't actually use debugger_trap_* anything, and is stubbed out. This commit simply removes the unneeded calls. Signed-off-by: Bobby Eshleman Acked-by: Julien Grall --- xen/arch/arm/traps.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 8757210a79..9339d12f58 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -1267,10 +1266,6 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc) case BUGFRAME_bug: printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); - - if ( debugger_trap_fatal(TRAP_invalid_op, regs) ) - return 0; - show_execution_state(regs); panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno); @@ -1282,8 +1277,6 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc) printk("Assertion '%s' failed at %s%s:%d\n", predicate, prefix, filename, lineno); - if ( debugger_trap_fatal(TRAP_invalid_op, regs) ) - return 0; show_execution_state(regs); panic("Assertion '%s' failed at %s%s:%d\n", predicate, prefix, filename, lineno); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 17:44:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 17:44:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247501.426766 (Exim 4.92) (envelope-from ) id 1mxYJy-00085U-1g; Wed, 15 Dec 2021 17:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247501.426766; Wed, 15 Dec 2021 17:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYJx-00085N-VC; Wed, 15 Dec 2021 17:44:05 +0000 Received: by outflank-mailman (input) for mailman id 247501; Wed, 15 Dec 2021 17:44:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYJw-00085H-Ft for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYJw-0000jc-Cl for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxYJw-0000fY-BU for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+CmLm+fPQB+VrF0/GbQ74Qn9Z3G8JjUCy93MNP0dVVA=; b=BX4595/9Sh6tPSgN/TrkOEXFtQ +pqnmXL0Dxj28sPVpWTH36uSLNv5u8rx2lJjkeXteHpBz9sK2+TmS9UgN/tkqsJopWJPanLyUkn1o LYt8fKtPDyfA4Eqs7wqE3QP1fSunT8j+0IGM6tsJ/C4JrMPfrIPZX8iLmpsUAdz+1pKs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: add pci-domain for disabled devices Message-Id: Date: Wed, 15 Dec 2021 17:44:04 +0000 commit 1050a7b91c2ef8d102b5d216ed3d12cdb6067f60 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:15 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:34:58 2021 +0000 xen/arm: add pci-domain for disabled devices If a PCI host bridge device is present in the device tree, but is disabled, then its PCI host bridge driver was not instantiated. This results in the failure of the pci_get_host_bridge_segment() and the following panic during Xen start: (XEN) Device tree generation failed (-22). (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Could not set up DOM0 guest OS (XEN) **************************************** Fix this by adding "linux,pci-domain" property for all device tree nodes which have "pci" device type, so we know which segments will be used by the guest for which bridges. Fixes: 4cfab4425d39 ("xen/arm: Add linux,pci-domain property for hwdom if not available.") Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 66 ++++++++++++++++++++++++++++++-------- xen/arch/arm/include/asm/pci.h | 8 +++++ xen/arch/arm/pci/pci-host-common.c | 8 +++-- 3 files changed, 66 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d02bacbcd1..6c5d22d9be 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -654,6 +654,55 @@ static void __init allocate_static_memory(struct domain *d, } #endif +/* + * When PCI passthrough is available we want to keep the + * "linux,pci-domain" in sync for every host bridge. + * + * Xen may not have a driver for all the host bridges. So we have + * to write an heuristic to detect whether a device node describes + * a host bridge. + * + * The current heuristic assumes that a device is a host bridge + * if the type is "pci" and then parent type is not "pci". + */ +static int handle_linux_pci_domain(struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + uint16_t segment; + int res; + + if ( !is_pci_passthrough_enabled() ) + return 0; + + if ( !dt_device_type_is_equal(node, "pci") ) + return 0; + + if ( node->parent && dt_device_type_is_equal(node->parent, "pci") ) + return 0; + + if ( dt_find_property(node, "linux,pci-domain", NULL) ) + return 0; + + /* Allocate and create the linux,pci-domain */ + res = pci_get_host_bridge_segment(node, &segment); + if ( res < 0 ) + { + res = pci_get_new_domain_nr(); + if ( res < 0 ) + { + printk(XENLOG_DEBUG "Can't assign PCI segment to %s\n", + node->full_name); + return -FDT_ERR_NOTFOUND; + } + + segment = res; + printk(XENLOG_DEBUG "Assigned segment %d to %s\n", + segment, node->full_name); + } + + return fdt_property_cell(kinfo->fdt, "linux,pci-domain", segment); +} + static int __init write_properties(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -755,21 +804,10 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( is_pci_passthrough_enabled() && dt_device_type_is_equal(node, "pci") ) - { - if ( !dt_find_property(node, "linux,pci-domain", NULL) ) - { - uint16_t segment; - - res = pci_get_host_bridge_segment(node, &segment); - if ( res < 0 ) - return res; + res = handle_linux_pci_domain(kinfo, node); - res = fdt_property_cell(kinfo->fdt, "linux,pci-domain", segment); - if ( res ) - return res; - } - } + if ( res ) + return res; /* * Override the property "status" to disable the device when it's diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 9736d6816d..c313423cdc 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -109,6 +109,8 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); +int pci_get_new_domain_nr(void); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; @@ -129,5 +131,11 @@ static inline int pci_get_host_bridge_segment(const struct dt_device_node *node, return -EINVAL; } +static inline int pci_get_new_domain_nr(void) +{ + ASSERT_UNREACHABLE(); + return -1; +} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index ae79a0c19b..40e779b5d8 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -30,6 +30,8 @@ static LIST_HEAD(pci_host_bridges); static atomic_t domain_nr = ATOMIC_INIT(-1); +static int use_dt_domains = -1; + static inline void __iomem *pci_remap_cfgspace(paddr_t start, size_t len) { return ioremap_nocache(start, len); @@ -137,14 +139,16 @@ void pci_add_host_bridge(struct pci_host_bridge *bridge) list_add_tail(&bridge->node, &pci_host_bridges); } -static int pci_get_new_domain_nr(void) +int pci_get_new_domain_nr(void) { + if ( use_dt_domains ) + return -1; + return atomic_inc_return(&domain_nr); } static int pci_bus_find_domain_nr(struct dt_device_node *dev) { - static int use_dt_domains = -1; int domain; domain = dt_get_pci_domain_nr(dev); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 17:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 17:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247502.426770 (Exim 4.92) (envelope-from ) id 1mxYK8-00087i-3Q; Wed, 15 Dec 2021 17:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247502.426770; Wed, 15 Dec 2021 17:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYK8-00087a-0R; Wed, 15 Dec 2021 17:44:16 +0000 Received: by outflank-mailman (input) for mailman id 247502; Wed, 15 Dec 2021 17:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYK6-00087H-HZ for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYK6-0000jh-Gb for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxYK6-0000gS-FL for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=AsBbaB2YtVUluCLiLKrO/tG+tQ9HGaj980IxuKxAO8g=; b=R02I4A/WpBv3Wwc/QxWb7TDx6n Ykvlr7Va7ry90CR36TvUTbrLZXHEMpYeGlBbIXNwdBpZS2orRdL1OZv+0SyeFbomywqqxy09oaiPV TvhM2sYcZoKswtzh3MxsOfbBgrVVwrKtBtYaJvppIWNlD8b+eXpqqCevpEvOEDfJkGiM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: setup MMIO range trap handlers for hardware domain Message-Id: Date: Wed, 15 Dec 2021 17:44:14 +0000 commit cd54f8095e8779b2c276e4a9b2fa1715426d7b35 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:16 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:38:47 2021 +0000 xen/arm: setup MMIO range trap handlers for hardware domain In order for vPCI to work it needs to maintain guest and hardware domain's views of the configuration space. For example, BARs and COMMAND registers require emulation for guests and the guest view of the registers needs to be in sync with the real contents of the relevant registers. For that ECAM address space needs to also be trapped for the hardware domain, so we need to implement PCI host bridge specific callbacks to properly setup MMIO handlers for those ranges depending on particular host bridge implementation. Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Rahul Singh Tested-by: Rahul Singh [julieng: Add ASSERT_UNREACHABLE()] Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 + xen/arch/arm/include/asm/pci.h | 4 ++ xen/arch/arm/pci/pci-host-common.c | 19 +++++++++ xen/arch/arm/vpci.c | 87 +++++++++++++++++++++++++++++++++----- xen/arch/arm/vpci.h | 6 +++ 5 files changed, 108 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 96e1b23550..92a6c509e5 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -739,6 +739,8 @@ int arch_domain_create(struct domain *d, if ( (rc = domain_vgic_register(d, &count)) != 0 ) goto fail; + count += domain_vpci_get_num_mmio_handlers(d); + if ( (rc = domain_io_init(d, count + MAX_IO_HANDLER)) != 0 ) goto fail; diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index c313423cdc..94f003a07c 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -111,6 +111,10 @@ void arch_pci_init_pdev(struct pci_dev *pdev); int pci_get_new_domain_nr(void); +int pci_host_iterate_bridges_and_count(struct domain *d, + int (*cb)(struct domain *d, + struct pci_host_bridge *bridge)); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 40e779b5d8..84aab371cd 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -294,6 +294,25 @@ int pci_get_host_bridge_segment(const struct dt_device_node *node, return -EINVAL; } +int pci_host_iterate_bridges_and_count(struct domain *d, + int (*cb)(struct domain *d, + struct pci_host_bridge *bridge)) +{ + struct pci_host_bridge *bridge; + int count = 0; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + int ret; + + ret = cb(d, bridge); + if ( ret < 0 ) + return ret; + count += ret; + } + return count; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 23f45386f4..ebc4c8398b 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -16,16 +16,31 @@ #include +static pci_sbdf_t vpci_sbdf_from_gpa(const struct pci_host_bridge *bridge, + paddr_t gpa) +{ + pci_sbdf_t sbdf; + + if ( bridge ) + { + sbdf.sbdf = VPCI_ECAM_BDF(gpa - bridge->cfg->phys_addr); + sbdf.seg = bridge->segment; + sbdf.bus += bridge->cfg->busn_start; + } + else + sbdf.sbdf = VPCI_ECAM_BDF(gpa - GUEST_VPCI_ECAM_BASE); + + return sbdf; +} + static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, register_t *r, void *p) { - pci_sbdf_t sbdf; + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; - /* We ignore segment part and always handle segment 0 */ - sbdf.sbdf = VPCI_ECAM_BDF(info->gpa - GUEST_VPCI_ECAM_BASE); - if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { @@ -41,10 +56,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, register_t r, void *p) { - pci_sbdf_t sbdf; - - /* We ignore segment part and always handle segment 0 */ - sbdf.sbdf = VPCI_ECAM_BDF(info->gpa - GUEST_VPCI_ECAM_BASE); + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, r); @@ -55,13 +68,67 @@ static const struct mmio_handler_ops vpci_mmio_handler = { .write = vpci_mmio_write, }; +static int vpci_setup_mmio_handler_cb(struct domain *d, + struct pci_host_bridge *bridge) +{ + struct pci_config_window *cfg = bridge->cfg; + + register_mmio_handler(d, &vpci_mmio_handler, + cfg->phys_addr, cfg->size, bridge); + + /* We have registered a single MMIO handler. */ + return 1; +} + int domain_vpci_init(struct domain *d) { if ( !has_vpci(d) ) return 0; - register_mmio_handler(d, &vpci_mmio_handler, - GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL); + /* + * The hardware domain gets as many MMIOs as required by the + * physical host bridge. + * Guests get the virtual platform layout: one virtual host bridge for now. + */ + if ( is_hardware_domain(d) ) + { + int ret; + + ret = pci_host_iterate_bridges_and_count(d, vpci_setup_mmio_handler_cb); + if ( ret < 0 ) + return ret; + } + else + register_mmio_handler(d, &vpci_mmio_handler, + GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL); + + return 0; +} + +static int vpci_get_num_handlers_cb(struct domain *d, + struct pci_host_bridge *bridge) +{ + /* Each bridge has a single MMIO handler for the configuration space. */ + return 1; +} + +unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) +{ + if ( !has_vpci(d) ) + return 0; + + if ( is_hardware_domain(d) ) + { + int ret = pci_host_iterate_bridges_and_count(d, vpci_get_num_handlers_cb); + + if ( ret < 0 ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + return ret; + } return 0; } diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h index d8a7b0e3e8..3c713f3fcd 100644 --- a/xen/arch/arm/vpci.h +++ b/xen/arch/arm/vpci.h @@ -17,11 +17,17 @@ #ifdef CONFIG_HAS_VPCI int domain_vpci_init(struct domain *d); +unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d); #else static inline int domain_vpci_init(struct domain *d) { return 0; } + +static inline unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) +{ + return 0; +} #endif #endif /* __ARCH_ARM_VPCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 17:44:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 17:44:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247503.426774 (Exim 4.92) (envelope-from ) id 1mxYKI-0008BO-65; Wed, 15 Dec 2021 17:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247503.426774; Wed, 15 Dec 2021 17:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYKI-0008BG-3G; Wed, 15 Dec 2021 17:44:26 +0000 Received: by outflank-mailman (input) for mailman id 247503; Wed, 15 Dec 2021 17:44:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYKG-0008At-Kg for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYKG-0000k7-Js for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxYKG-0000h1-Ip for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MYYaxNSU6TaAU9L39LCsNvD4wdX43ObMgDi6UmxKUwM=; b=IOkupPEXwS6W5s9TfyYlH07l4O LjH/zSi4lpZ17ehvdoMwpxEWdkTYzfcs26Gdpp6eAx7QkyW3HyAREofjswiEmcJIgmch7FiTjOjd+ AevfcrxwmN+4+giZA9ZvPGIBGwBrFmv+8LTEGx5+PWuP9Jvt0DTsW0efgelMh9W5pPU4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: account IO handler for emulated PCI host bridge Message-Id: Date: Wed, 15 Dec 2021 17:44:24 +0000 commit b88109676376217e11d158de8325eb2234327760 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:17 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:39:56 2021 +0000 xen/arm: account IO handler for emulated PCI host bridge At the moment, we always allocate an extra 16 slots for IO handlers (see MAX_IO_HANDLER). So while adding an IO trap handler for the emulated PCI host bridge we are not breaking anything, but we have a latent bug as the maximum number of IOs may be exceeded. Fix this by explicitly telling that we have an additional IO handler, so it is accounted. Fixes: d59168dc05a5 ("xen/arm: Enable the existing x86 virtual PCI support for ARM") Signed-off-by: Oleksandr Andrushchenko Acked-by: Julien Grall Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/vpci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index ebc4c8398b..a9fc5817f9 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -130,7 +130,11 @@ unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) return ret; } - return 0; + /* + * For guests each host bridge requires one region to cover the + * configuration space. At the moment, we only expose a single host bridge. + */ + return 1; } /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Dec 15 17:44:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 15 Dec 2021 17:44:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.247504.426777 (Exim 4.92) (envelope-from ) id 1mxYKS-0008EG-7g; Wed, 15 Dec 2021 17:44:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 247504.426777; Wed, 15 Dec 2021 17:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYKS-0008E8-4q; Wed, 15 Dec 2021 17:44:36 +0000 Received: by outflank-mailman (input) for mailman id 247504; Wed, 15 Dec 2021 17:44:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYKQ-0008Dt-ON for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxYKQ-0000kJ-NP for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxYKQ-0000hy-MV for xen-changelog@lists.xenproject.org; Wed, 15 Dec 2021 17:44:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ceoyVbTjbjXOjZoRyQMQ82dnYie1ILyACqzFVAN8BLY=; b=qp4pWdALtH1IcHXiAABr6gKXbB 2j+xdmcpcIQw/wP8vvLq9Ta00Ko1ZTxOOcpRVic2eh6UnTBVkCbiSwZcqD8dPuLIna2x/NKz6/Kg0 18SEFc/irFGCMDsOuJn1BDmz0BMOwARpzMhPAti2iKlfZXnoXDyjsPgqUXZQjtqcVPls=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: do not map PCI ECAM and MMIO space to Domain-0's p2m Message-Id: Date: Wed, 15 Dec 2021 17:44:34 +0000 commit dc27c174b2fc1ba0697ed96dc96066c272e09c24 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:18 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:39:56 2021 +0000 xen/arm: do not map PCI ECAM and MMIO space to Domain-0's p2m PCI host bridges are special devices in terms of implementing PCI passthrough. According to [1] the current implementation depends on Domain-0 to perform the initialization of the relevant PCI host bridge hardware and perform PCI device enumeration. In order to achieve that one of the required changes is to not map all the memory ranges in map_range_to_domain as we traverse the device tree on startup and perform some additional checks if the range needs to be mapped to Domain-0. The generic PCI host controller device tree binding says [2]: - ranges: As described in IEEE Std 1275-1994, but must provide at least a definition of non-prefetchable memory. One or both of prefetchable Memory and IO Space may also be provided. - reg : The Configuration Space base address and size, as accessed from the parent bus. The base address corresponds to the first bus in the "bus-range" property. If no "bus-range" is specified, this will be bus 0 (the default). From the above none of the memory ranges from the "ranges" property needs to be mapped to Domain-0 at startup as MMIO mapping is going to be handled dynamically by vPCI as we assign PCI devices, e.g. each device assigned to Domain-0/guest will have its MMIOs mapped/unmapped as needed by Xen. The "reg" property covers not only ECAM space, but may also have other then the configuration memory ranges described, for example [3]: - reg: Should contain rc_dbi, config registers location and length. - reg-names: Must include the following entries: "rc_dbi": controller configuration registers; "config": PCIe configuration space registers. This patch makes it possible to not map all the ranges from the "ranges" property and also ECAM from the "reg". All the rest from the "reg" property still needs to be mapped to Domain-0, so the PCI host bridge remains functional in Domain-0. This is done by first skipping the mappings while traversing the device tree as it is done for usual devices and then by calling a dedicated pci_host_bridge_mappings function which only maps MMIOs required by the host bridges leaving the regions, needed for vPCI traps, unmapped. [1] https://lists.xenproject.org/archives/html/xen-devel/2020-07/msg00777.html [2] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt [3] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/domain_build.c | 66 ++++++++++++++++++++++---------------- xen/arch/arm/include/asm/pci.h | 10 ++++++ xen/arch/arm/include/asm/setup.h | 13 ++++++++ xen/arch/arm/pci/ecam.c | 14 ++++++++ xen/arch/arm/pci/pci-host-common.c | 50 +++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-zynqmp.c | 1 + 6 files changed, 126 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 6c5d22d9be..6931c022a2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -51,12 +51,6 @@ static int __init parse_dom0_mem(const char *s) } custom_param("dom0_mem", parse_dom0_mem); -struct map_range_data -{ - struct domain *d; - p2m_type_t p2mt; -}; - /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) @@ -1720,10 +1714,10 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev, const struct dt_irq *dt_irq, void *data) { - struct domain *d = data; + struct map_range_data *mr_data = data; + struct domain *d = mr_data->d; unsigned int irq = dt_irq->irq; int res; - bool need_mapping = !dt_device_for_passthrough(dev); if ( irq < NR_LOCAL_IRQS ) { @@ -1742,18 +1736,16 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev, return res; } - res = map_irq_to_domain(d, irq, need_mapping, dt_node_name(dev)); + res = map_irq_to_domain(d, irq, !mr_data->skip_mapping, dt_node_name(dev)); return 0; } -static int __init map_range_to_domain(const struct dt_device_node *dev, - u64 addr, u64 len, - void *data) +int __init map_range_to_domain(const struct dt_device_node *dev, + u64 addr, u64 len, void *data) { struct map_range_data *mr_data = data; struct domain *d = mr_data->d; - bool need_mapping = !dt_device_for_passthrough(dev); int res; /* @@ -1776,7 +1768,7 @@ static int __init map_range_to_domain(const struct dt_device_node *dev, } } - if ( need_mapping ) + if ( !mr_data->skip_mapping ) { res = map_regions_p2mt(d, gaddr_to_gfn(addr), @@ -1805,23 +1797,21 @@ static int __init map_range_to_domain(const struct dt_device_node *dev, * then we may need to perform additional mappings in order to make * the child resources available to domain 0. */ -static int __init map_device_children(struct domain *d, - const struct dt_device_node *dev, - p2m_type_t p2mt) +static int __init map_device_children(const struct dt_device_node *dev, + struct map_range_data *mr_data) { - struct map_range_data mr_data = { .d = d, .p2mt = p2mt }; - int ret; - if ( dt_device_type_is_equal(dev, "pci") ) { + int ret; + dt_dprintk("Mapping children of %s to guest\n", dt_node_full_name(dev)); - ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, d); + ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, mr_data); if ( ret < 0 ) return ret; - ret = dt_for_each_range(dev, &map_range_to_domain, &mr_data); + ret = dt_for_each_range(dev, &map_range_to_domain, mr_data); if ( ret < 0 ) return ret; } @@ -1901,14 +1891,28 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, unsigned int i; int res; u64 addr, size; - bool need_mapping = !dt_device_for_passthrough(dev); + bool own_device = !dt_device_for_passthrough(dev); + /* + * We want to avoid mapping the MMIO in dom0 for the following cases: + * - The device is owned by dom0 (i.e. it has been flagged for + * passthrough). + * - PCI host bridges with driver in Xen. They will later be mapped by + * pci_host_bridge_mappings(). + */ + struct map_range_data mr_data = { + .d = d, + .p2mt = p2mt, + .skip_mapping = !own_device || + (is_pci_passthrough_enabled() && + (device_get_class(dev) == DEVICE_PCI_HOSTBRIDGE)) + }; naddr = dt_number_of_address(dev); dt_dprintk("%s passthrough = %d naddr = %u\n", - dt_node_full_name(dev), need_mapping, naddr); + dt_node_full_name(dev), own_device, naddr); - if ( need_mapping ) + if ( own_device ) { dt_dprintk("Check if %s is behind the IOMMU and add it\n", dt_node_full_name(dev)); @@ -1934,14 +1938,13 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, } } - res = handle_device_interrupts(d, dev, need_mapping); + res = handle_device_interrupts(d, dev, own_device); if ( res < 0 ) return res; /* Give permission and map MMIOs */ for ( i = 0; i < naddr; i++ ) { - struct map_range_data mr_data = { .d = d, .p2mt = p2mt }; res = dt_device_get_address(dev, i, &addr, &size); if ( res ) { @@ -1955,7 +1958,7 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, return res; } - res = map_device_children(d, dev, p2mt); + res = map_device_children(dev, &mr_data); if ( res ) return res; @@ -3114,7 +3117,14 @@ static int __init construct_dom0(struct domain *d) return rc; if ( acpi_disabled ) + { rc = prepare_dtb_hwdom(d, &kinfo); + if ( rc < 0 ) + return rc; +#ifdef CONFIG_HAS_PCI + rc = pci_host_bridge_mappings(d); +#endif + } else rc = prepare_acpi(d, &kinfo); diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 94f003a07c..7c7449d64f 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -17,6 +17,8 @@ #ifdef CONFIG_HAS_PCI +#include + #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) extern bool pci_passthrough_enabled; @@ -73,6 +75,9 @@ struct pci_ops { uint32_t reg, uint32_t len, uint32_t *value); int (*write)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value); + bool (*need_p2m_hwdom_mapping)(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr); }; /* @@ -97,6 +102,9 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value); void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); +bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); struct dt_device_node *pci_find_host_bridge_node(struct device *dev); int pci_get_host_bridge_segment(const struct dt_device_node *node, @@ -115,6 +123,8 @@ int pci_host_iterate_bridges_and_count(struct domain *d, int (*cb)(struct domain *d, struct pci_host_bridge *bridge)); +int pci_host_bridge_mappings(struct domain *d); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 95da0b7ab9..88d9673db8 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -2,6 +2,8 @@ #define __ARM_SETUP_H_ #include +#include +#include #define MIN_FDT_ALIGN 8 #define MAX_FDT_SIZE SZ_2M @@ -77,6 +79,14 @@ struct bootinfo { #endif }; +struct map_range_data +{ + struct domain *d; + p2m_type_t p2mt; + /* Set if mapping of the memory ranges must be skipped. */ + bool skip_mapping; +}; + extern struct bootinfo bootinfo; extern domid_t max_init_domid; @@ -124,6 +134,9 @@ void device_tree_get_reg(const __be32 **cell, u32 address_cells, u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, u32 dflt); +int map_range_to_domain(const struct dt_device_node *dev, + u64 addr, u64 len, void *data); + #endif /* * Local variables: diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c index 2855dea213..6aeea12a68 100644 --- a/xen/arch/arm/pci/ecam.c +++ b/xen/arch/arm/pci/ecam.c @@ -40,6 +40,19 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, return base + (PCI_DEVFN2(sbdf.bdf) << devfn_shift) + where; } +bool __init pci_ecam_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr) +{ + struct pci_config_window *cfg = bridge->cfg; + + /* + * We do not want ECAM address space to be mapped in Domain-0's p2m, + * so we can trap access to it. + */ + return cfg->phys_addr != addr; +} + /* ECAM ops */ const struct pci_ecam_ops pci_generic_ecam_ops = { .bus_shift = 20, @@ -47,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = { .map_bus = pci_ecam_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, } }; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 84aab371cd..fd8c0f837a 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -22,6 +22,8 @@ #include #include +#include + /* * List for all the pci host bridges. */ @@ -313,6 +315,54 @@ int pci_host_iterate_bridges_and_count(struct domain *d, return count; } +/* + * For each PCI host bridge we need to only map those ranges + * which are used by Domain-0 to properly initialize the bridge, + * e.g. we do not want to map ECAM configuration space which lives in + * "reg" device tree property, but we want to map other regions of + * the host bridge. The PCI aperture defined by the "ranges" device + * tree property should also be skipped. + */ +int __init pci_host_bridge_mappings(struct domain *d) +{ + struct pci_host_bridge *bridge; + struct map_range_data mr_data = { + .d = d, + .p2mt = p2m_mmio_direct_dev, + .skip_mapping = false + }; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + const struct dt_device_node *dev = bridge->dt_node; + unsigned int i; + + for ( i = 0; i < dt_number_of_address(dev); i++ ) + { + uint64_t addr, size; + int err; + + err = dt_device_get_address(dev, i, &addr, &size); + if ( err ) + { + printk(XENLOG_ERR + "Unable to retrieve address range index=%u for %s\n", + i, dt_node_full_name(dev)); + return err; + } + + if ( bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr) ) + { + err = map_range_to_domain(dev, addr, size, &mr_data); + if ( err ) + return err; + } + } + } + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 516982bca8..101edb8593 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -34,6 +34,7 @@ const struct pci_ecam_ops nwl_pcie_ops = { .map_bus = pci_ecam_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, } }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:55:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248296.428231 (Exim 4.92) (envelope-from ) id 1mxyiR-0005b3-Pq; Thu, 16 Dec 2021 21:55:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248296.428231; Thu, 16 Dec 2021 21:55:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiR-0005aw-My; Thu, 16 Dec 2021 21:55:07 +0000 Received: by outflank-mailman (input) for mailman id 248296; Thu, 16 Dec 2021 21:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiP-0005al-Lc for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiP-0000ip-ID for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyiP-0006Bw-HE for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eWf99fDjNu64YRRYsdeVYhe2eDobsGZ7FU395skz/iU=; b=iaKh3k18BmciIWClqZ0zJHZb7K daeuf5nPWuqFJl4KkXmUWiykGS1cIe+sZ61NJUIs8pSNXMcXloFFBU9T66d7WUIAmT/zQXAE8/wi0 KInLJQ3c31DnHC2RztT5AReMgvVioHPE5r+cCJhDFRgUroxvznqHUo4iEcVX5WI41v9Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen: make some per-scheduler performance counters sched global ones Message-Id: Date: Thu, 16 Dec 2021 21:55:05 +0000 commit c5f39993e42d0d26fbfdcfde4e95651a23748ee0 Author: Juergen Gross AuthorDate: Thu Dec 16 06:45:02 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:09 2021 +0000 xen: make some per-scheduler performance counters sched global ones Some performance counters listed to be credit or credit2 specific are being used by the null scheduler, too. Make those sched global ones. Fixes: ab6ba8c6753fa76 ("perfc: conditionalize credit/credit2 counters") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Tested-by: Stefano Stabellini --- xen/include/xen/perfc_defn.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 672b51c456..0027d95a60 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -34,6 +34,9 @@ PERFCOUNTER(tickled_idle_cpu, "sched: tickled_idle_cpu") PERFCOUNTER(tickled_idle_cpu_excl, "sched: tickled_idle_cpu_exclusive") PERFCOUNTER(tickled_busy_cpu, "sched: tickled_busy_cpu") PERFCOUNTER(unit_check, "sched: unit_check") +PERFCOUNTER(migrate_running, "sched: migrate_running") +PERFCOUNTER(migrate_on_runq, "sched: migrate_on_runq") +PERFCOUNTER(migrated, "sched: migrated") /* credit specific counters */ #ifdef CONFIG_SCHED_CREDIT @@ -55,7 +58,6 @@ PERFCOUNTER(steal_trylock, "csched: steal_trylock") PERFCOUNTER(steal_trylock_failed, "csched: steal_trylock_failed") PERFCOUNTER(steal_peer_idle, "csched: steal_peer_idle") PERFCOUNTER(migrate_queued, "csched: migrate_queued") -PERFCOUNTER(migrate_running, "csched: migrate_running") PERFCOUNTER(migrate_kicked_away, "csched: migrate_kicked_away") PERFCOUNTER(unit_hot, "csched: unit_hot") #endif @@ -67,13 +69,11 @@ PERFCOUNTER(acct_load_balance, "csched2: acct_load_balance") PERFCOUNTER(upd_max_weight_quick, "csched2: update_max_weight_quick") PERFCOUNTER(upd_max_weight_full, "csched2: update_max_weight_full") PERFCOUNTER(migrate_requested, "csched2: migrate_requested") -PERFCOUNTER(migrate_on_runq, "csched2: migrate_on_runq") PERFCOUNTER(migrate_no_runq, "csched2: migrate_no_runq") PERFCOUNTER(runtime_min_timer, "csched2: runtime_min_timer") PERFCOUNTER(runtime_max_timer, "csched2: runtime_max_timer") PERFCOUNTER(pick_resource, "csched2: pick_resource") PERFCOUNTER(need_fallback_cpu, "csched2: need_fallback_cpu") -PERFCOUNTER(migrated, "csched2: migrated") PERFCOUNTER(migrate_resisted, "csched2: migrate_resisted") PERFCOUNTER(credit_reset, "csched2: credit_reset") PERFCOUNTER(deferred_to_tickled_cpu,"csched2: deferred_to_tickled_cpu") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:55:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:55:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248297.428236 (Exim 4.92) (envelope-from ) id 1mxyib-0005d8-RX; Thu, 16 Dec 2021 21:55:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248297.428236; Thu, 16 Dec 2021 21:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyib-0005d0-Oe; Thu, 16 Dec 2021 21:55:17 +0000 Received: by outflank-mailman (input) for mailman id 248297; Thu, 16 Dec 2021 21:55:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiZ-0005cn-W2 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiZ-0000iw-VM for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyiZ-0006CT-Kl for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7BtTu/yku0Iq63+L+eLCXWZlxQ2XtncccLh+rvPefEc=; b=GranZOehfBKE0yhPcaMQCSFcC7 zWZAA4KHwGPNwqueB61K1HaEZVsrnq1PlEmBOsx6SdWnYe7SbmOsF7irbzTUsahIvfovXhGXNNpJx 6QTzp7qIZhZTz07fpPpRd8lD/L3M5dR5H4ug6GhN22MIZNKzWBT7PLyfYZowzFyh/1qs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/build: Fix `make cscope` rune Message-Id: Date: Thu, 16 Dec 2021 21:55:15 +0000 commit fa3cc3ff3b7685dd6b930d1901d8de7be9527794 Author: Andrew Cooper AuthorDate: Thu Dec 16 02:38:57 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 xen/build: Fix `make cscope` rune There are two problems, both in the all_sources definition. First, everything in arch/*/include gets double hits with cscope queries, because they end up getting listed twice in cscope.files. Drop the first `find` rune of the three, because it's redundant with the third rune following c/s 725381a5eab3 ("xen: move include/asm-* to arch/*/include/asm"). Second, and this way for a long time: $ make cscope ( find arch/x86/include -name '*.h' -print; find include -name '*.h' -print; find xsm arch/x86 common drivers lib test -name '*.[chS]' -print ) > cscope.files cscope -k -b -q cscope: cannot find file arch/x86/efi/efi.h cscope: cannot find file arch/x86/efi/ebmalloc.c cscope: cannot find file arch/x86/efi/compat.c cscope: cannot find file arch/x86/efi/pe.c cscope: cannot find file arch/x86/efi/boot.c cscope: cannot find file arch/x86/efi/runtime.c This is caused by these being symlinks to common/efi. Restrict all find runes to `-type f` to skip symlinks, because common/efi/*.c are already listed. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Volodymyr Babchuk --- xen/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 2ad7da7ad6..dc6bdc44c7 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -468,9 +468,8 @@ arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers lib test define all_sources - ( find arch/$(TARGET_ARCH)/include -name '*.h' -print; \ - find include -name '*.h' -print; \ - find $(SUBDIRS) -name '*.[chS]' -print ) + ( find include -type f -name '*.h' -print; \ + find $(SUBDIRS) -type f -name '*.[chS]' -print ) endef define set_exuberant_flags -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:55:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:55:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248298.428239 (Exim 4.92) (envelope-from ) id 1mxyil-0005g2-Ss; Thu, 16 Dec 2021 21:55:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248298.428239; Thu, 16 Dec 2021 21:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyil-0005fu-Q3; Thu, 16 Dec 2021 21:55:27 +0000 Received: by outflank-mailman (input) for mailman id 248298; Thu, 16 Dec 2021 21:55:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyik-0005fc-3Y for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyik-0000jC-2p for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyik-0006DS-1f for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dyO9G8vvmowONgyeok1RqDXaZbhWqd6SbzyjxudnPBI=; b=cPV9Qddpmk1+nrg/RnT7HY/Yx8 82puNcbrKzNUKPU4dSg4nswn1UrxyE+TdV6b995mTqN1eAmmcpp4I12XDUpWkxJpFZkIglYuTPyBV LjcsFrN8TTknDJDJzlRl896azKgg3glJS8DlIQScZJbCfrvoDc5UDngxU+UUDoElnqpA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libxl: Don't read STORE/CONSOLE_PFN from Xen Message-Id: Date: Thu, 16 Dec 2021 21:55:26 +0000 commit 989289e23f9c2700b73be8386115ffc98bfec906 Author: Andrew Cooper AuthorDate: Thu Dec 9 16:59:06 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/libxl: Don't read STORE/CONSOLE_PFN from Xen The values are already available in dom->{console,xenstore}_pfn, just like on the PV side of things. No need to ask Xen. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_dom.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index c9c24666cd..03841243ab 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -722,13 +722,10 @@ out: } static int hvm_build_set_params(xc_interface *handle, uint32_t domid, - libxl_domain_build_info *info, - unsigned long *store_mfn, - unsigned long *console_mfn) + libxl_domain_build_info *info) { struct hvm_info_table *va_hvm; uint8_t *va_map, sum; - uint64_t str_mfn, cons_mfn; int i; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { @@ -749,12 +746,6 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, munmap(va_map, XC_PAGE_SIZE); } - xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); - xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); - - *store_mfn = str_mfn; - *console_mfn = cons_mfn; - return 0; } @@ -1168,12 +1159,14 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (rc != 0) goto out; - rc = hvm_build_set_params(ctx->xch, domid, info, &state->store_mfn, - &state->console_mfn); + rc = hvm_build_set_params(ctx->xch, domid, info); if (rc != 0) { LOG(ERROR, "hvm build set params failed"); goto out; } + + state->console_mfn = dom->console_pfn; + state->store_mfn = dom->xenstore_pfn; state->vuart_gfn = dom->vuart_gfn; rc = hvm_build_set_xs_values(gc, domid, dom, info); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:55:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:55:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248299.428243 (Exim 4.92) (envelope-from ) id 1mxyiv-0005iz-UD; Thu, 16 Dec 2021 21:55:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248299.428243; Thu, 16 Dec 2021 21:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiv-0005it-RS; Thu, 16 Dec 2021 21:55:37 +0000 Received: by outflank-mailman (input) for mailman id 248299; Thu, 16 Dec 2021 21:55:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiu-0005ij-6o for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyiu-0000jS-64 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyiu-0006E5-58 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3KUl8VDWrgm9FnsKkpuBqSGrzRXZ3RTklrDdMJhxrek=; b=vcHe1UF1yIf334vTtZjPTcdyk/ ypoOKCDLumnX0Uh7Feo/dnn7sc8FLuQ8SqjGG1/YiLDyyPpJmFrNF0RetU0AEWap40t9SYd2KRZom 4riDGYMZU+szzjXhZGRplF3aqXFb0A7IUYBDnMW8WDmBvyiV6LLU/sYPHiT7Y+4rp16Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libs: Don't recursively expand MAJOR ?= $(shell ...) Message-Id: Date: Thu, 16 Dec 2021 21:55:36 +0000 commit a4885765eedbddafcc57bce6cbfcd443d0a7eca9 Author: Andrew Cooper AuthorDate: Mon Dec 13 18:49:17 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/libs: Don't recursively expand MAJOR ?= $(shell ...) ?= is a deferred assignment. Switch to an alternative form which lets us use an immediate assignment. Before, version.sh gets run anywhere between 46 and 88 times, with 50 on a `clean`. After, between 6 and 12 times. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- tools/libs/libs.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index dfbbef4080..b21e0bf083 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -6,7 +6,10 @@ # MINOR: minor version of lib (0 if empty) LIBNAME := $(notdir $(CURDIR)) -MAJOR ?= $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) + +ifeq ($(origin MAJOR), undefined) +MAJOR := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) +endif MINOR ?= 0 SHLIB_LDFLAGS += -Wl,--version-script=libxen$(LIBNAME).map -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:55:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:55:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248300.428248 (Exim 4.92) (envelope-from ) id 1mxyj5-0005lb-Vh; Thu, 16 Dec 2021 21:55:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248300.428248; Thu, 16 Dec 2021 21:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyj5-0005lT-Ss; Thu, 16 Dec 2021 21:55:47 +0000 Received: by outflank-mailman (input) for mailman id 248300; Thu, 16 Dec 2021 21:55:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyj4-0005lH-9n for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyj4-0000jd-9B for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyj4-0006Ee-8A for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dmt/lUd8TGGHeBTmiUVedonGh7BCIhSBMH/ZMfplI0M=; b=H1ZFYZgJZgeXVPSmErncPKMSe3 TKnkLriWSyDfRkbBMexWST+oOBs1StJm3xDGU+lpSNyg6+MfxZQF7gKYlp8GJ2r5BGsG1H0//bTgK FtkmcD04nqbpZayP61WNTkvKq+eMzRgJqZgdL38nT5e/7y8RMwF+jDgJvEry8kS7jooE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/flask/utils: remove unused variables/targets from Makefile Message-Id: Date: Thu, 16 Dec 2021 21:55:46 +0000 commit c1634f0c86095e22228a1e1f6f917bfe1c91001d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:57 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/flask/utils: remove unused variables/targets from Makefile They are no *.opic or *.so in this subdir, so no need to clean them. The TEST* variables doesn't seems to be used anywhere, and they weren't used by xen.git when introduced. Both CLIENTS_* variables aren't used. Both target "print-dir" and "print-end" only exist in this directory and are probably not used anywhere. Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Smith [Drop trailing whitespace and use $(RM) consistently] Signed-off-by: Andrew Cooper --- tools/flask/utils/Makefile | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index ae87102144..db567b13dc 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -4,13 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) -TESTDIR = testsuite/tmp -TESTFLAGS= -DTESTING -TESTENV = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR) - CLIENTS := flask-loadpolicy flask-setenforce flask-getenforce flask-label-pci flask-get-bool flask-set-bool -CLIENTS_SRCS := $(patsubst flask-%,%.c,$(CLIENTS)) -CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) .PHONY: all all: $(CLIENTS) @@ -34,22 +28,12 @@ flask-set-bool: set-bool.o $(CC) $(LDFLAGS) $< $(LDLIBS) $(LDLIBS_libxenctrl) -o $@ .PHONY: clean -clean: - rm -f *.o *.opic *.so - rm -f $(CLIENTS) - $(RM) $(DEPS_RM) +clean: + $(RM) *.o $(CLIENTS) $(DEPS_RM) .PHONY: distclean distclean: clean -.PHONY: print-dir -print-dir: - @echo -n tools/flask/utils: - -.PHONY: print-end -print-end: - @echo - .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:55:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:55:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248301.428253 (Exim 4.92) (envelope-from ) id 1mxyjG-0005om-24; Thu, 16 Dec 2021 21:55:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248301.428253; Thu, 16 Dec 2021 21:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjF-0005oe-UZ; Thu, 16 Dec 2021 21:55:57 +0000 Received: by outflank-mailman (input) for mailman id 248301; Thu, 16 Dec 2021 21:55:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjE-0005oP-DS for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjE-0000k6-Ce for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyjE-0006FB-BK for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:55:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GR+DCZ70E9sgFjNoKEQJsqRsadtck2w/V5GkkhYlO7E=; b=XiV7sCRufri8xt/pB5V1vySHmG 0yHVpf7GE/FpBgsdU56KNN+mifVO2c+KUVEUZ/ob3SpooCF9pEGvaYLVCS5YeYSjK+clfX6jfcx7E BVFnzCbycATNX1G31JDNQLmYlf4Zeb8uIzM6mzqW8SvxRJgatGlg7ATcIzCh/UWfVquw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/libacpi: cleanup Makefile, don't check for iasl binary Message-Id: Date: Thu, 16 Dec 2021 21:55:56 +0000 commit 5a8b28bfd4315d9b5c1d57d60a33c81413ee9c8f Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:58 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/libacpi: cleanup Makefile, don't check for iasl binary iasl is been check for presence by ./configure, so this Makefile doesn't have to do it. Also start to use $(IASL) that ./configure generate. iasl hasn't been download by our build system for a while and the dependency on iasl is in the main xen.git README. Make use of $< in one rule instead of spelling the %.asl file again. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/libacpi/Makefile | 17 ++++------------- tools/libacpi/README | 6 ------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile index 2448687dbb..60860eaa00 100644 --- a/tools/libacpi/Makefile +++ b/tools/libacpi/Makefile @@ -38,11 +38,10 @@ MKDSDT_CFLAGS-$(CONFIG_X86) = -DCONFIG_X86 # complete $(ACPI_BUILD_DIR) as path, even if it has '.' symbols. TMP_SUFFIX = tmp -vpath iasl $(PATH) all: $(C_SRC) $(H_SRC) -$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl - iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< +$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl + $(IASL) -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex) @@ -74,21 +73,13 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT) $(MK_DSDT) --debug=$(debug) >> $@.$(TMP_SUFFIX) mv -f $@.$(TMP_SUFFIX) $@ -$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl - iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl +$(C_SRC): $(ACPI_BUILD_DIR)/%.c: $(ACPI_BUILD_DIR)/%.asl + $(IASL) -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX) echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX) mv -f $@.$(TMP_SUFFIX) $@ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex) -iasl: - @echo - @echo "ACPI ASL compiler (iasl) is needed" - @echo "Download and install Intel ACPI CA from" - @echo "http://acpica.org/downloads/" - @echo - @exit 1 - clean: rm -f $(C_SRC) $(H_SRC) $(MK_DSDT) $(C_SRC:=.$(TMP_SUFFIX)) rm -f $(patsubst %.c,%.hex,$(C_SRC)) $(patsubst %.c,%.aml,$(C_SRC)) $(patsubst %.c,%.asl,$(C_SRC)) diff --git a/tools/libacpi/README b/tools/libacpi/README index 2b9d6e188c..4ab5ed2de7 100644 --- a/tools/libacpi/README +++ b/tools/libacpi/README @@ -24,9 +24,3 @@ In case that the acpi_dsdt.asl need to be updated, please Follow the instruction: # make acpi_dsdt.c - -Note: -DSDT compiler "iasl" is needed. By default, it will be downloaded -using wget in Makefile. if it failed, please download manually from -http://developer.intel.com/technology/iapc/acpi/downloads.htm. -then compile and install iasl -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:56:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:56:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248302.428257 (Exim 4.92) (envelope-from ) id 1mxyjQ-0005ra-4E; Thu, 16 Dec 2021 21:56:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248302.428257; Thu, 16 Dec 2021 21:56:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjP-0005rS-WD; Thu, 16 Dec 2021 21:56:08 +0000 Received: by outflank-mailman (input) for mailman id 248302; Thu, 16 Dec 2021 21:56:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjO-0005r5-Gv for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjO-0000kV-GA for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyjO-0006I9-Ev for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XscQpOkArK8pPE3hbF0otGROHYSmef2Kk62vi8K3J8I=; b=ucppKCMJdIKRZ2WZAFqyWNDYZ2 Sg180bgPjXD2IPJND4OgALnxA913XT5qI8K4k4QZzvXTcEcSXaIW2sbtLuhk0hKcmq16TvE8mlQLE E8A6Em88XM8klhRcWRPnasd6IpoJ3skAdpHsW8iAV4ephhzIeV0BHyYGTuYJKuknBjFM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/ocaml: Remove generation of _paths.h Message-Id: Date: Thu, 16 Dec 2021 21:56:06 +0000 commit ba9e57ef6dc8ea6da1719b4b5c321c2fb794a706 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:59 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/ocaml: Remove generation of _paths.h _paths.h isn't useful anymore in systemd_stubs. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig --- .gitignore | 1 - tools/ocaml/xenstored/Makefile | 7 ------- tools/ocaml/xenstored/systemd_stubs.c | 2 -- 3 files changed, 10 deletions(-) diff --git a/.gitignore b/.gitignore index e13cbf84b2..958c60bb5f 100644 --- a/.gitignore +++ b/.gitignore @@ -408,7 +408,6 @@ tools/ocaml/libs/xentoollog/xentoollog.ml tools/ocaml/libs/xentoollog/xentoollog.mli tools/ocaml/libs/xs/paths.ml tools/ocaml/libs/xc/xenctrl_abi_check.h -tools/ocaml/xenstored/_paths.h tools/ocaml/xenstored/oxenstored tools/ocaml/xenstored/oxenstored.conf tools/ocaml/xenstored/paths.ml diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 89ec3ec76a..0b5711b507 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -30,8 +30,6 @@ systemd_OBJS = systemd systemd_C_OBJS = systemd_stubs OCAML_LIBRARY += systemd -$(foreach obj,$(systemd_C_OBJS),$(obj).o): _paths.h - LIBS_systemd += $(LDFLAGS-y) OBJS = paths \ @@ -100,8 +98,3 @@ genpath-target = $(call buildmakevars2module,paths.ml) $(eval $(genpath-target)) GENERATED_FILES += paths.ml - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -GENERATE_FILES += _paths.h diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index 31a1a5d384..f4c875075a 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -27,8 +27,6 @@ #include -#include "_paths.h" - CAMLprim value ocaml_sd_notify_ready(value ignore) { CAMLparam1(ignore); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:56:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:56:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248303.428260 (Exim 4.92) (envelope-from ) id 1mxyjZ-0005uk-6M; Thu, 16 Dec 2021 21:56:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248303.428260; Thu, 16 Dec 2021 21:56:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjZ-0005ub-3B; Thu, 16 Dec 2021 21:56:17 +0000 Received: by outflank-mailman (input) for mailman id 248303; Thu, 16 Dec 2021 21:56:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjY-0005uS-KA for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjY-0000kf-JQ for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyjY-0006Iv-IK for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TZhdmLoC6pVDaxR1jnRgapUL97B8jGJMMGF6ZGrc7Ow=; b=1s1KyLh3Z03iZZxkj52itmMKLX LuoFpc+VxsqTM7cPFjmk4QTRAOLqqvw3OTT/owPIjjs/8jWqmNmOUlM6Den4XUdpENIw0xM0cLIiE My23hFe+IKIn+GMcpFngWi6/CyrXJaXXWOMhPLPdGVUFVNEho5GpPB7/LoNnwh/1bO6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xl: Remove unnecessary -I. from CFLAGS Message-Id: Date: Thu, 16 Dec 2021 21:56:16 +0000 commit e7fe314870442fb85f8ecfc0e0bc605dddcd75b1 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:00 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/xl: Remove unnecessary -I. from CFLAGS GCC will search the directory where the source file is for quote-includes. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/xl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 656b21c7da..2e129f00e1 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -7,7 +7,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. -fPIC +CFLAGS += -fPIC CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:56:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:56:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248305.428264 (Exim 4.92) (envelope-from ) id 1mxyjj-0005xc-7v; Thu, 16 Dec 2021 21:56:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248305.428264; Thu, 16 Dec 2021 21:56:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjj-0005xU-4q; Thu, 16 Dec 2021 21:56:27 +0000 Received: by outflank-mailman (input) for mailman id 248305; Thu, 16 Dec 2021 21:56:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyji-0005xM-Oe for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyji-0000kq-Nm for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyji-0006JZ-Mw for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YIPUsqDWZXIez2BnT0/rM75XRqybvL6ueye0tavTlkY=; b=2d14pZQFSkrZtStR7erKbH2rDb V648QQFMZmEVxqAO0+1bVRQKQf6pX5mxSHP7GXp6i+4nqCm9AlPTRNiyY94Edg3wAr3KM3WWS+Ef6 VCB88doxb6z2q5CBU8hGSXv+MiZ3u3NjfJN4TGW+VyoaSZCWZQJlQlByez5BoiqOyb0A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools: Use config.h from autoconf instead of "buildmakevars2header" Message-Id: Date: Thu, 16 Dec 2021 21:56:26 +0000 commit 021cd1c4b4dfd23a5feb92fecc8db8a7228c80a5 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:01 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools: Use config.h from autoconf instead of "buildmakevars2header" This avoid the need to generate the _paths.h header when the information is from autoconf anyway. They are no more users of the "buildmakevars2header" macro, so it can be removed from "Config.mk". Also removed the extra "-f" flag where "$(RM)" is used (xl/Makefile). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- .gitignore | 6 ----- Config.mk | 9 -------- configure | 45 ++++++++++++++++++++++++++++++++++++ docs/configure | 45 ++++++++++++++++++++++++++++++++++++ m4/paths.m4 | 9 ++++++++ tools/config.h.in | 27 ++++++++++++++++++++++ tools/configure | 45 ++++++++++++++++++++++++++++++++++++ tools/console/Makefile | 12 ++-------- tools/console/client/main.c | 1 - tools/console/daemon/main.c | 1 - tools/helpers/Makefile | 8 ++----- tools/helpers/init-xenstore-domain.c | 1 - tools/libs/guest/Makefile | 5 ---- tools/libs/guest/xg_dom_core.c | 1 - tools/libs/guest/xg_suspend.c | 1 - tools/libs/libs.mk | 1 - tools/libs/light/Makefile | 8 ++----- tools/libs/light/libxl_dom.c | 2 -- tools/libs/light/libxl_internal.h | 1 - tools/libs/light/libxl_utils.c | 1 - tools/libs/stat/Makefile | 7 +----- tools/libs/stat/xenstat_qmp.c | 1 - tools/xl/Makefile | 7 +----- tools/xl/xl.h | 1 - 24 files changed, 179 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 958c60bb5f..3f9d55ba87 100644 --- a/.gitignore +++ b/.gitignore @@ -123,7 +123,6 @@ tools/libs/foreignmemory/headers.chk tools/libs/foreignmemory/xenforeignmemory.pc tools/libs/devicemodel/headers.chk tools/libs/devicemodel/xendevicemodel.pc -tools/libs/guest/_*.[ch] tools/libs/guest/libxenguest.map tools/libs/guest/xenguest.pc tools/libs/guest/xc_bitops.h @@ -146,7 +145,6 @@ tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* tools/libs/light/xenlight.pc -tools/libs/stat/_paths.h tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map tools/libs/stat/xenstat.pc @@ -163,8 +161,6 @@ tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc tools/console/xenconsole tools/console/xenconsoled -tools/console/client/_paths.h -tools/console/daemon/_paths.h tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 @@ -207,7 +203,6 @@ tools/fuzz/x86_instruction_emulator/afl-harness-cov tools/fuzz/x86_instruction_emulator/wrappers.c tools/fuzz/x86_instruction_emulator/x86_emulate tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] -tools/helpers/_paths.h tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh @@ -421,7 +416,6 @@ tools/firmware/etherboot/ipxe.tar.gz tools/firmware/etherboot/ipxe/ tools/python/xen/lowlevel/xl/_pyxl_types.c tools/python/xen/lowlevel/xl/_pyxl_types.h -tools/xl/_paths.h tools/xl/xl docs/txt/misc/*.txt diff --git a/Config.mk b/Config.mk index 6587c7d626..1c1998a5a8 100644 --- a/Config.mk +++ b/Config.mk @@ -167,15 +167,6 @@ define buildmakevars2file-closure $(call move-if-changed,$(1).tmp,$(1)) endef -buildmakevars2header = $(eval $(call buildmakevars2header-closure,$(1))) -define buildmakevars2header-closure - $(1): .phony - rm -f $(1).tmp; \ - $(foreach var, $(BUILD_MAKE_VARS), \ - echo "#define $(var) \"$($(var))\"" >>$(1).tmp;) \ - $(call move-if-changed,$(1).tmp,$(1)) -endef - CFLAGS += -fno-strict-aliasing CFLAGS += -std=gnu99 diff --git a/configure b/configure index 502273b263..bb7f27ddad 100755 --- a/configure +++ b/configure @@ -1946,6 +1946,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1998,6 +2003,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -2038,6 +2048,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -2045,12 +2060,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -2060,6 +2090,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -2073,12 +2108,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/docs/configure b/docs/configure index f93d086e9a..d4fced9858 100755 --- a/docs/configure +++ b/docs/configure @@ -1849,6 +1849,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1901,6 +1906,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -1941,6 +1951,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -1948,12 +1963,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -1963,6 +1993,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -1976,12 +2011,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/m4/paths.m4 b/m4/paths.m4 index 7be314a3e2..826faada45 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -39,6 +39,7 @@ AC_SUBST(CONFIG_DIR) XEN_CONFIG_DIR=$CONFIG_DIR/xen AC_SUBST(XEN_CONFIG_DIR) +AC_DEFINE_UNQUOTED([XEN_CONFIG_DIR], ["$XEN_CONFIG_DIR"], [Xen's config dir]) AC_ARG_WITH([initddir], AS_HELP_STRING([--with-initddir=DIR], @@ -83,6 +84,7 @@ AC_ARG_WITH([xen-scriptdir], [xen_scriptdir_path=$XEN_CONFIG_DIR/scripts]) XEN_SCRIPT_DIR=$xen_scriptdir_path AC_SUBST(XEN_SCRIPT_DIR) +AC_DEFINE_UNQUOTED([XEN_SCRIPT_DIR], ["$XEN_SCRIPT_DIR"], [Xen's script dir]) AC_ARG_WITH([xen-dumpdir], AS_HELP_STRING([--with-xen-dumpdir=DIR], @@ -117,18 +119,22 @@ AC_SUBST(LIBEXEC) dnl These variables will be substituted in various .in files LIBEXEC_BIN=${LIBEXEC}/bin AC_SUBST(LIBEXEC_BIN) +AC_DEFINE_UNQUOTED([LIBEXEC_BIN], ["$LIBEXEC_BIN"], [Xen's libexec path]) LIBEXEC_LIB=${LIBEXEC}/lib AC_SUBST(LIBEXEC_LIB) LIBEXEC_INC=${LIBEXEC}/include AC_SUBST(LIBEXEC_INC) XENFIRMWAREDIR=${LIBEXEC}/boot AC_SUBST(XENFIRMWAREDIR) +AC_DEFINE_UNQUOTED([XENFIRMWAREDIR], ["$XENFIRMWAREDIR"], [Xen's firmware dir]) XEN_RUN_DIR=$rundir_path/xen AC_SUBST(XEN_RUN_DIR) +AC_DEFINE_UNQUOTED([XEN_RUN_DIR], ["$XEN_RUN_DIR"], [Xen's runstate path]) XEN_LOG_DIR=$localstatedir/log/xen AC_SUBST(XEN_LOG_DIR) +AC_DEFINE_UNQUOTED([XEN_LOG_DIR], ["$XEN_LOG_DIR"], [Xen's log dir]) XEN_LIB_STORED=$localstatedir/lib/xenstored AC_SUBST(XEN_LIB_STORED) @@ -138,6 +144,7 @@ AC_SUBST(XEN_RUN_STORED) XEN_LIB_DIR=$localstatedir/lib/xen AC_SUBST(XEN_LIB_DIR) +AC_DEFINE_UNQUOTED([XEN_LIB_DIR], ["$XEN_LIB_DIR"], [Xen's lib dir]) SHAREDIR=$prefix/share AC_SUBST(SHAREDIR) @@ -151,12 +158,14 @@ case "$host_os" in *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR) +AC_DEFINE_UNQUOTED([XEN_LOCK_DIR], ["$XEN_LOCK_DIR"], [Xen's lock dir]) XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging AC_SUBST(XEN_PAGING_DIR) XEN_DUMP_DIR=$xen_dumpdir_path AC_SUBST(XEN_DUMP_DIR) +AC_DEFINE_UNQUOTED([XEN_DUMP_DIR], ["$XEN_DUMP_DIR"], [Xen's dump directory]) DEBUG_DIR=$debugdir_path AC_SUBST(DEBUG_DIR) diff --git a/tools/config.h.in b/tools/config.h.in index 52e01b2c84..9563d3acb6 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -96,6 +96,9 @@ /* IPXE path */ #undef IPXE_PATH +/* Xen's libexec path */ +#undef LIBEXEC_BIN + /* OVMF path */ #undef OVMF_PATH @@ -129,6 +132,30 @@ /* QMP proxy path */ #undef STUBDOM_QMP_PROXY_PATH +/* Xen's firmware dir */ +#undef XENFIRMWAREDIR + +/* Xen's config dir */ +#undef XEN_CONFIG_DIR + +/* Xen's dump directory */ +#undef XEN_DUMP_DIR + +/* Xen's lib dir */ +#undef XEN_LIB_DIR + +/* Xen's lock dir */ +#undef XEN_LOCK_DIR + +/* Xen's log dir */ +#undef XEN_LOG_DIR + +/* Xen's runstate path */ +#undef XEN_RUN_DIR + +/* Xen's script dir */ +#undef XEN_SCRIPT_DIR + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 8e4a59c2cb..829753b5dd 100755 --- a/tools/configure +++ b/tools/configure @@ -3926,6 +3926,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -3978,6 +3983,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -4018,6 +4028,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -4025,12 +4040,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -4040,6 +4070,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -4053,12 +4088,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/tools/console/Makefile b/tools/console/Makefile index 3f4cddab03..207c04c9cd 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -22,27 +22,19 @@ all: $(BIN) clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM) $(RM) client/*.o daemon/*.o - $(RM) client/_paths.h - $(RM) daemon/_paths.h .PHONY: distclean distclean: clean -daemon/main.o: daemon/_paths.h +daemon/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) -client/main.o: client/_paths.h +client/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) -genpath-target = $(call buildmakevars2header,client/_paths.h) -$(eval $(genpath-target)) - -genpath-target = $(call buildmakevars2header,daemon/_paths.h) -$(eval $(genpath-target)) - .PHONY: install install: $(BIN) $(INSTALL_DIR) $(DESTDIR)/$(sbindir) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 80157be421..ada6728caa 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -41,7 +41,6 @@ #include #include "xenctrl.h" -#include "_paths.h" #define ESCAPE_CHARACTER 0x1d diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 30124a1c19..aac7233a48 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -31,7 +31,6 @@ #include "utils.h" #include "io.h" -#include "_paths.h" int log_reload = 0; int log_guest = 0; diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 1bcc97ea8a..7f6c422440 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -24,6 +24,7 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenlight) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h .PHONY: all all: $(PROGS) @@ -31,8 +32,6 @@ all: $(PROGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) -$(INIT_XENSTORE_DOMAIN_OBJS): _paths.h - init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) @@ -47,9 +46,6 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o $(PROGS) $(DEPS_RM) _paths.h + $(RM) -f *.o $(PROGS) $(DEPS_RM) distclean: clean - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 9457d0251b..b4f3c65a8a 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -16,7 +16,6 @@ #include #include "init-dom-json.h" -#include "_paths.h" #define LAPIC_BASE_ADDRESS 0xfee00000UL #define MB(x) ((uint64_t)x << 20) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index c6d882e239..8f5f3acd21 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -106,11 +106,6 @@ include $(XEN_ROOT)/tools/libs/libs.mk libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) .PHONY: cleanlocal diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 2e4c1330ea..c17cf9f712 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -33,7 +33,6 @@ #define XG_NEED_UNALIGNED #include "xg_private.h" -#include "_paths.h" /* ------------------------------------------------------------------------ */ /* debugging */ diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 128353029c..0ce6364963 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,7 +19,6 @@ #include #include "xc_private.h" -#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index b21e0bf083..2fdec06c69 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -135,7 +135,6 @@ clean: rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) - rm -f _paths.h .PHONY: distclean distclean: clean diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index bfd58226ce..fb5a9ca87e 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -153,7 +153,7 @@ LIBXL_TEST_OBJS += $(foreach t, $(LIBXL_TESTS_INSIDE),libxl_test_$t.opic) TEST_PROG_OBJS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t.o) test_common.o TEST_PROGS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t) -AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _paths.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h +AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h AUTOSRCS = _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c CLIENTS = testidl libxl-save-helper @@ -191,9 +191,6 @@ build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ touch $@ @@ -216,9 +213,8 @@ _libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ $(XEN_INCLUDE)/libxl.h: $(XEN_INCLUDE)/_libxl_types.h $(XEN_INCLUDE)/_libxl_list.h $(XEN_INCLUDE)/libxl_json.h: $(XEN_INCLUDE)/_libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h _paths.h +libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h libxl_internal_json.h: _libxl_types_internal_json.h -xl.h: _paths.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): $(XEN_INCLUDE)/libxl.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 03841243ab..2abaab439c 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -24,8 +24,6 @@ #include #include -#include "_paths.h" - //#define DEBUG 1 libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 0b4671318c..37d5c27756 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -73,7 +73,6 @@ #endif #include "libxl.h" -#include "_paths.h" #include "_libxl_save_msgs_callout.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) diff --git a/tools/libs/light/libxl_utils.c b/tools/libs/light/libxl_utils.c index 4699c4a0a3..b91c2cafa2 100644 --- a/tools/libs/light/libxl_utils.c +++ b/tools/libs/light/libxl_utils.c @@ -18,7 +18,6 @@ #include #include "libxl_internal.h" -#include "_paths.h" #ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 911a2de8ec..01417b5334 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -30,8 +30,6 @@ APPEND_LDFLAGS += $(LDLIBS-y) include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): _paths.h - PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py PYSRC=bindings/swig/python/_xenstat.c @@ -121,10 +119,7 @@ clean: cleanlocal .PHONY: cleanlocal cleanlocal: - rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) _paths.h + rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) rm -f libxenstat.map -include $(DEPS_INCLUDE) - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/libs/stat/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c index 2205a04131..9909b9727e 100644 --- a/tools/libs/stat/xenstat_qmp.c +++ b/tools/libs/stat/xenstat_qmp.c @@ -23,7 +23,6 @@ #include #include "xenstat_priv.h" -#include "_paths.h" #ifdef HAVE_YAJL_YAJL_VERSION_H # include diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 2e129f00e1..b7f439121a 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -29,11 +29,6 @@ $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(XL_OBJS): _paths.h - .PHONY: all all: xl @@ -54,7 +49,7 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o xl _paths.h $(DEPS_RM) + $(RM) *.o xl $(DEPS_RM) distclean: clean diff --git a/tools/xl/xl.h b/tools/xl/xl.h index cf12c79a9b..c5c4bedbdd 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -17,7 +17,6 @@ #include -#include "_paths.h" #include struct cmd_spec { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:56:37 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:56:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248306.428267 (Exim 4.92) (envelope-from ) id 1mxyjt-00060d-9J; Thu, 16 Dec 2021 21:56:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248306.428267; Thu, 16 Dec 2021 21:56:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjt-00060V-6M; Thu, 16 Dec 2021 21:56:37 +0000 Received: by outflank-mailman (input) for mailman id 248306; Thu, 16 Dec 2021 21:56:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjs-00060N-Rq for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyjs-0000l0-R5 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyjs-0006KH-Q7 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=L7U3o4u37/qJAgM7a7KBNVE98PKi136lR2/J2gvQUUY=; b=D6fasN+kDfdQv6FWXzZ6XnX367 vuiuqcp3bUqkyoPlyhK3wZetFGBvEBFsO6vOxJ/sQ39a4vp5mKpLURP/WIaJ2D3HzkuLN58B7IGS9 b3ycwFJeiqtxcqYXcBVy8IcWaC0kTVSB3wt2VIYQ1qsGzZnWyu/c2dRn14C73xCqaSiw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/Rules.mk: introduce FORCE target Message-Id: Date: Thu, 16 Dec 2021 21:56:36 +0000 commit aff380118b413d45b40680af8fa8980ecd4d69c0 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:03 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/Rules.mk: introduce FORCE target And replace the one defined in libs.mk. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/Rules.mk | 3 +++ tools/libs/libs.mk | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 4e9b4ee17f..0d3febfbb6 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -210,3 +210,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ } > $@ + +.PHONY: FORCE +FORCE: diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 2fdec06c69..36ffe01402 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -138,6 +138,3 @@ clean: .PHONY: distclean distclean: clean - -.PHONY: FORCE -FORCE: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:56:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:56:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248307.428272 (Exim 4.92) (envelope-from ) id 1mxyk4-00064C-C2; Thu, 16 Dec 2021 21:56:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248307.428272; Thu, 16 Dec 2021 21:56:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyk4-000644-96; Thu, 16 Dec 2021 21:56:48 +0000 Received: by outflank-mailman (input) for mailman id 248307; Thu, 16 Dec 2021 21:56:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyk2-00063s-Uw for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyk2-0000lA-UK for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyk2-0006Kx-TX for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yWMQFKP/VUU2QS7A5hu3BSKSKXtC8INknjoEqlCX+TU=; b=z0oQzLiX4oeJ1FsWJ0DIbGlz5o zOft3jC1D2H2uB1h1uaZD2GNpfTdEldOapYOMqlS4UqD2XCmbTfs8TOthPNpErvXS+SDQBOypLMyt YaMckwHybLdRPwV+jcmttcXD5B+kiL+onb0X3K8MKi52iLLKkkv1fhTKdftxc/6A72Wc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/include/xen-foreign: avoid to rely on default .SUFFIXES Message-Id: Date: Thu, 16 Dec 2021 21:56:46 +0000 commit dca4416a78435c0e63c726c0b683e48f909cde88 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:04 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/include/xen-foreign: avoid to rely on default .SUFFIXES When a rule isn't a pattern rule, and thus don't have a %, the value of the automatic variable stem $* depends on .SUFFIXES. GNU make manual explain that it is better to avoid this "bizarre" behavior which exist for compatibility. Use $(basename ) instead. So we can one day avoid make's build-in rules and variables. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/include/xen-foreign/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index e395011fdd..6ce51daf5e 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -25,28 +25,28 @@ check-headers: checker rm tmp.size arm32.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) arm64.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:56:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:56:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248308.428276 (Exim 4.92) (envelope-from ) id 1mxykE-00068l-DV; Thu, 16 Dec 2021 21:56:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248308.428276; Thu, 16 Dec 2021 21:56:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykE-00068d-AZ; Thu, 16 Dec 2021 21:56:58 +0000 Received: by outflank-mailman (input) for mailman id 248308; Thu, 16 Dec 2021 21:56:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykD-00068Q-29 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykD-0000le-1R for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxykD-0006LT-0Q for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:56:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=luur9XiozxTTNp7GpfVggafmyyJ3bi2/2O39ysOc67w=; b=0TBNBClrxv1/Sig1vV7RvrMOch vjVWCaaXuz/J2k/ezDjm4fvZLbtklYfqmhD+sZJIZ0KuehdiYcQt0jSODAojqz5BWaQ3elW7LOi2y zj7WwuZfxr8Q6Xuk+RTdPUOJ6P/0Ahhqi8X51EWMHz4LM8zfXKLBBmPBY+OR4Pg4PNis=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/debugger: Allow make to recurse into debugger/ Message-Id: Date: Thu, 16 Dec 2021 21:56:57 +0000 commit 2400a9a365c5619dbf557afccdd45d2a2e4e3ade Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:06 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/debugger: Allow make to recurse into debugger/ Avoid the need for explicite rules to recurse into debugger/* dirs by adding a Makefile in debugger/. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/Makefile | 27 +-------------------------- tools/debugger/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 8936b754c8..79b4c7e3de 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,8 +32,7 @@ SUBDIRS-$(CONFIG_GOLANG) += golang SUBDIRS-y += xl SUBDIRS-y += helpers SUBDIRS-$(CONFIG_X86) += xenpaging -SUBDIRS-$(CONFIG_X86) += debugger/gdbsx -SUBDIRS-$(CONFIG_X86) += debugger/kdd +SUBDIRS-$(CONFIG_X86) += debugger SUBDIRS-$(CONFIG_TESTS) += tests SUBDIRS-y += python @@ -272,30 +271,6 @@ subdir-clean-qemu-xen-dir: subdir-uninstall-qemu-xen-dir: ; -subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx clean - -subdir-install-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx install - -subdir-all-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx all - -subdir-uninstall-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx uninstall - -subdir-clean-debugger/kdd subdir-distclean-debugger/kdd: .phony - $(MAKE) -C debugger/kdd clean - -subdir-install-debugger/kdd: .phony - $(MAKE) -C debugger/kdd install - -subdir-uninstall-debugger/kdd: .phony - $(MAKE) -C debugger/kdd uninstall - -subdir-all-debugger/kdd: .phony - $(MAKE) -C debugger/kdd all - subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update diff --git a/tools/debugger/Makefile b/tools/debugger/Makefile new file mode 100644 index 0000000000..51efd3680b --- /dev/null +++ b/tools/debugger/Makefile @@ -0,0 +1,8 @@ +XEN_ROOT=$(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +SUBDIRS-y := gdbsx +SUBDIRS-y += kdd + +.PHONY: all clean install distclean uninstall +all clean install distclean uninstall: %: subdirs-% -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:57:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:57:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248309.428280 (Exim 4.92) (envelope-from ) id 1mxykO-0006BP-F0; Thu, 16 Dec 2021 21:57:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248309.428280; Thu, 16 Dec 2021 21:57:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykO-0006BH-C3; Thu, 16 Dec 2021 21:57:08 +0000 Received: by outflank-mailman (input) for mailman id 248309; Thu, 16 Dec 2021 21:57:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykN-0006B6-55 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykN-0000lv-4O for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxykN-0006M9-3j for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+q8aVxDpQ1Fp4cjIlKAD6oUGfpHOn//ltQ9hALZdt4s=; b=oIMoXpNxxMI5CHxtussJP4CPfa qe+9qq6BLgQscmQrKS8OrET4+nr071L0rWYb0FJlsP9gMg1AGtg+Iv1bafP6903f5r/BCdokwOiaj uAhkDmCgJT5D8YmKYXgtmN0mIzcaNo0c1Bw1DYtPVW9wz4ClTKqc5i6DxFsFvZyw/WsU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/misc: rework Makefile Message-Id: Date: Thu, 16 Dec 2021 21:57:07 +0000 commit 41da0c21eea3ac5cb67d5b0ed4f52fbadab51f19 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:15 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/misc: rework Makefile Add missing "xen-detect" rule. It only works without it because we still have make's built-ins rules and variables, but fix this to not have to rely on them. Rename $(TARGETS_BUILD) to $(TARGETS). Remove the unused "build" target. Also, they are no more "build-only" targets, remove the extra code. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/misc/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 8b9558b93f..0e02401227 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -50,16 +50,13 @@ TARGETS_COPY += xencov_split TARGETS_COPY += xenpvnetboot # Everything which needs to be built -TARGETS_BUILD := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) +TARGETS := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) -# ... including build-only targets -TARGETS_BUILD += $(TARGETS_BUILD-y) - -.PHONY: all build -all build: $(TARGETS_BUILD) +.PHONY: all +all: $(TARGETS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -75,7 +72,7 @@ uninstall: .PHONY: clean clean: - $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean @@ -86,6 +83,9 @@ xen-access: xen-access.o xen-cpuid: xen-cpuid.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) +xen-detect: xen-detect.o + $(CC) $(LDFLAGS) -o $@ $< $(APPEND_LDFLAGS) + xen-hvmctx: xen-hvmctx.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:57:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:57:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248310.428284 (Exim 4.92) (envelope-from ) id 1mxykY-0006EC-GR; Thu, 16 Dec 2021 21:57:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248310.428284; Thu, 16 Dec 2021 21:57:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykY-0006E4-DZ; Thu, 16 Dec 2021 21:57:18 +0000 Received: by outflank-mailman (input) for mailman id 248310; Thu, 16 Dec 2021 21:57:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykX-0006Dv-8B for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykX-0000m5-7R for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxykX-0006Mh-6b for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yUYC5kv3bpOnGoNAhlk3MA5P5N8xrr+qjlDLRy39Pwc=; b=FFjlLVrAOJQjUwVWkf48Gm75zq +4FfjxWgTBHK5SGbXcqJxyeUN7Qrn9lpKJklmUrbnDhzmpbGO1i2YiRA2reYVUZ8PSIBstTVdSaE5 yR8Xul+QpKeAsJvkuRPAb9zbKaYkf42eCVxkI9XXP9rWJzBCIKHHLIf5qrZY+GmRc+v4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/vchan: Collect targets in TARGETS Message-Id: Date: Thu, 16 Dec 2021 21:57:17 +0000 commit e10ef07578465cb37f43ce42e3c3cbac6f80ac3c Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:16 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/vchan: Collect targets in TARGETS And use the new TARGETS to clean them. Now "clean" will remove "vchan-socket-proxy". $(RM) already have the "-f" flags, so remove the second one. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/vchan/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/vchan/Makefile b/tools/vchan/Makefile index a731e0e073..c886c22e12 100644 --- a/tools/vchan/Makefile +++ b/tools/vchan/Makefile @@ -11,8 +11,10 @@ NODE2_OBJS = node-select.o $(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxenvchan) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) vchan-socket-proxy.o: CFLAGS += $(CFLAGS_libxenvchan) $(CFLAGS_libxenstore) $(CFLAGS_libxenctrl) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) +TARGETS := vchan-node1 vchan-node2 vchan-socket-proxy + .PHONY: all -all: vchan-node1 vchan-node2 vchan-socket-proxy +all: $(TARGETS) vchan-node1: $(NODE_OBJS) $(CC) $(LDFLAGS) -o $@ $(NODE_OBJS) $(LDLIBS_libxenvchan) $(APPEND_LDFLAGS) @@ -30,7 +32,7 @@ install: all .PHONY: clean clean: - $(RM) -f *.o vchan-node1 vchan-node2 $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:57:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:57:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248311.428288 (Exim 4.92) (envelope-from ) id 1mxyki-0006H0-Hv; Thu, 16 Dec 2021 21:57:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248311.428288; Thu, 16 Dec 2021 21:57:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyki-0006Gs-F5; Thu, 16 Dec 2021 21:57:28 +0000 Received: by outflank-mailman (input) for mailman id 248311; Thu, 16 Dec 2021 21:57:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykh-0006Gh-B7 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykh-0000m9-AV for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxykh-0006NT-9e for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZkV3CHLydXiOgYh8ZnM9xRzbe0mYRfK/wIMOGIzJ2TE=; b=Zm8rVBNQrNYzICHdQd2WVT/ghM ZLwsLUEmjOxmlEhrOVKZvq9QV4EwgK0k0E2sczeC6nvv6kMR/DefS+/ac4tOPPoxnOOla1IBqrehZ 54iDf4wNgeDLmlZ/51KjmpzX8WGGj/VaW/9v2dXMgLO9baEJBqxHEqTVA8ljp8Ez0ciI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xcutils: rework Makefile Message-Id: Date: Thu, 16 Dec 2021 21:57:27 +0000 commit 0ac694803c0327ab31eda0c26a646c6227f2a394 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:17 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/xcutils: rework Makefile Use TARGETS to collect targets to build Remove "build" target. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper [Clean up $(RM)] Signed-off-by: Andrew Cooper --- tools/xcutils/Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 82d42624c8..e40a2c4bfa 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,7 +11,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -PROGRAMS = readnotes lsevtchn +TARGETS := readnotes lsevtchn CFLAGS += -Werror @@ -19,10 +19,7 @@ CFLAGS_readnotes.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libx CFLAGS_lsevtchn.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) .PHONY: all -all: build - -.PHONY: build -build: $(PROGRAMS) +all: $(TARGETS) readnotes: readnotes.o $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) @@ -31,18 +28,17 @@ lsevtchn: lsevtchn.o $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXECDIR)/, $(PROGRAMS)) + $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/, $(TARGETS)) .PHONY: clean clean: - $(RM) *.o $(PROGRAMS) - $(RM) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:57:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:57:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248312.428292 (Exim 4.92) (envelope-from ) id 1mxyks-0006Jf-JW; Thu, 16 Dec 2021 21:57:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248312.428292; Thu, 16 Dec 2021 21:57:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyks-0006JX-GV; Thu, 16 Dec 2021 21:57:38 +0000 Received: by outflank-mailman (input) for mailman id 248312; Thu, 16 Dec 2021 21:57:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykr-0006JM-EJ for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxykr-0000nq-Db for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxykr-0006Nw-Cn for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ReTAUKtwGazeUGLjtppV9bh2P14+7tSKufHMYzmcS+k=; b=UZUbdS6ogFIMY+JEeqgXWe2eCI kzfh2jIcyirbSgx2t98qJV8PHo5R04R5c7enWg8ARZz/RFz/1WyDX6pz0F+rBbHLtoKf/CzxcvZNL F99I6uiR6l5LC1hA4TbKOxiIHq/ItUR97L2AH0JvvNxd7tRw/beqN3DT9bSPZFayY40s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs: Remove both "libs" and "build" target Message-Id: Date: Thu, 16 Dec 2021 21:57:37 +0000 commit 61760209029352e365ad0deeb701eebe6de74776 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:22 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 libs: Remove both "libs" and "build" target "libs" is odd and has been introduced without a reason by c7d3afbb44. Instead, only use "all". Also remove "build" target as "all" is more appropriate and nothing is using "build" in libs/ in the xen.git repo. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 12 +++--------- tools/libs/light/Makefile | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 36ffe01402..847eb4851f 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -56,13 +56,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) .PHONY: all -all: build - -.PHONY: build -build: libs libxen$(LIBNAME).map $(LIBHEADERS) - -.PHONY: libs -libs: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) +all: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIBHEADERS) ifneq ($(NO_HEADERS_CHK),y) headers.chk: @@ -99,14 +93,14 @@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) ifneq ($(nosharedlibs),y) -libs: $(PKG_ABI) +all: $(PKG_ABI) $(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst $(ABI_DUMPER) $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR) endif endif .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index fb5a9ca87e..be32d95d39 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -187,7 +187,7 @@ testidl.c: libxl_types.idl gentest.py $(XEN_INCLUDE)/libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new mv testidl.c.new testidl.c -build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) +all: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:57:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:57:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248313.428296 (Exim 4.92) (envelope-from ) id 1mxyl2-0006MZ-Ku; Thu, 16 Dec 2021 21:57:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248313.428296; Thu, 16 Dec 2021 21:57:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyl2-0006MR-Hy; Thu, 16 Dec 2021 21:57:48 +0000 Received: by outflank-mailman (input) for mailman id 248313; Thu, 16 Dec 2021 21:57:47 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyl1-0006MJ-HW for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:47 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxyl1-0000nu-Gu for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxyl1-0006Ob-G4 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jb/rEfZRX9rowQVtrtb8ZqLHDcJuc6+WgVnjc/n1yfM=; b=Ykqylqg2GknBC9hKyMtXVtjYON G11SEaYVSVfPd0iR803UqEndK8CHSgSQFE+35t8NTBDqAAPc/kiWPV13Xnzwdv0kQWpD9fP4fUXV4 5H4qdNYSt+p7LZ+dsSDez1kVULFziovrhX7QGYt6omDiTDNxF/G0A0O8g/zIBUI+ckw8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] libs/toolcore: don't install xentoolcore_internal.h anymore Message-Id: Date: Thu, 16 Dec 2021 21:57:47 +0000 commit e2ddc82be487bbd9b2de362bcfbafd366d86717d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:32 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 libs/toolcore: don't install xentoolcore_internal.h anymore With "xentoolcore_internal.h" been in LIBHEADER, it was installed. But its dependency "_xentoolcore_list.h" wasn't installed so the header couldn't be used anyway. This patch also mean that the rule "headers.chk" doesn't check it anymore as well. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/toolcore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 3550786491..ed4ae00694 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -5,7 +5,7 @@ MAJOR = 1 MINOR = 0 AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h -LIBHEADER := xentoolcore.h xentoolcore_internal.h +LIBHEADER := xentoolcore.h SRCS-y += handlereg.c -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:57:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:57:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248314.428300 (Exim 4.92) (envelope-from ) id 1mxylC-0006PS-N7; Thu, 16 Dec 2021 21:57:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248314.428300; Thu, 16 Dec 2021 21:57:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylC-0006PL-JZ; Thu, 16 Dec 2021 21:57:58 +0000 Received: by outflank-mailman (input) for mailman id 248314; Thu, 16 Dec 2021 21:57:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylB-0006P2-L7 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:57 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylB-0000oE-KP for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxylB-0006P4-JN for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:57:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=L7BVjV7XxgstpMWgJ6UlKXDNZQROJChnLm+Aa0ynCEw=; b=hmMLBPahkxLndhK8wZJvwFl9Na OhtpzAv4DG6HzIdrk2oW5rW1OFl9WeROY1b5onBil15JVUsBh9HsQn7P0VDT37sN60iQJ0tjW1Wd9 pORRHJykAZLHV0hA8DPEO6oPeq1EH/VFvzTIonR9ZRYX7MIeHOsztEUAnW2/IwbXiXl8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/Rules.mk: Cleanup %.pc rules Message-Id: Date: Thu, 16 Dec 2021 21:57:57 +0000 commit fc93c3ac4f888d506f4b15ad05b900c46416ace0 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:33 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/Rules.mk: Cleanup %.pc rules PKG_CONFIG_VARS isn't set anymore, so is dead logic. For "local" pkg-config file, we only have one headers directory now, "tools/include", so there is no need to specify it twice. So remove $(CFLAGS_xeninclude) from "Cflags:". Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/Rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 0d3febfbb6..47424935ba 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -184,12 +184,11 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "prefix=$(PKG_CONFIG_PREFIX)"; \ echo "includedir=$(PKG_CONFIG_INCDIR)"; \ echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ - $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ echo ""; \ echo "Name: $(PKG_CONFIG_NAME)"; \ echo "Description: $(PKG_CONFIG_DESC)"; \ echo "Version: $(PKG_CONFIG_VERSION)"; \ - echo "Cflags: -I\$${includedir} $(CFLAGS_xeninclude)"; \ + echo "Cflags: -I\$${includedir}"; \ echo "Libs: -L\$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)"; \ echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ @@ -200,7 +199,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "prefix=$(PKG_CONFIG_PREFIX)"; \ echo "includedir=$(PKG_CONFIG_INCDIR)"; \ echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ - $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ echo ""; \ echo "Name: $(PKG_CONFIG_NAME)"; \ echo "Description: $(PKG_CONFIG_DESC)"; \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:58:08 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:58:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248315.428304 (Exim 4.92) (envelope-from ) id 1mxylM-0006Sj-PR; Thu, 16 Dec 2021 21:58:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248315.428304; Thu, 16 Dec 2021 21:58:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylM-0006Sb-MX; Thu, 16 Dec 2021 21:58:08 +0000 Received: by outflank-mailman (input) for mailman id 248315; Thu, 16 Dec 2021 21:58:07 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylL-0006SV-O5 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylL-0000ob-NS for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxylL-0006Pi-Mi for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=RQ7AafkXamP9Q20UInoedR1JvHaz85Y/Dm8BqDWmQDE=; b=5FySCGqC3JKO9I5wO1xX702pYE iglvLOedosYQPIsJAGZYgGkO6kGV5cBn2lPVr5jgNDVH23FWlaBl/kn1EleqsT2itJ5UuBXkD0Z/i 67Bh1aVc7I/35GXJbHbwqgY6YreMUj4NcYIziUUKa3DNSqcPDc1LlItjFKoR09ERTuXM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] stubdom: only build libxen*.a from tools/libs/ Message-Id: Date: Thu, 16 Dec 2021 21:58:07 +0000 commit b1e37d8402522e812e82d8776e39fcfceaccf628 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:35 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 stubdom: only build libxen*.a from tools/libs/ Avoid generating *.map files or running headers.chk when all we need is the libxen*.a. Also, allow force make to check again if libxen*.a needs rebuilt by adding a '.PHONY' prerequisite. Also, remove DESTDIR= as we don't do installation in this target, so the value of DESTDIR doesn't matter. Signed-off-by: Anthony PERARD Reviewed-by: Samuel Thibault --- stubdom/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index ccfcf5b75f..5fb5dbc341 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -354,8 +354,8 @@ define BUILD_lib .PHONY: libxen$(1) clean-libxen$(1) libxen$(1): libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: $$(LIBDEPS_$(1)) $$(LIBDEP_$(1)) - libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) - CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libs-$$(XEN_TARGET_ARCH)/$(1) + libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) .phony + CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y -C $$(@D) $$(@F) clean-libxen$(1): [ ! -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ] || $$(MAKE) DESTDIR= -C libs-$$(XEN_TARGET_ARCH)/$(1) clean -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:58:18 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:58:18 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248316.428308 (Exim 4.92) (envelope-from ) id 1mxylW-0006VT-R4; Thu, 16 Dec 2021 21:58:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248316.428308; Thu, 16 Dec 2021 21:58:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylW-0006VL-O0; Thu, 16 Dec 2021 21:58:18 +0000 Received: by outflank-mailman (input) for mailman id 248316; Thu, 16 Dec 2021 21:58:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylV-0006V9-RW for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylV-0000oi-Qs for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxylV-0006QB-Q1 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kXnxqPN6/D6zN80mop0QoV0myaj4um9VLHgEyQMjvcM=; b=HbnOlYiA0XtsmGeO0YCNx7notO 7xOIHaEV0Rmh0Ty2uxgZzLixRHIKeE3hQZ0eMVT2ArH2T8o+mEQQ79suWT+Yx+JHqH+hRRWgQ2ofX nZ8rwffusKaNYz02ckYLua3KDv2ygCeTAp+WM9RklBxR2LwuEGIXzC9LysvUvxgo1JYE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: Split dom0 handling out of init_domain_cpuid_policy() Message-Id: Date: Thu, 16 Dec 2021 21:58:17 +0000 commit c17072fc164a72583fda8e2b836c71d2e3f8e84d Author: Andrew Cooper AuthorDate: Wed Dec 15 15:36:59 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Split dom0 handling out of init_domain_cpuid_policy() To implement dom0-cpuid= support, the special cases would need extending. However there is already a problem with late hwdom where the special cases override toolstack settings, which is unintended and poor behaviour. Introduce a new init_dom0_cpuid_policy() for the purpose, moving the ITSC and ARCH_CAPS logic. The is_hardware_domain() can be dropped, and for now there is no need to rerun recalculate_cpuid_policy(); this is a relatively expensive operation, and will become more-so over time. Rearrange the logic in create_dom0() to make room for a call to init_dom0_cpuid_policy(). The AMX plans for having variable sized XSAVE states require that modifications to the policy happen before vCPUs are created. Additionally, factor out domid into a variable so we can be slightly more correct in the case of a failure, and also print the error from domain_create(). This will at least help distinguish -EINVAL from -ENOMEM. No practical change in behaviour. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpuid.c | 25 +++++++++++++++---------- xen/arch/x86/include/asm/cpuid.h | 3 +++ xen/arch/x86/setup.c | 15 +++++++++++---- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 151944f657..f63f5efc17 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -727,23 +727,28 @@ int init_domain_cpuid_policy(struct domain *d) if ( !p ) return -ENOMEM; - /* The hardware domain can't migrate. Give it ITSC if available. */ - if ( is_hardware_domain(d) ) - p->extd.itsc = cpu_has_itsc; + d->arch.cpuid = p; + + recalculate_cpuid_policy(d); + + return 0; +} + +void __init init_dom0_cpuid_policy(struct domain *d) +{ + struct cpuid_policy *p = d->arch.cpuid; + + /* dom0 can't migrate. Give it ITSC if available. */ + if ( cpu_has_itsc ) + p->extd.itsc = true; /* * Expose the "hardware speculation behaviour" bits of ARCH_CAPS to dom0, * so dom0 can turn off workarounds as appropriate. Temporary, until the * domain policy logic gains a better understanding of MSRs. */ - if ( is_hardware_domain(d) && cpu_has_arch_caps ) + if ( cpu_has_arch_caps ) p->feat.arch_caps = true; - - d->arch.cpuid = p; - - recalculate_cpuid_policy(d); - - return 0; } void guest_cpuid(const struct vcpu *v, uint32_t leaf, diff --git a/xen/arch/x86/include/asm/cpuid.h b/xen/arch/x86/include/asm/cpuid.h index 46904061d0..9c3637549a 100644 --- a/xen/arch/x86/include/asm/cpuid.h +++ b/xen/arch/x86/include/asm/cpuid.h @@ -59,6 +59,9 @@ bool recheck_cpu_features(unsigned int cpu); /* Allocate and initialise a CPUID policy suitable for the domain. */ int init_domain_cpuid_policy(struct domain *d); +/* Apply dom0-specific tweaks to the CPUID policy. */ +void init_dom0_cpuid_policy(struct domain *d); + /* Clamp the CPUID policy to reality. */ void recalculate_cpuid_policy(struct domain *d); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f40a9fe5d3..e716005145 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -772,6 +772,7 @@ static struct domain *__init create_dom0(const module_t *image, }; struct domain *d; char *cmdline; + domid_t domid; if ( opt_dom0_pvh ) { @@ -786,10 +787,16 @@ static struct domain *__init create_dom0(const module_t *image, if ( iommu_enabled ) dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; - /* Create initial domain 0. */ - d = domain_create(get_initial_domain_id(), &dom0_cfg, !pv_shim); - if ( IS_ERR(d) || (alloc_dom0_vcpu0(d) == NULL) ) - panic("Error creating domain 0\n"); + /* Create initial domain. Not d0 for pvshim. */ + domid = get_initial_domain_id(); + d = domain_create(domid, &dom0_cfg, !pv_shim); + if ( IS_ERR(d) ) + panic("Error creating d%u: %ld\n", domid, PTR_ERR(d)); + + init_dom0_cpuid_policy(d); + + if ( alloc_dom0_vcpu0(d) == NULL ) + panic("Error creating d%uv0\n", domid); /* Grab the DOM0 command line. */ cmdline = image->string ? __va(image->string) : NULL; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:58:28 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:58:28 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248317.428312 (Exim 4.92) (envelope-from ) id 1mxylg-0006YH-SV; Thu, 16 Dec 2021 21:58:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248317.428312; Thu, 16 Dec 2021 21:58:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylg-0006Y9-Pd; Thu, 16 Dec 2021 21:58:28 +0000 Received: by outflank-mailman (input) for mailman id 248317; Thu, 16 Dec 2021 21:58:28 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylf-0006Y2-Uc for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylf-0000ot-U0 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxylf-0006Qm-T9 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HPx32EHyXUEbLCf4JqsCod39Dddfg3H2QkByusBpfwo=; b=LQiWhVmnycfNltYIDB8ujFbTe1 Kz/r283CpYE74by/99LvtyYi3Rwf/HVYMnW9iAhs3wde3mQlvoKZ9olVGtKRIELpwucEc+AGuv5Qc sYUbKy/dXXMKD1SNwNev2nynUHYhyMuTbe7nlRZruYkQfdcmCKDQfoqV9Nz9DXBc/jvM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: Factor common parsing out of parse_xen_cpuid() Message-Id: Date: Thu, 16 Dec 2021 21:58:27 +0000 commit 94c3df9188d6deed6fe213754492b11b9d409262 Author: Andrew Cooper AuthorDate: Wed Dec 15 16:30:25 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Factor common parsing out of parse_xen_cpuid() dom0-cpuid= is going to want to reuse the common parsing loop, so factor it out into parse_cpuid(). Irritatingly, despite being static const, the features[] array gets duplicated each time parse_cpuid() is inlined. As it is a large (and ever growing with new CPU features) datastructure, move it to being file scope so all inlines use the same single object. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpuid.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index f63f5efc17..e11f5a3c9a 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -26,17 +26,26 @@ static const uint32_t __initconst hvm_hap_def_featuremask[] = INIT_HVM_HAP_DEF_FEATURES; static const uint32_t deep_features[] = INIT_DEEP_FEATURES; -static int __init parse_xen_cpuid(const char *s) +static const struct feature_name { + const char *name; + unsigned int bit; +} feature_names[] __initconstrel = INIT_FEATURE_NAMES; + +/* + * Parse a list of cpuid feature names -> bool, calling the callback for any + * matches found. + * + * always_inline, because this is init code only and we really don't want a + * function pointer call in the middle of the loop. + */ +static int __init always_inline parse_cpuid( + const char *s, void (*callback)(unsigned int feat, bool val)) { const char *ss; int val, rc = 0; do { - static const struct feature { - const char *name; - unsigned int bit; - } features[] __initconstrel = INIT_FEATURE_NAMES; - const struct feature *lhs, *rhs, *mid = NULL /* GCC... */; + const struct feature_name *lhs, *rhs, *mid = NULL /* GCC... */; const char *feat; ss = strchr(s, ','); @@ -49,8 +58,8 @@ static int __init parse_xen_cpuid(const char *s) feat += 3; /* (Re)initalise lhs and rhs for binary search. */ - lhs = features; - rhs = features + ARRAY_SIZE(features); + lhs = feature_names; + rhs = feature_names + ARRAY_SIZE(feature_names); while ( lhs < rhs ) { @@ -72,11 +81,7 @@ static int __init parse_xen_cpuid(const char *s) if ( (val = parse_boolean(mid->name, s, ss)) >= 0 ) { - if ( !val ) - setup_clear_cpu_cap(mid->bit); - else if ( mid->bit == X86_FEATURE_RDRAND && - (cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_RDRAND)) ) - setup_force_cpu_cap(X86_FEATURE_RDRAND); + callback(mid->bit, val); mid = NULL; } @@ -95,6 +100,20 @@ static int __init parse_xen_cpuid(const char *s) return rc; } + +static void __init _parse_xen_cpuid(unsigned int feat, bool val) +{ + if ( !val ) + setup_clear_cpu_cap(feat); + else if ( feat == X86_FEATURE_RDRAND && + (cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_RDRAND)) ) + setup_force_cpu_cap(X86_FEATURE_RDRAND); +} + +static int __init parse_xen_cpuid(const char *s) +{ + return parse_cpuid(s, _parse_xen_cpuid); +} custom_param("cpuid", parse_xen_cpuid); #define EMPTY_LEAF ((struct cpuid_leaf){}) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:58:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:58:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248318.428316 (Exim 4.92) (envelope-from ) id 1mxylq-0006b7-Tt; Thu, 16 Dec 2021 21:58:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248318.428316; Thu, 16 Dec 2021 21:58:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylq-0006az-R8; Thu, 16 Dec 2021 21:58:38 +0000 Received: by outflank-mailman (input) for mailman id 248318; Thu, 16 Dec 2021 21:58:38 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylq-0006ap-22 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:38 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxylq-0000ox-1M for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxylq-0006Rn-0Z for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0vEQhWdqVZBEBixVU6VWJ67fQy4BHwgYcncGWlUdHpI=; b=bScKoLMbkDVaESpZ8zWKgBE0wz fksvswfNilPwQFLAkupBPK9bhx8UBYxfzkrpLYUcXB1V6Us6/w872wW1RODwbQWSTJRbwwD/cNRvz RSQobxM4Mt0qnGkhinpbl5K/YAb8lNH37QqyQzXZT/BeXlS7PITfZoHjBgFQdaiphP00=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: Introduce dom0-cpuid command line option Message-Id: Date: Thu, 16 Dec 2021 21:58:38 +0000 commit 5bd2b82df28cb7390f5ffb00fac635d0b9e36674 Author: Andrew Cooper AuthorDate: Tue Dec 14 16:53:36 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Introduce dom0-cpuid command line option Specifically, this lets the user opt in to non-default features. Collect all dom0 settings together in dom0_{en,dis}able_feat[], and apply it to dom0's policy when other tweaks are being made. As recalculate_cpuid_policy() is an expensive action, and dom0-cpuid= is likely to only be used by the x86 maintainers for development purposes, forgo the recalculation in the general case. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 16 ++++++++++++++++ xen/arch/x86/cpuid.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index f7797ea233..6b3da6ddc1 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -801,6 +801,22 @@ Controls for how dom0 is constructed on x86 systems. If using this option is necessary to fix an issue, please report a bug. +### dom0-cpuid + = List of comma separated booleans + + Applicability: x86 + +This option allows for fine tuning of the facilities dom0 will use, after +accounting for hardware capabilities and Xen settings as enumerated via CPUID. + +Options are accepted in positive and negative form, to enable or disable +specific features. All selections via this mechanism are subject to normal +CPU Policy safety and dependency logic. + +This option is intended for developers to opt dom0 into non-default features, +and is not intended for use in production circumstances. If using this option +is necessary to fix an issue, please report a bug. + ### dom0-iommu = List of [ passthrough=, strict=, map-inclusive=, map-reserved=, none ] diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index e11f5a3c9a..b5af48324a 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -116,6 +116,24 @@ static int __init parse_xen_cpuid(const char *s) } custom_param("cpuid", parse_xen_cpuid); +static bool __initdata dom0_cpuid_cmdline; +static uint32_t __initdata dom0_enable_feat[FSCAPINTS]; +static uint32_t __initdata dom0_disable_feat[FSCAPINTS]; + +static void __init _parse_dom0_cpuid(unsigned int feat, bool val) +{ + __set_bit (feat, val ? dom0_enable_feat : dom0_disable_feat); + __clear_bit(feat, val ? dom0_disable_feat : dom0_enable_feat ); +} + +static int __init parse_dom0_cpuid(const char *s) +{ + dom0_cpuid_cmdline = true; + + return parse_cpuid(s, _parse_dom0_cpuid); +} +custom_param("dom0-cpuid", parse_dom0_cpuid); + #define EMPTY_LEAF ((struct cpuid_leaf){}) static void zero_leaves(struct cpuid_leaf *l, unsigned int first, unsigned int last) @@ -768,6 +786,25 @@ void __init init_dom0_cpuid_policy(struct domain *d) */ if ( cpu_has_arch_caps ) p->feat.arch_caps = true; + + /* Apply dom0-cpuid= command line settings, if provided. */ + if ( dom0_cpuid_cmdline ) + { + uint32_t fs[FSCAPINTS]; + unsigned int i; + + cpuid_policy_to_featureset(p, fs); + + for ( i = 0; i < ARRAY_SIZE(fs); ++i ) + { + fs[i] |= dom0_enable_feat [i]; + fs[i] &= ~dom0_disable_feat[i]; + } + + cpuid_featureset_to_policy(fs, p); + + recalculate_cpuid_policy(d); + } } void guest_cpuid(const struct vcpu *v, uint32_t leaf, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 21:58:49 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 21:58:49 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248319.428319 (Exim 4.92) (envelope-from ) id 1mxym0-0006dl-VT; Thu, 16 Dec 2021 21:58:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248319.428319; Thu, 16 Dec 2021 21:58:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxym0-0006dd-Sd; Thu, 16 Dec 2021 21:58:48 +0000 Received: by outflank-mailman (input) for mailman id 248319; Thu, 16 Dec 2021 21:58:48 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxym0-0006dX-5J for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:48 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxym0-0000p1-4b for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:48 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxym0-0006SI-3q for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 21:58:48 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NVjMF68LnmOtUzIfYaS+n9RwAAeePy3/8+12xry/8Fw=; b=mbOuMZxghEKO3uI6Bap8t5lIZz h2ydpzQq6sdBqeNtikxSPFUfiin7il0Tqz4peAZ+Mlmx0gVsBMwbnMkSQ9LhKrCKXfIEs8Tqu+lBh ERjSbDdhvo/fPue5Up2ifZq4u+LpArx1sL7Fh/ly3jT03RebC+8DKvE/klkgjKZXlNLg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/cpuid: Advertise SERIALIZE by default to guests Message-Id: Date: Thu, 16 Dec 2021 21:58:48 +0000 commit 4feacc95265a3d786753ed1532c77eb382630f78 Author: Andrew Cooper AuthorDate: Tue Dec 14 20:04:17 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Advertise SERIALIZE by default to guests I've played with SERIALIZE, TSXLDTRK, MOVDIRI and MOVDIR64 on real hardware, and they all seem fine, including emulation support. SERIALIZE exists specifically to have a userspace usable serialising operation without other side effects. (The only other two choices are CPUID which is a VMExit under virt and clobbers 4 registers, and IRET-to-self which very slow and consumes content from the stack.) TSXLDTRK is a niche TSX feature, and TSX itself is niche outside of demos of speculative sidechannels. Leave the feature opt-in until a usecase is found, in an effort to preempt the multiple person years of effort it has taken to mop up TSX issues impacting every processor line. MOVDIRI and MOVDIR64 are harder to judge. They're architectural building blocks towards ENQCMD{,S} without obvious usecases on their own. They're of no use to domains without PCI devices, so leave them opt-in for now. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/include/public/arch-x86/cpufeatureset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 647ee9e5e2..0b39937556 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -278,7 +278,7 @@ XEN_CPUFEATURE(SRBDS_CTRL, 9*32+ 9) /* MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ XEN_CPUFEATURE(RTM_ALWAYS_ABORT, 9*32+11) /*! June 2021 TSX defeaturing in microcode. */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ -XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*a SERIALIZE insn */ +XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*A SERIALIZE insn */ XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 22:55:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 22:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248325.428335 (Exim 4.92) (envelope-from ) id 1mxzeU-00055o-8s; Thu, 16 Dec 2021 22:55:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248325.428335; Thu, 16 Dec 2021 22:55:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxzeU-00055g-5y; Thu, 16 Dec 2021 22:55:06 +0000 Received: by outflank-mailman (input) for mailman id 248325; Thu, 16 Dec 2021 22:55:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxzeS-00055a-Q8 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 22:55:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxzeS-0001n1-N2 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 22:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxzeS-0001dv-M8 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 22:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YdlqW+mrypzbH6xi/RjANIUIAMfIWMREAs4M0d2yz1w=; b=NeL2uHr1nCQKwLHesdWBlCp1kO ilPadxv6gTiVB3xp17vHO4kZblfPqXZvYeESjm3jJQ2LM8IFNAm9hZEMT5l5Lk7u21eRg0+xuyAQq Cmd60Ex+f5ibvvjtlYmH5rZZ18A/xXHhJhk/VWDQZtyeyMjs+vuNew5ZuOq+1N8JB83c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm: increase memory banks number define value Message-Id: Date: Thu, 16 Dec 2021 22:55:04 +0000 commit f1f38e26c3669f5e4583c3756f213c167d19651a Author: Luca Fancellu AuthorDate: Thu Dec 16 14:43:19 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Dec 16 14:43:19 2021 -0800 xen/arm: increase memory banks number define value Currently the maximum number of memory banks (NR_MEM_BANKS define) is fixed to 128, but on some new platforms that have a large amount of memory, this value is not enough and prevents Xen from booting. Increase the value to 256. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/setup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 88d9673db8..7a1e1d6798 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -8,7 +8,7 @@ #define MIN_FDT_ALIGN 8 #define MAX_FDT_SIZE SZ_2M -#define NR_MEM_BANKS 128 +#define NR_MEM_BANKS 256 #define MAX_MODULES 32 /* Current maximum useful modules */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 22:55:17 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 22:55:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248326.428339 (Exim 4.92) (envelope-from ) id 1mxzee-00057h-Ai; Thu, 16 Dec 2021 22:55:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248326.428339; Thu, 16 Dec 2021 22:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxzee-00057Z-7N; Thu, 16 Dec 2021 22:55:16 +0000 Received: by outflank-mailman (input) for mailman id 248326; Thu, 16 Dec 2021 22:55:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxzec-00057M-RA for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 22:55:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mxzec-0001n7-QJ for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 22:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mxzec-0001eW-PG for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 22:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ez55xETggud5OoW67yS1ZSvg8Y6c97WevC/49aj7ZYE=; b=bVqM+6mjFrWMXldsRCk6f6U7AJ pjzgECt7xOZQekyQEsQw+KRWTyFU3M6QnfeSfUBgipvY9X7bbEvwF9u30GNnOt7l2duoKkBFmfh2m ylGonm+F6tNyF5Ax1No2rtWdxYqIZa6+pcn1lrPqNKVFXtX441sBXA2ey3t9XStA4oRk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] arm/efi: Handle Xen bootargs from both xen.cfg and DT Message-Id: Date: Thu, 16 Dec 2021 22:55:14 +0000 commit f3999bc2e099c571e4583bff8f494b834b2f5f76 Author: Luca Fancellu AuthorDate: Mon Dec 13 11:48:54 2021 +0000 Commit: Stefano Stabellini CommitDate: Thu Dec 16 14:43:34 2021 -0800 arm/efi: Handle Xen bootargs from both xen.cfg and DT Currently the Xen UEFI stub can accept Xen boot arguments from the Xen configuration file using the "options=" keyword, but also directly from the device tree specifying xen,xen-bootargs property. When the configuration file is used, device tree boot arguments are ignored and overwritten even if the keyword "options=" is not used. This patch handle this case, so if the Xen configuration file is not specifying boot arguments, the device tree boot arguments will be used, if they are present. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- docs/misc/efi.pandoc | 4 ++++ xen/arch/arm/efi/efi-boot.h | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index abafb34527..71fdc316b6 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -249,6 +249,10 @@ UEFI stub for module loading. When adding DomU modules to device tree, also add the property xen,uefi-cfg-load under chosen for Xen to load the Xen config file. Otherwise, Xen will skip the config file and rely on device tree alone. +When using the Xen configuration file in conjunction with the device tree, you +can specify the Xen boot arguments in the configuration file with the "options=" +keyword or in the device tree with the "xen,xen-bootargs" property, but be +aware that the Xen configuration file value has a precedence over the DT value. Example 1 of how to boot a true dom0less configuration: diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 4fb345f225..ae8627134e 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -503,11 +503,26 @@ static void __init efi_arch_handle_cmdline(CHAR16 *image_name, if ( cfgfile_options ) { + PrintMessage(L"Using bootargs from Xen configuration file."); prop_len += snprintf(buf + prop_len, EFI_PAGE_SIZE - prop_len, " %s", cfgfile_options); if ( prop_len >= EFI_PAGE_SIZE ) blexit(L"FDT string overflow"); } + else + { + /* Get xen,xen-bootargs in /chosen if it is specified */ + const char *dt_bootargs_prop = fdt_getprop(fdt, chosen, + "xen,xen-bootargs", NULL); + if ( dt_bootargs_prop ) + { + PrintMessage(L"Using bootargs from device tree."); + prop_len += snprintf(buf + prop_len, EFI_PAGE_SIZE - prop_len, + " %s", dt_bootargs_prop); + if ( prop_len >= EFI_PAGE_SIZE ) + blexit(L"FDT string overflow"); + } + } if ( cmdline_options ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:33:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:33:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248327.428343 (Exim 4.92) (envelope-from ) id 1my0FD-0000xL-U9; Thu, 16 Dec 2021 23:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248327.428343; Thu, 16 Dec 2021 23:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FD-0000xD-RJ; Thu, 16 Dec 2021 23:33:03 +0000 Received: by outflank-mailman (input) for mailman id 248327; Thu, 16 Dec 2021 23:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FC-0000x7-Gp for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FC-0002Rh-EO for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0FC-0004Gj-Cu for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=P4loYE6f3W2tPSZ30PWrpDQW8vbAio8RyZEbkh8xZTI=; b=lFYF6duFVBog5Q2Qr4zZq/KyuJ 1Zrty5V6E7UxGjUiU0LRHJC2DU8e2OraNlYb6kNf2kVN/QBBVwC43ci3sk5Bynheg0x0BxTf3C6Tp 8KvOUyLrG2eldwTtGePZ3bf0aBw8XlkvX5cYr6frso4IHzwZ981g9FZlnklX9Zsp43GE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vpci: fix function attributes for vpci_process_pending Message-Id: Date: Thu, 16 Dec 2021 23:33:02 +0000 commit 7dc0233f534f64e7f3ee71e74e05dd5ab8a24808 Author: Oleksandr Andrushchenko AuthorDate: Tue Dec 14 09:44:44 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:44:44 2021 +0100 vpci: fix function attributes for vpci_process_pending vpci_process_pending is defined with different attributes, e.g. with __must_check if CONFIG_HAS_VPCI enabled and not otherwise. Fix this by defining both of the definitions with __must_check. Fixes: 14583a590783 ("7fbb096bf345 kconfig: don't select VPCI if building a shim-only binary") Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall Reviewed-by: Roger Pau Monné --- xen/include/xen/vpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 9ea66e033f..3f32de9d7e 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -247,7 +247,7 @@ static inline void vpci_write(pci_sbdf_t sbdf, unsigned int reg, ASSERT_UNREACHABLE(); } -static inline bool vpci_process_pending(struct vcpu *v) +static inline bool __must_check vpci_process_pending(struct vcpu *v) { ASSERT_UNREACHABLE(); return false; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:33:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248328.428346 (Exim 4.92) (envelope-from ) id 1my0FN-0000zG-Vb; Thu, 16 Dec 2021 23:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248328.428346; Thu, 16 Dec 2021 23:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FN-0000zB-Sm; Thu, 16 Dec 2021 23:33:13 +0000 Received: by outflank-mailman (input) for mailman id 248328; Thu, 16 Dec 2021 23:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FM-0000yv-Ij for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FM-0002Rm-Ht for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0FM-0004Hc-Gg for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=F0/J51wAuT94G7/YZiJq2WeNkSBR6T8Dwx8/VO/fM7A=; b=fWXK4oV3o+iuIK7KFIbLuxg5d4 dc1ghMYxlWXOwv5X8sE9bZzPM59u7fa9aY4fzXSgj++MGPXHw1D00kEEW/dyEiGxsizoupfpG1URZ e+OxQeDOAqfHyRTCWYHzbc544WbPB0XRMc+SfiFOUs7Z6yw47reqqFkTA3cxYuxbVTrM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/monitor: don't open-code hvm_has_set_descriptor_access_exiting() Message-Id: Date: Thu, 16 Dec 2021 23:33:12 +0000 commit 53ed194539ddbea4f6aecb1b7c2f33aa8c0201d9 Author: Jan Beulich AuthorDate: Tue Dec 14 09:46:48 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:46:48 2021 +0100 x86/monitor: don't open-code hvm_has_set_descriptor_access_exiting() Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed by: Alexandru Isaila --- xen/arch/x86/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c index bbcb7536c7..40d2673707 100644 --- a/xen/arch/x86/monitor.c +++ b/xen/arch/x86/monitor.c @@ -263,7 +263,7 @@ int arch_monitor_domctl_event(struct domain *d, if ( unlikely(old_status == requested_status) ) return -EEXIST; - if ( !hvm_funcs.set_descriptor_access_exiting ) + if ( !hvm_has_set_descriptor_access_exiting() ) return -EOPNOTSUPP; domain_pause(d); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:33:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248329.428351 (Exim 4.92) (envelope-from ) id 1my0FY-00012T-1N; Thu, 16 Dec 2021 23:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248329.428351; Thu, 16 Dec 2021 23:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FX-00012J-UK; Thu, 16 Dec 2021 23:33:23 +0000 Received: by outflank-mailman (input) for mailman id 248329; Thu, 16 Dec 2021 23:33:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FW-000121-Lp for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0FW-0002S7-L4 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0FW-0004IU-K3 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5PCsqLAV4/rCGnGLaqe1OGZxbQ47P0YH6Ep5PP3cjIE=; b=WzxLa7O+blKAZhtg6SpxHasYUW RoT1lHZqzYJEmJUMj4AAnPNx2LduO1wvwXcygM48aEdxZEOZ7opge0i4m1+7dbpo+dZEO/RKgP5z/ f6/d+2Eky+lmCVLV9rOfq/SQk16/UDQUq6uz8gL7J7+9F2SJuE7FX2sNOD5DUqDkpFNg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] SUPPORT.md: limit security support for hosts with very much memory Message-Id: Date: Thu, 16 Dec 2021 23:33:22 +0000 commit c49ee0329ff3de98722fd74ed5ba6d9665701e54 Author: Jan Beulich AuthorDate: Tue Dec 14 09:47:31 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:47:31 2021 +0100 SUPPORT.md: limit security support for hosts with very much memory Sufficient and in particular regular testing on very large hosts cannot currently be guaranteed. Anyone wanting us to support larger hosts is free to propose so, but will need to supply not only test results, but also a test plan. This is a follow-up to XSA-385. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Julien Grall --- SUPPORT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 3a34933c89..3a1fd1ba39 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -48,6 +48,12 @@ For the Cortex A57 r0p0 - r1p1, see Errata 832075. Status, x86: Supported +### Physical Memory + + Status: Supported up to 8 TiB + +Hosts with more memory are supported, but not security supported. + ### Physical Memory Hotplug Status, x86: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:33:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248330.428356 (Exim 4.92) (envelope-from ) id 1my0Fi-000153-3X; Thu, 16 Dec 2021 23:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248330.428356; Thu, 16 Dec 2021 23:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Fh-00014n-Vt; Thu, 16 Dec 2021 23:33:33 +0000 Received: by outflank-mailman (input) for mailman id 248330; Thu, 16 Dec 2021 23:33:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Fg-00014Z-QG for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Fg-0002SJ-PS for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Fg-0004K7-OP for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6xO6jsJq5cqSTtM/5OQx1zo9a2Dy1B2f8Tm2vnzwcgY=; b=d4B/vluRXQYEViajkgGbXp4fXm uda6sktl1lK7ljo+nUpQnRveW067oU7FKfC54gg+KAdmq2myYTNd1VhVQpLqFh4/TYWiIxZjOkR+3 qjR95EBmYjnUGEedycpApawK0kUi/HP323bfgugDBImFaS8u+ug/GXjQpv3V3PMTsOGQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: drop "seg" parameter from insn_fetch() hook Message-Id: Date: Thu, 16 Dec 2021 23:33:32 +0000 commit 7b99e7258559c9caa235d9faf323b22c68e4a581 Author: Jan Beulich AuthorDate: Tue Dec 14 09:48:17 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:48:17 2021 +0100 x86emul: drop "seg" parameter from insn_fetch() hook This is specified (and asserted for in a number of places) to always be CS. Passing this as an argument in various places is therefore pointless. The price to pay is two simple new functions, with the benefit of the PTWR case now gaining a more appropriate error code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Paul Durrant --- tools/fuzz/x86_instruction_emulator/fuzz-emul.c | 5 +---- tools/tests/x86_emulator/predicates.c | 6 ++---- tools/tests/x86_emulator/test_x86_emulator.c | 3 +-- tools/tests/x86_emulator/x86-emulate.h | 3 +-- xen/arch/x86/hvm/emulate.c | 3 +-- xen/arch/x86/mm/shadow/hvm.c | 7 ++----- xen/arch/x86/pv/emul-gate-op.c | 8 +++++++- xen/arch/x86/pv/emul-priv-op.c | 5 +---- xen/arch/x86/pv/ro-page-fault.c | 21 ++++++++++++++++++--- xen/arch/x86/x86_emulate/x86_emulate.c | 13 ++++++------- xen/arch/x86/x86_emulate/x86_emulate.h | 8 +++----- xen/include/asm-x86/hvm/emulate.h | 3 +-- 12 files changed, 44 insertions(+), 41 deletions(-) diff --git a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c index 28285aad24..966e46bee1 100644 --- a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c +++ b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c @@ -197,14 +197,11 @@ static int fuzz_read_io( } static int fuzz_insn_fetch( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { - assert(seg == x86_seg_cs); - /* Minimal segment limit checking, until full one is being put in place. */ if ( ctxt->addr_size < 64 && (offset >> 32) ) { @@ -222,7 +219,7 @@ static int fuzz_insn_fetch( return maybe_fail(ctxt, "insn_fetch", true); } - return data_read(ctxt, seg, "insn_fetch", p_data, bytes); + return data_read(ctxt, x86_seg_cs, "insn_fetch", p_data, bytes); } static int _fuzz_rep_read(struct x86_emulate_ctxt *ctxt, diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 94b99c94e8..4760f19bf2 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2049,8 +2049,7 @@ static void print_insn(const uint8_t *instr, unsigned int len) void do_test(uint8_t *instr, unsigned int len, unsigned int modrm, enum mem_access mem, struct x86_emulate_ctxt *ctxt, - int (*fetch)(enum x86_segment seg, - unsigned long offset, + int (*fetch)(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)) @@ -2110,8 +2109,7 @@ void do_test(uint8_t *instr, unsigned int len, unsigned int modrm, } void predicates_test(void *instr, struct x86_emulate_ctxt *ctxt, - int (*fetch)(enum x86_segment seg, - unsigned long offset, + int (*fetch)(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 9b3e98a1a5..ac250c11c4 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -594,14 +594,13 @@ static int read( } static int fetch( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { if ( verbose ) - printf("** %s(%u, %p,, %u,)\n", __func__, seg, (void *)offset, bytes); + printf("** %s(CS:%p,, %u,)\n", __func__, (void *)offset, bytes); memcpy(p_data, (void *)offset, bytes); return X86EMUL_OKAY; diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index e1a2aaef68..7f60ef9e89 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -105,8 +105,7 @@ WRAP(puts); void evex_disp8_test(void *instr, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops); void predicates_test(void *instr, struct x86_emulate_ctxt *ctxt, - int (*fetch)(enum x86_segment seg, - unsigned long offset, + int (*fetch)(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)); diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 76a2ccfafe..dd59ad89be 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1294,7 +1294,6 @@ static int hvmemul_read( } int hvmemul_insn_fetch( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, @@ -1312,7 +1311,7 @@ int hvmemul_insn_fetch( if ( !bytes || unlikely((insn_off + bytes) > hvmemul_ctxt->insn_buf_bytes) ) { - int rc = __hvmemul_read(seg, offset, p_data, bytes, + int rc = __hvmemul_read(x86_seg_cs, offset, p_data, bytes, hvm_access_insn_fetch, hvmemul_ctxt); if ( rc == X86EMUL_OKAY && bytes ) diff --git a/xen/arch/x86/mm/shadow/hvm.c b/xen/arch/x86/mm/shadow/hvm.c index d5f42102a0..f2991bc176 100644 --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -162,8 +162,7 @@ hvm_emulate_read(enum x86_segment seg, } static int -hvm_emulate_insn_fetch(enum x86_segment seg, - unsigned long offset, +hvm_emulate_insn_fetch(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) @@ -172,11 +171,9 @@ hvm_emulate_insn_fetch(enum x86_segment seg, container_of(ctxt, struct sh_emulate_ctxt, ctxt); unsigned int insn_off = offset - sh_ctxt->insn_buf_eip; - ASSERT(seg == x86_seg_cs); - /* Fall back if requested bytes are not in the prefetch cache. */ if ( unlikely((insn_off + bytes) > sh_ctxt->insn_buf_bytes) ) - return hvm_read(seg, offset, p_data, bytes, + return hvm_read(x86_seg_cs, offset, p_data, bytes, hvm_access_insn_fetch, sh_ctxt); /* Hit the cache. Simple memcpy. */ diff --git a/xen/arch/x86/pv/emul-gate-op.c b/xen/arch/x86/pv/emul-gate-op.c index 43d847abd0..68ec4d11f6 100644 --- a/xen/arch/x86/pv/emul-gate-op.c +++ b/xen/arch/x86/pv/emul-gate-op.c @@ -163,6 +163,12 @@ static int read_mem(enum x86_segment seg, unsigned long offset, void *p_data, return X86EMUL_OKAY; } +static int fetch(unsigned long offset, void *p_data, + unsigned int bytes, struct x86_emulate_ctxt *ctxt) +{ + return read_mem(x86_seg_cs, offset, p_data, bytes, ctxt); +} + void pv_emulate_gate_op(struct cpu_user_regs *regs) { struct vcpu *v = current; @@ -205,7 +211,7 @@ void pv_emulate_gate_op(struct cpu_user_regs *regs) ctxt.ctxt.addr_size = ar & _SEGMENT_DB ? 32 : 16; /* Leave zero in ctxt.ctxt.sp_size, as it's not needed for decoding. */ - state = x86_decode_insn(&ctxt.ctxt, read_mem); + state = x86_decode_insn(&ctxt.ctxt, fetch); ctxt.insn_fetch = false; if ( IS_ERR_OR_NULL(state) ) { diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 8ba65178e9..c78be6d92b 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1258,8 +1258,7 @@ static int validate(const struct x86_emulate_state *state, return X86EMUL_UNHANDLEABLE; } -static int insn_fetch(enum x86_segment seg, - unsigned long offset, +static int insn_fetch(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) @@ -1269,8 +1268,6 @@ static int insn_fetch(enum x86_segment seg, unsigned int rc; unsigned long addr = poc->cs.base + offset; - ASSERT(seg == x86_seg_cs); - /* We don't mean to emulate any branches. */ if ( !bytes ) return X86EMUL_UNHANDLEABLE; diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index ac5b66870c..ef4d146c1d 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -52,6 +52,21 @@ static int ptwr_emulated_read(enum x86_segment seg, unsigned long offset, return X86EMUL_OKAY; } +static int ptwr_emulated_insn_fetch(unsigned long offset, + void *p_data, unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + unsigned int rc = copy_from_guest_pv(p_data, (void *)offset, bytes); + + if ( rc ) + { + x86_emul_pagefault(PFEC_insn_fetch, offset + bytes - rc, ctxt); + return X86EMUL_EXCEPTION; + } + + return X86EMUL_OKAY; +} + /* * p_old being NULL indicates a plain write to occur, while a non-NULL * input requests a CMPXCHG-based update. @@ -247,7 +262,7 @@ static int ptwr_emulated_cmpxchg(enum x86_segment seg, unsigned long offset, static const struct x86_emulate_ops ptwr_emulate_ops = { .read = ptwr_emulated_read, - .insn_fetch = ptwr_emulated_read, + .insn_fetch = ptwr_emulated_insn_fetch, .write = ptwr_emulated_write, .cmpxchg = ptwr_emulated_cmpxchg, .validate = pv_emul_is_mem_write, @@ -290,14 +305,14 @@ static int ptwr_do_page_fault(struct x86_emulate_ctxt *ctxt, static const struct x86_emulate_ops mmio_ro_emulate_ops = { .read = x86emul_unhandleable_rw, - .insn_fetch = ptwr_emulated_read, + .insn_fetch = ptwr_emulated_insn_fetch, .write = mmio_ro_emulated_write, .validate = pv_emul_is_mem_write, }; static const struct x86_emulate_ops mmcfg_intercept_ops = { .read = x86emul_unhandleable_rw, - .insn_fetch = ptwr_emulated_read, + .insn_fetch = ptwr_emulated_insn_fetch, .write = mmcfg_intercept_write, .validate = pv_emul_is_mem_write, }; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 069acde517..5b43bda239 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1295,7 +1295,7 @@ static inline int mkec(uint8_t e, int32_t ec, ...) generate_exception_if((uint8_t)(state->ip - \ ctxt->regs->r(ip)) > MAX_INST_LEN, \ EXC_GP, 0); \ - rc = ops->insn_fetch(x86_seg_cs, _ip, &_x, (_size), ctxt); \ + rc = ops->insn_fetch(_ip, &_x, _size, ctxt); \ if ( rc ) goto done; \ _x; \ }) @@ -1363,7 +1363,7 @@ do { \ ip = (uint16_t)ip; \ else if ( !mode_64bit() ) \ ip = (uint32_t)ip; \ - rc = ops->insn_fetch(x86_seg_cs, ip, NULL, 0, ctxt); \ + rc = ops->insn_fetch(ip, NULL, 0, ctxt); \ if ( rc ) goto done; \ _regs.r(ip) = ip; \ singlestep = _regs.eflags & X86_EFLAGS_TF; \ @@ -4740,7 +4740,7 @@ x86_emulate( ? 8 : op_bytes; if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + src.val), &dst.val, op_bytes, ctxt, ops)) != 0 || - (rc = ops->insn_fetch(x86_seg_cs, dst.val, NULL, 0, ctxt)) ) + (rc = ops->insn_fetch(dst.val, NULL, 0, ctxt)) ) goto done; _regs.r(ip) = dst.val; adjust_bnd(ctxt, ops, vex.pfx); @@ -5628,14 +5628,14 @@ x86_emulate( break; case 2: /* call (near) */ dst.val = _regs.r(ip); - if ( (rc = ops->insn_fetch(x86_seg_cs, src.val, NULL, 0, ctxt)) ) + if ( (rc = ops->insn_fetch(src.val, NULL, 0, ctxt)) ) goto done; _regs.r(ip) = src.val; src.val = dst.val; adjust_bnd(ctxt, ops, vex.pfx); goto push; case 4: /* jmp (near) */ - if ( (rc = ops->insn_fetch(x86_seg_cs, src.val, NULL, 0, ctxt)) ) + if ( (rc = ops->insn_fetch(src.val, NULL, 0, ctxt)) ) goto done; _regs.r(ip) = src.val; dst.type = OP_NONE; @@ -12220,8 +12220,7 @@ struct x86_emulate_state * x86_decode_insn( struct x86_emulate_ctxt *ctxt, int (*insn_fetch)( - enum x86_segment seg, unsigned long offset, - void *p_data, unsigned int bytes, + unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)) { static DEFINE_PER_CPU(struct x86_emulate_state, state); diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index d8fb3a9909..419def8790 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -254,13 +254,12 @@ struct x86_emulate_ops /* * insn_fetch: Emulate fetch from instruction byte stream. - * Except for @bytes, all parameters are the same as for 'read'. + * Except for @bytes and missing @seg, all parameters are the same as for + * 'read'. * @bytes: Access length (0 <= @bytes < 16, with zero meaning * "validate address only"). - * @seg is always x86_seg_cs. */ int (*insn_fetch)( - enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, @@ -750,8 +749,7 @@ struct x86_emulate_state * x86_decode_insn( struct x86_emulate_ctxt *ctxt, int (*insn_fetch)( - enum x86_segment seg, unsigned long offset, - void *p_data, unsigned int bytes, + unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt)); unsigned int diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 610078b28f..e670040603 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -92,8 +92,7 @@ static inline bool handle_mmio(void) return hvm_emulate_one_insn(x86_insn_is_mem_access, "MMIO"); } -int hvmemul_insn_fetch(enum x86_segment seg, - unsigned long offset, +int hvmemul_insn_fetch(unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:33:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248331.428359 (Exim 4.92) (envelope-from ) id 1my0Fs-00017x-4x; Thu, 16 Dec 2021 23:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248331.428359; Thu, 16 Dec 2021 23:33:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Fs-00017p-1U; Thu, 16 Dec 2021 23:33:44 +0000 Received: by outflank-mailman (input) for mailman id 248331; Thu, 16 Dec 2021 23:33:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Fq-00017e-TY for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Fq-0002ST-Sn for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Fq-0004Ks-Rq for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bWTwcS1Mp8p/Ll/W92TmafQVpKvmFQjL+hl0pAbA+qI=; b=bbX2zzKoeXWeS4Tnr6ghoMq8le 9nwZIm+sPkAjEjpnIEXTfuOMWCFo+cS0MhCeDtLbHmeEaSX1oxDfSoM1VM9OwL2n0SF83ar4UeD80 xUX0FGolwNJcdUsz1rSI+Cgez0+p8zdir/PlspAljykQLrQ+yD1VezrD824v/S3Plsfg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/perfc: add hypercall performance counters for hvm, correct pv Message-Id: Date: Thu, 16 Dec 2021 23:33:42 +0000 commit 668dd44902bbaf52f8e7214e0da060b6ec962e88 Author: Juergen Gross AuthorDate: Tue Dec 14 09:49:23 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:49:23 2021 +0100 x86/perfc: add hypercall performance counters for hvm, correct pv The HVM hypercall handler is missing incrementing the per hypercall counters. Add that. The counters for PV are handled wrong, as they are not using perf_incra() with the number of the hypercall as index, but are incrementing the first hypercall entry (set_trap_table) for each hypercall. Fix that. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hypercall.c | 2 ++ xen/arch/x86/pv/hypercall.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 1f04ffb272..c4e5c34c37 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -325,6 +325,8 @@ int hvm_hypercall(struct cpu_user_regs *regs) ioreq_signal_mapcache_invalidate(); } + perfc_incra(hypercalls, eax); + return curr->hcall_preempted ? HVM_HCALL_preempted : HVM_HCALL_completed; } diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 16a77e3a35..ecdd58deea 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -238,7 +238,7 @@ _pv_hypercall(struct cpu_user_regs *regs, bool compat) if ( curr->hcall_preempted ) regs->rip -= 2; - perfc_incr(hypercalls); + perfc_incra(hypercalls, eax); } enum mc_disposition pv_do_multicall_call(struct mc_state *state) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:33:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:33:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248332.428363 (Exim 4.92) (envelope-from ) id 1my0G2-0001BY-8A; Thu, 16 Dec 2021 23:33:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248332.428363; Thu, 16 Dec 2021 23:33:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0G2-0001BQ-56; Thu, 16 Dec 2021 23:33:54 +0000 Received: by outflank-mailman (input) for mailman id 248332; Thu, 16 Dec 2021 23:33:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0G1-0001B7-0f for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0G0-0002Sd-W1 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0G0-0004Li-V4 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:33:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d1QNdQKxr7dbw5sD3N7ZslEOiwN82MfrVnqMWT3YfTQ=; b=oUq0LUkza4VEiIFItL91UvgJM/ TShA8bcM5Bca5Yex08IMh66Nbqtyc/4Ev/xpji+oiHvc9x5OegMpgiiAqZbIL6qrVGCWciM6bK9MO 6zLa/f4cOeFPXAYk/eH/WJk9IjUXBRGVstrAbnkKUGaTUqC3ZasT/Hk5O8EL9Rgsw2Qc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] perfc: drop calls_to_multicall performance counter Message-Id: Date: Thu, 16 Dec 2021 23:33:52 +0000 commit 1382241fe880d48e109f2056cec052bb3919a9d1 Author: Juergen Gross AuthorDate: Tue Dec 14 09:50:07 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 14 09:50:07 2021 +0100 perfc: drop calls_to_multicall performance counter The calls_to_multicall performance counter is basically redundant to the multicall hypercall counter. The only difference is the counting of continuation calls, which isn't really that interesting. Drop the calls_to_multicall performance counter. Suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/common/multicall.c | 1 - xen/include/xen/perfc_defn.h | 1 - 2 files changed, 2 deletions(-) diff --git a/xen/common/multicall.c b/xen/common/multicall.c index 5a199ebf8f..794638392b 100644 --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -113,7 +113,6 @@ do_multicall( if ( unlikely(disp == mc_preempt) && i < nr_calls ) goto preempted; - perfc_incr(calls_to_multicall); perfc_add(calls_from_multicall, i); mcs->flags = 0; return rc; diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 13486d3ed9..672b51c456 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -6,7 +6,6 @@ PERFCOUNTER_ARRAY(hypercalls, "hypercalls", NR_hypercalls) -PERFCOUNTER(calls_to_multicall, "calls to multicall") PERFCOUNTER(calls_from_multicall, "calls from multicall") PERFCOUNTER(irqs, "#interrupts") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:34:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:34:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248333.428367 (Exim 4.92) (envelope-from ) id 1my0GD-0001EO-9Q; Thu, 16 Dec 2021 23:34:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248333.428367; Thu, 16 Dec 2021 23:34:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GD-0001EG-6X; Thu, 16 Dec 2021 23:34:05 +0000 Received: by outflank-mailman (input) for mailman id 248333; Thu, 16 Dec 2021 23:34:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GB-0001Dv-4K for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GB-0002TG-3W for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0GB-0004Mu-2i for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fpr08emJ9RdInG+se5qxkv4LQc76/3e3QZZWGkj0ap4=; b=kobxjJR2PxfmN2otme5tmo/BgV YtuC7iY9B2fc82AGFkRYj7poVt+46zScEZ1bxRv32BvJ8sbb3AVu1RkygLCVLKpm5/Em8lMSvNn0g shL1/Vyi4+MeKQJ/q+hz9rFmKZWkSohc+CVBOHvClrgS2yXtExkxGQFTRIDqck9PQXzs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: Fix TSXLDTRK definition Message-Id: Date: Thu, 16 Dec 2021 23:34:03 +0000 commit 249e0f1d8f203188ccdcced5a05c2149739e1566 Author: Andrew Cooper AuthorDate: Mon Dec 13 20:33:42 2021 +0000 Commit: Andrew Cooper CommitDate: Tue Dec 14 12:30:48 2021 +0000 x86/cpuid: Fix TSXLDTRK definition TSXLDTRK lives in CPUID leaf 7[0].edx, not 7[0].ecx. Bit 16 in ecx is LA57. Fixes: a6d1b558471f ("x86emul: support X{SUS,RES}LDTRK") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/libs/light/libxl_cpuid.c | 2 +- tools/misc/xen-cpuid.c | 3 +-- xen/arch/x86/x86_emulate/x86_emulate.c | 2 +- xen/include/public/arch-x86/cpufeatureset.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_cpuid.c b/tools/libs/light/libxl_cpuid.c index 815498d4f3..e1acf6648d 100644 --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -209,7 +209,6 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-vnni", 0x00000007, 0, CPUID_REG_ECX, 11, 1}, {"avx512-bitalg",0x00000007, 0, CPUID_REG_ECX, 12, 1}, {"avx512-vpopcntdq",0x00000007,0,CPUID_REG_ECX, 14, 1}, - {"tsxldtrk", 0x00000007, 0, CPUID_REG_ECX, 16, 1}, {"rdpid", 0x00000007, 0, CPUID_REG_ECX, 22, 1}, {"cldemote", 0x00000007, 0, CPUID_REG_ECX, 25, 1}, @@ -220,6 +219,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"srbds-ctrl", 0x00000007, 0, CPUID_REG_EDX, 9, 1}, {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, {"serialize", 0x00000007, 0, CPUID_REG_EDX, 14, 1}, + {"tsxldtrk", 0x00000007, 0, CPUID_REG_EDX, 16, 1}, {"cet-ibt", 0x00000007, 0, CPUID_REG_EDX, 20, 1}, {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 9b59fec263..fb36cac07b 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -128,7 +128,6 @@ static const char *const str_7c0[32] = [10] = "vpclmulqdq", [11] = "avx512-vnni", [12] = "avx512-bitalg", [14] = "avx512-vpopcntdq", - [16] = "tsxldtrk", [22] = "rdpid", /* 24 */ [25] = "cldemote", @@ -172,7 +171,7 @@ static const char *const str_7d0[32] = [10] = "md-clear", [11] = "rtm-always-abort", /* 12 */ [13] = "tsx-force-abort", [14] = "serialize", - + [16] = "tsxldtrk", [18] = "pconfig", [20] = "cet-ibt", diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5b43bda239..824af9d899 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2000,7 +2000,6 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_vnni() (ctxt->cpuid->feat.avx512_vnni) #define vcpu_has_avx512_bitalg() (ctxt->cpuid->feat.avx512_bitalg) #define vcpu_has_avx512_vpopcntdq() (ctxt->cpuid->feat.avx512_vpopcntdq) -#define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_movdiri() (ctxt->cpuid->feat.movdiri) #define vcpu_has_movdir64b() (ctxt->cpuid->feat.movdir64b) @@ -2009,6 +2008,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) #define vcpu_has_avx512_vp2intersect() (ctxt->cpuid->feat.avx512_vp2intersect) #define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) +#define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_avx_vnni() (ctxt->cpuid->feat.avx_vnni) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index d6260c801a..647ee9e5e2 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -239,7 +239,6 @@ XEN_CPUFEATURE(VPCLMULQDQ, 6*32+10) /*A Vector Carry-less Multiplication Ins XEN_CPUFEATURE(AVX512_VNNI, 6*32+11) /*A Vector Neural Network Instrs */ XEN_CPUFEATURE(AVX512_BITALG, 6*32+12) /*A Support for VPOPCNT[B,W] and VPSHUFBITQMB */ XEN_CPUFEATURE(AVX512_VPOPCNTDQ, 6*32+14) /*A POPCNT for vectors of DW/QW */ -XEN_CPUFEATURE(TSXLDTRK, 6*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ @@ -280,6 +279,7 @@ XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffe XEN_CPUFEATURE(RTM_ALWAYS_ABORT, 9*32+11) /*! June 2021 TSX defeaturing in microcode. */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*a SERIALIZE insn */ +XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:34:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:34:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248334.428371 (Exim 4.92) (envelope-from ) id 1my0GN-0001H8-Ay; Thu, 16 Dec 2021 23:34:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248334.428371; Thu, 16 Dec 2021 23:34:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GN-0001H0-7y; Thu, 16 Dec 2021 23:34:15 +0000 Received: by outflank-mailman (input) for mailman id 248334; Thu, 16 Dec 2021 23:34:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GL-0001GV-7c for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GL-0002TQ-6p for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0GL-0004Nr-5q for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DeYT1YGJT9f3eGb2UJKIt+sbpOSeRsx8meeLNQW7SSs=; b=hspSCERXCNwH9nMqScUM/vDu4l T4nnBVQo6N39p+Ki3jk4QBvJQg2SBQbXLTWxE+qKwWdm+2SFfFXjquWT26QRz6LwKqB1bZk6nwKvt mUY/jhN8oIUGVKo7iwZC6CyY7Y4yv0O4r0iHR8fSc4Q0APD6A7KUx2t3COPy1UD048kw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: factorise generation of the linker scripts Message-Id: Date: Thu, 16 Dec 2021 23:34:13 +0000 commit 72f12ac6a36d5aa0567fd7abc2856e3bf054c4ef Author: Anthony PERARD AuthorDate: Wed Dec 15 10:08:38 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:08:38 2021 +0100 build: factorise generation of the linker scripts In Arm and X86 makefile, generating the linker script is the same, so we can simply have both call the same macro. We need to add *.lds files into extra-y so that Rules.mk can find the .*.cmd dependency file and load it. Change made to the command line: - Use cpp_flags macro which simply filter -Wa,% options from $(a_flags). - Added -D__LINKER__ even it is only used by Arm's lds. Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/Rules.mk | 4 ++++ xen/arch/arm/Makefile | 6 ++++-- xen/arch/x86/Makefile | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 5e0699e58b..d21930a7bf 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -238,6 +238,10 @@ cmd_cpp_s_S = $(CPP) $(call cpp_flags,$(a_flags)) -MQ $@ -o $@ $< %.s: %.S FORCE $(call if_changed,cpp_s_S) +# Linker scripts, .lds.S -> .lds +quiet_cmd_cpp_lds_S = LDS $@ +cmd_cpp_lds_S = $(CPP) -P $(call cpp_flags,$(a_flags)) -D__LINKER__ -MQ $@ -o $@ $< + # Add intermediate targets: # When building objects with specific suffix patterns, add intermediate # targets that the final targets are derived from. diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 07f634508e..a3a497bafe 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -67,6 +67,8 @@ obj-y += vsmc.o obj-y += vpsci.o obj-y += vuart.o +extra-y += xen.lds + #obj-bin-y += ....o ifneq ($(CONFIG_DTB_FILE),"") @@ -132,8 +134,8 @@ $(TARGET)-syms: prelink.o xen.lds .PHONY: include include: -xen.lds: xen.lds.S - $(CPP) -P $(a_flags) -D__LINKER__ -MQ $@ -o $@ $< +xen.lds: xen.lds.S FORCE + $(call if_changed,cpp_lds_S) dtb.o: $(patsubst "%",%,$(CONFIG_DTB_FILE)) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 69b6cfaded..669e16e726 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -78,6 +78,7 @@ obj-y += sysctl.o endif extra-y += asm-macros.i +extra-y += xen.lds ifneq ($(CONFIG_HVM),y) x86_emulate.o: CFLAGS-y += -Wno-unused-label @@ -238,6 +239,7 @@ endif note_file_option ?= $(note_file) ifeq ($(XEN_BUILD_PE),y) +extra-y += efi.lds $(TARGET).efi: prelink.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc ifeq ($(CONFIG_DEBUG_INFO),y) $(if $(filter --strip-debug,$(EFI_LDFLAGS)),echo,:) "Will strip debug info from $(@F)" @@ -290,8 +292,8 @@ $(BASEDIR)/include/asm-x86/asm-macros.h: asm-macros.i Makefile $(call move-if-changed,$@.new,$@) efi.lds: AFLAGS-y += -DEFI -xen.lds efi.lds: xen.lds.S - $(CPP) -P $(call cpp_flags,$(a_flags)) -MQ $@ -o $@ $< +xen.lds efi.lds: xen.lds.S FORCE + $(call if_changed,cpp_lds_S) boot/mkelf32: boot/mkelf32.c $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:34:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:34:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248335.428375 (Exim 4.92) (envelope-from ) id 1my0GX-0001Jk-Dd; Thu, 16 Dec 2021 23:34:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248335.428375; Thu, 16 Dec 2021 23:34:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GX-0001Jd-9g; Thu, 16 Dec 2021 23:34:25 +0000 Received: by outflank-mailman (input) for mailman id 248335; Thu, 16 Dec 2021 23:34:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GV-0001JL-Gf for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0GV-0002Te-FA for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0GV-0004Om-EC for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ALaa2I7m3OZNfFRBDLf9wfRiRaFi27nXH40ynp0DhXI=; b=4ixJqLiMkmnfSBoqYCUZH3eF0R Xf6/cU5OFbn6WVE8WhvxUb8t1zF7egBcVG1qD8Rh00QYDKP7S2LBx+QDe74r5PyyqCIwuU6dczG8M ANoED7mBma42ci8iqVN2Z9/FgJk/Kuy+rWNkUPJhAvLefvY26w76pYTBOT+FYu109CLo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: move include/asm-* to arch/*/include/asm Message-Id: Date: Thu, 16 Dec 2021 23:34:23 +0000 commit 725381a5eab35227ef0099a43e05034def42bb77 Author: Anthony PERARD AuthorDate: Wed Dec 15 10:14:13 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:14:13 2021 +0100 xen: move include/asm-* to arch/*/include/asm This avoid the need to create the symbolic link "include/asm". Whenever a comment refer to an "asm" headers, this patch avoid spelling the arch when not needed to avoid some code churn. One unrelated change is to sort entries in MAINTAINERS for "INTEL(R) VT FOR X86 (VT-X)" Signed-off-by: Anthony PERARD Acked-by: Paul Durrant Acked-by: Jan Beulich Acked-by: Julien Grall Acked-by: Andrew Cooper --- .gitignore | 5 +- MAINTAINERS | 37 +- tools/include/Makefile | 2 +- tools/misc/xen-access.c | 4 +- tools/tests/vhpet/Makefile | 2 +- xen/Makefile | 13 +- xen/arch/arm/README.LinuxPrimitives | 10 +- xen/arch/arm/arch.mk | 1 + xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm64/head.S | 2 +- xen/arch/arm/include/asm/acpi.h | 82 ++ xen/arch/arm/include/asm/alternative.h | 221 +++++ xen/arch/arm/include/asm/altp2m.h | 39 + xen/arch/arm/include/asm/arm32/atomic.h | 175 ++++ xen/arch/arm/include/asm/arm32/bitops.h | 42 + xen/arch/arm/include/asm/arm32/bug.h | 15 + xen/arch/arm/include/asm/arm32/cmpxchg.h | 229 +++++ xen/arch/arm/include/asm/arm32/flushtlb.h | 63 ++ xen/arch/arm/include/asm/arm32/insn.h | 71 ++ xen/arch/arm/include/asm/arm32/io.h | 96 ++ xen/arch/arm/include/asm/arm32/macros.h | 8 + xen/arch/arm/include/asm/arm32/mm.h | 23 + xen/arch/arm/include/asm/arm32/page.h | 118 +++ xen/arch/arm/include/asm/arm32/processor.h | 69 ++ xen/arch/arm/include/asm/arm32/sysregs.h | 78 ++ xen/arch/arm/include/asm/arm32/system.h | 77 ++ xen/arch/arm/include/asm/arm32/traps.h | 13 + xen/arch/arm/include/asm/arm32/vfp.h | 41 + xen/arch/arm/include/asm/arm64/atomic.h | 148 +++ xen/arch/arm/include/asm/arm64/bitops.h | 98 ++ xen/arch/arm/include/asm/arm64/brk.h | 39 + xen/arch/arm/include/asm/arm64/bug.h | 11 + xen/arch/arm/include/asm/arm64/cmpxchg.h | 183 ++++ xen/arch/arm/include/asm/arm64/cpufeature.h | 104 ++ xen/arch/arm/include/asm/arm64/efibind.h | 216 +++++ xen/arch/arm/include/asm/arm64/flushtlb.h | 77 ++ xen/arch/arm/include/asm/arm64/hsr.h | 159 +++ xen/arch/arm/include/asm/arm64/insn.h | 110 +++ xen/arch/arm/include/asm/arm64/io.h | 148 +++ xen/arch/arm/include/asm/arm64/macros.h | 36 + xen/arch/arm/include/asm/arm64/mm.h | 23 + xen/arch/arm/include/asm/arm64/page.h | 103 ++ xen/arch/arm/include/asm/arm64/processor.h | 99 ++ xen/arch/arm/include/asm/arm64/sysregs.h | 423 ++++++++ xen/arch/arm/include/asm/arm64/system.h | 91 ++ xen/arch/arm/include/asm/arm64/traps.h | 18 + xen/arch/arm/include/asm/arm64/vfp.h | 23 + xen/arch/arm/include/asm/asm_defns.h | 44 + xen/arch/arm/include/asm/atomic.h | 236 +++++ xen/arch/arm/include/asm/bitops.h | 192 ++++ xen/arch/arm/include/asm/bug.h | 106 ++ xen/arch/arm/include/asm/byteorder.h | 16 + xen/arch/arm/include/asm/cache.h | 19 + xen/arch/arm/include/asm/cadence-uart.h | 55 ++ xen/arch/arm/include/asm/config.h | 207 ++++ xen/arch/arm/include/asm/cpregs.h | 375 +++++++ xen/arch/arm/include/asm/cpuerrata.h | 85 ++ xen/arch/arm/include/asm/cpufeature.h | 428 ++++++++ xen/arch/arm/include/asm/current.h | 73 ++ xen/arch/arm/include/asm/debugger.h | 15 + xen/arch/arm/include/asm/delay.h | 14 + xen/arch/arm/include/asm/desc.h | 12 + xen/arch/arm/include/asm/device.h | 124 +++ xen/arch/arm/include/asm/div64.h | 250 +++++ xen/arch/arm/include/asm/domain.h | 279 ++++++ xen/arch/arm/include/asm/domain_build.h | 31 + xen/arch/arm/include/asm/early_printk.h | 23 + xen/arch/arm/include/asm/efibind.h | 2 + xen/arch/arm/include/asm/elf.h | 33 + xen/arch/arm/include/asm/event.h | 63 ++ xen/arch/arm/include/asm/exynos4210-uart.h | 112 +++ xen/arch/arm/include/asm/flushtlb.h | 77 ++ xen/arch/arm/include/asm/gic.h | 459 +++++++++ xen/arch/arm/include/asm/gic_v3_defs.h | 220 +++++ xen/arch/arm/include/asm/gic_v3_its.h | 283 ++++++ xen/arch/arm/include/asm/grant_table.h | 108 +++ xen/arch/arm/include/asm/guest_access.h | 42 + xen/arch/arm/include/asm/guest_atomics.h | 148 +++ xen/arch/arm/include/asm/guest_walk.h | 19 + xen/arch/arm/include/asm/hardirq.h | 27 + xen/arch/arm/include/asm/hsr.h | 217 +++++ xen/arch/arm/include/asm/hypercall.h | 20 + xen/arch/arm/include/asm/init.h | 20 + xen/arch/arm/include/asm/insn.h | 29 + xen/arch/arm/include/asm/io.h | 20 + xen/arch/arm/include/asm/iocap.h | 16 + xen/arch/arm/include/asm/iommu.h | 45 + xen/arch/arm/include/asm/iommu_fwspec.h | 68 ++ xen/arch/arm/include/asm/ioreq.h | 70 ++ xen/arch/arm/include/asm/irq.h | 109 +++ xen/arch/arm/include/asm/kernel.h | 89 ++ xen/arch/arm/include/asm/livepatch.h | 37 + xen/arch/arm/include/asm/lpae.h | 257 +++++ xen/arch/arm/include/asm/macros.h | 32 + xen/arch/arm/include/asm/mem_access.h | 53 + xen/arch/arm/include/asm/mm.h | 373 +++++++ xen/arch/arm/include/asm/mmio.h | 86 ++ xen/arch/arm/include/asm/monitor.h | 68 ++ xen/arch/arm/include/asm/new_vgic.h | 198 ++++ xen/arch/arm/include/asm/nospec.h | 25 + xen/arch/arm/include/asm/numa.h | 36 + xen/arch/arm/include/asm/p2m.h | 439 +++++++++ xen/arch/arm/include/asm/page-bits.h | 12 + xen/arch/arm/include/asm/page.h | 293 ++++++ xen/arch/arm/include/asm/paging.h | 16 + xen/arch/arm/include/asm/pci.h | 133 +++ xen/arch/arm/include/asm/percpu.h | 33 + xen/arch/arm/include/asm/perfc.h | 21 + xen/arch/arm/include/asm/perfc_defn.h | 89 ++ xen/arch/arm/include/asm/pl011-uart.h | 87 ++ xen/arch/arm/include/asm/platform.h | 82 ++ xen/arch/arm/include/asm/platforms/exynos5.h | 20 + xen/arch/arm/include/asm/platforms/midway.h | 21 + xen/arch/arm/include/asm/platforms/omap5.h | 32 + xen/arch/arm/include/asm/platforms/vexpress.h | 37 + .../arm/include/asm/platforms/xilinx-zynqmp-eemi.h | 128 +++ xen/arch/arm/include/asm/processor.h | 598 ++++++++++++ xen/arch/arm/include/asm/procinfo.h | 43 + xen/arch/arm/include/asm/psci.h | 91 ++ xen/arch/arm/include/asm/random.h | 9 + xen/arch/arm/include/asm/regs.h | 73 ++ xen/arch/arm/include/asm/scif-uart.h | 127 +++ xen/arch/arm/include/asm/setup.h | 135 +++ xen/arch/arm/include/asm/short-desc.h | 130 +++ xen/arch/arm/include/asm/smccc.h | 356 +++++++ xen/arch/arm/include/asm/smp.h | 46 + xen/arch/arm/include/asm/softirq.h | 16 + xen/arch/arm/include/asm/spinlock.h | 15 + xen/arch/arm/include/asm/string.h | 53 + xen/arch/arm/include/asm/sysregs.h | 22 + xen/arch/arm/include/asm/system.h | 73 ++ xen/arch/arm/include/asm/tee/optee_msg.h | 310 ++++++ xen/arch/arm/include/asm/tee/optee_rpc_cmd.h | 318 ++++++ xen/arch/arm/include/asm/tee/optee_smc.h | 567 +++++++++++ xen/arch/arm/include/asm/tee/tee.h | 112 +++ xen/arch/arm/include/asm/time.h | 118 +++ xen/arch/arm/include/asm/trace.h | 12 + xen/arch/arm/include/asm/traps.h | 121 +++ xen/arch/arm/include/asm/types.h | 80 ++ xen/arch/arm/include/asm/vfp.h | 25 + xen/arch/arm/include/asm/vgic-emul.h | 33 + xen/arch/arm/include/asm/vgic.h | 383 ++++++++ xen/arch/arm/include/asm/vm_event.h | 67 ++ xen/arch/arm/include/asm/vpl011.h | 89 ++ xen/arch/arm/include/asm/vpsci.h | 42 + xen/arch/arm/include/asm/vreg.h | 196 ++++ xen/arch/arm/include/asm/vtimer.h | 41 + xen/arch/arm/include/asm/xenoprof.h | 12 + xen/arch/arm/smpboot.c | 2 +- xen/arch/arm/vpsci.c | 2 +- xen/arch/riscv/arch.mk | 1 + xen/arch/riscv/include/asm/config.h | 47 + xen/arch/x86/Makefile | 6 +- xen/arch/x86/arch.mk | 5 +- xen/arch/x86/include/asm/acpi.h | 162 ++++ xen/arch/x86/include/asm/alternative-asm.h | 125 +++ xen/arch/x86/include/asm/alternative.h | 387 ++++++++ xen/arch/x86/include/asm/altp2m.h | 57 ++ xen/arch/x86/include/asm/amd.h | 154 +++ xen/arch/x86/include/asm/apic.h | 202 ++++ xen/arch/x86/include/asm/apicdef.h | 134 +++ xen/arch/x86/include/asm/asm-defns.h | 78 ++ xen/arch/x86/include/asm/asm_defns.h | 354 +++++++ xen/arch/x86/include/asm/atomic.h | 239 +++++ xen/arch/x86/include/asm/bitops.h | 483 +++++++++ xen/arch/x86/include/asm/bug.h | 125 +++ xen/arch/x86/include/asm/byteorder.h | 36 + xen/arch/x86/include/asm/bzimage.h | 11 + xen/arch/x86/include/asm/cache.h | 14 + xen/arch/x86/include/asm/compat.h | 20 + xen/arch/x86/include/asm/config.h | 329 +++++++ xen/arch/x86/include/asm/cpufeature.h | 214 ++++ xen/arch/x86/include/asm/cpufeatures.h | 51 + xen/arch/x86/include/asm/cpufeatureset.h | 40 + xen/arch/x86/include/asm/cpuid.h | 80 ++ xen/arch/x86/include/asm/cpuidle.h | 31 + xen/arch/x86/include/asm/current.h | 210 ++++ xen/arch/x86/include/asm/debugger.h | 101 ++ xen/arch/x86/include/asm/debugreg.h | 83 ++ xen/arch/x86/include/asm/delay.h | 13 + xen/arch/x86/include/asm/desc.h | 252 +++++ xen/arch/x86/include/asm/device.h | 25 + xen/arch/x86/include/asm/div64.h | 14 + xen/arch/x86/include/asm/dom0_build.h | 42 + xen/arch/x86/include/asm/domain.h | 769 +++++++++++++++ xen/arch/x86/include/asm/e820.h | 42 + xen/arch/x86/include/asm/edd.h | 164 ++++ xen/arch/x86/include/asm/efibind.h | 2 + xen/arch/x86/include/asm/elf.h | 20 + xen/arch/x86/include/asm/event.h | 56 ++ xen/arch/x86/include/asm/fixmap.h | 117 +++ xen/arch/x86/include/asm/flushtlb.h | 203 ++++ xen/arch/x86/include/asm/genapic.h | 70 ++ xen/arch/x86/include/asm/grant_table.h | 80 ++ xen/arch/x86/include/asm/guest.h | 39 + xen/arch/x86/include/asm/guest/hyperv-hcall.h | 97 ++ xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 934 ++++++++++++++++++ xen/arch/x86/include/asm/guest/hyperv.h | 86 ++ xen/arch/x86/include/asm/guest/hypervisor.h | 85 ++ xen/arch/x86/include/asm/guest/pvh-boot.h | 58 ++ xen/arch/x86/include/asm/guest/xen-hcall.h | 212 ++++ xen/arch/x86/include/asm/guest/xen.h | 61 ++ xen/arch/x86/include/asm/guest_access.h | 59 ++ xen/arch/x86/include/asm/guest_atomics.h | 33 + xen/arch/x86/include/asm/guest_pt.h | 468 +++++++++ xen/arch/x86/include/asm/hap.h | 60 ++ xen/arch/x86/include/asm/hardirq.h | 37 + xen/arch/x86/include/asm/hpet.h | 101 ++ xen/arch/x86/include/asm/hvm/asid.h | 52 + xen/arch/x86/include/asm/hvm/cacheattr.h | 23 + xen/arch/x86/include/asm/hvm/domain.h | 173 ++++ xen/arch/x86/include/asm/hvm/emulate.h | 156 +++ xen/arch/x86/include/asm/hvm/grant_table.h | 61 ++ xen/arch/x86/include/asm/hvm/guest_access.h | 8 + xen/arch/x86/include/asm/hvm/hvm.h | 886 +++++++++++++++++ xen/arch/x86/include/asm/hvm/io.h | 181 ++++ xen/arch/x86/include/asm/hvm/ioreq.h | 37 + xen/arch/x86/include/asm/hvm/irq.h | 227 +++++ xen/arch/x86/include/asm/hvm/monitor.h | 65 ++ xen/arch/x86/include/asm/hvm/nestedhvm.h | 100 ++ xen/arch/x86/include/asm/hvm/save.h | 144 +++ xen/arch/x86/include/asm/hvm/support.h | 170 ++++ xen/arch/x86/include/asm/hvm/svm/asid.h | 49 + xen/arch/x86/include/asm/hvm/svm/emulate.h | 66 ++ xen/arch/x86/include/asm/hvm/svm/intr.h | 25 + xen/arch/x86/include/asm/hvm/svm/nestedsvm.h | 145 +++ xen/arch/x86/include/asm/hvm/svm/svm.h | 110 +++ xen/arch/x86/include/asm/hvm/svm/svmdebug.h | 30 + xen/arch/x86/include/asm/hvm/svm/vmcb.h | 664 +++++++++++++ xen/arch/x86/include/asm/hvm/trace.h | 114 +++ xen/arch/x86/include/asm/hvm/vcpu.h | 210 ++++ xen/arch/x86/include/asm/hvm/vioapic.h | 72 ++ xen/arch/x86/include/asm/hvm/viridian.h | 112 +++ xen/arch/x86/include/asm/hvm/vlapic.h | 157 +++ xen/arch/x86/include/asm/hvm/vm_event.h | 34 + xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 688 +++++++++++++ xen/arch/x86/include/asm/hvm/vmx/vmx.h | 692 +++++++++++++ xen/arch/x86/include/asm/hvm/vmx/vvmx.h | 214 ++++ xen/arch/x86/include/asm/hvm/vpic.h | 40 + xen/arch/x86/include/asm/hvm/vpt.h | 205 ++++ xen/arch/x86/include/asm/hypercall.h | 198 ++++ xen/arch/x86/include/asm/i387.h | 40 + xen/arch/x86/include/asm/init.h | 4 + xen/arch/x86/include/asm/invpcid.h | 67 ++ xen/arch/x86/include/asm/io.h | 56 ++ xen/arch/x86/include/asm/io_apic.h | 212 ++++ xen/arch/x86/include/asm/iocap.h | 21 + xen/arch/x86/include/asm/iommu.h | 155 +++ xen/arch/x86/include/asm/ioreq.h | 39 + xen/arch/x86/include/asm/irq.h | 221 +++++ xen/arch/x86/include/asm/ldt.h | 35 + xen/arch/x86/include/asm/livepatch.h | 25 + xen/arch/x86/include/asm/mach-default/bios_ebda.h | 15 + xen/arch/x86/include/asm/mach-default/io_ports.h | 30 + .../x86/include/asm/mach-default/irq_vectors.h | 46 + .../x86/include/asm/mach-default/mach_mpspec.h | 10 + xen/arch/x86/include/asm/mach-generic/mach_apic.h | 80 ++ xen/arch/x86/include/asm/machine_kexec.h | 16 + xen/arch/x86/include/asm/mc146818rtc.h | 116 +++ xen/arch/x86/include/asm/mce.h | 49 + xen/arch/x86/include/asm/mem_access.h | 68 ++ xen/arch/x86/include/asm/mem_paging.h | 42 + xen/arch/x86/include/asm/mem_sharing.h | 153 +++ xen/arch/x86/include/asm/microcode.h | 27 + xen/arch/x86/include/asm/mm.h | 655 +++++++++++++ xen/arch/x86/include/asm/monitor.h | 126 +++ xen/arch/x86/include/asm/mpspec.h | 73 ++ xen/arch/x86/include/asm/mpspec_def.h | 188 ++++ xen/arch/x86/include/asm/msi.h | 256 +++++ xen/arch/x86/include/asm/msr-index.h | 671 +++++++++++++ xen/arch/x86/include/asm/msr.h | 381 ++++++++ xen/arch/x86/include/asm/mtrr.h | 103 ++ xen/arch/x86/include/asm/multicall.h | 12 + xen/arch/x86/include/asm/mwait.h | 19 + xen/arch/x86/include/asm/nmi.h | 46 + xen/arch/x86/include/asm/nops.h | 70 ++ xen/arch/x86/include/asm/nospec.h | 39 + xen/arch/x86/include/asm/numa.h | 84 ++ xen/arch/x86/include/asm/p2m.h | 1022 ++++++++++++++++++++ xen/arch/x86/include/asm/page-bits.h | 26 + xen/arch/x86/include/asm/page.h | 409 ++++++++ xen/arch/x86/include/asm/paging.h | 433 +++++++++ xen/arch/x86/include/asm/pci.h | 41 + xen/arch/x86/include/asm/percpu.h | 22 + xen/arch/x86/include/asm/perfc.h | 12 + xen/arch/x86/include/asm/perfc_defn.h | 120 +++ xen/arch/x86/include/asm/processor.h | 650 +++++++++++++ xen/arch/x86/include/asm/psr.h | 99 ++ xen/arch/x86/include/asm/pv/domain.h | 120 +++ xen/arch/x86/include/asm/pv/grant_table.h | 60 ++ xen/arch/x86/include/asm/pv/mm.h | 60 ++ xen/arch/x86/include/asm/pv/shim.h | 119 +++ xen/arch/x86/include/asm/pv/trace.h | 48 + xen/arch/x86/include/asm/pv/traps.h | 71 ++ xen/arch/x86/include/asm/random.h | 16 + xen/arch/x86/include/asm/regs.h | 33 + xen/arch/x86/include/asm/setup.h | 75 ++ xen/arch/x86/include/asm/shadow.h | 273 ++++++ xen/arch/x86/include/asm/shared.h | 79 ++ xen/arch/x86/include/asm/smp.h | 90 ++ xen/arch/x86/include/asm/softirq.h | 14 + xen/arch/x86/include/asm/spec_ctrl.h | 151 +++ xen/arch/x86/include/asm/spec_ctrl_asm.h | 342 +++++++ xen/arch/x86/include/asm/spinlock.h | 27 + xen/arch/x86/include/asm/string.h | 12 + xen/arch/x86/include/asm/system.h | 295 ++++++ xen/arch/x86/include/asm/tboot.h | 160 +++ xen/arch/x86/include/asm/time.h | 76 ++ xen/arch/x86/include/asm/trace.h | 4 + xen/arch/x86/include/asm/traps.h | 34 + xen/arch/x86/include/asm/types.h | 50 + xen/arch/x86/include/asm/uaccess.h | 429 ++++++++ xen/arch/x86/include/asm/unaligned.h | 6 + xen/arch/x86/include/asm/vm_event.h | 59 ++ xen/arch/x86/include/asm/vpmu.h | 140 +++ xen/arch/x86/include/asm/x86-defns.h | 156 +++ xen/arch/x86/include/asm/x86-vendors.h | 39 + xen/arch/x86/include/asm/x86_64/efibind.h | 280 ++++++ xen/arch/x86/include/asm/x86_64/elf.h | 85 ++ xen/arch/x86/include/asm/x86_64/page.h | 166 ++++ xen/arch/x86/include/asm/x86_64/regs.h | 28 + xen/arch/x86/include/asm/x86_64/system.h | 62 ++ xen/arch/x86/include/asm/x86_64/uaccess.h | 70 ++ xen/arch/x86/include/asm/x86_emulate.h | 21 + xen/arch/x86/include/asm/xenoprof.h | 107 ++ xen/arch/x86/include/asm/xstate.h | 141 +++ xen/common/efi/runtime.c | 2 +- xen/common/page_alloc.c | 2 +- xen/include/asm-arm/acpi.h | 82 -- xen/include/asm-arm/alternative.h | 221 ----- xen/include/asm-arm/altp2m.h | 39 - xen/include/asm-arm/arm32/atomic.h | 175 ---- xen/include/asm-arm/arm32/bitops.h | 42 - xen/include/asm-arm/arm32/bug.h | 15 - xen/include/asm-arm/arm32/cmpxchg.h | 229 ----- xen/include/asm-arm/arm32/flushtlb.h | 63 -- xen/include/asm-arm/arm32/insn.h | 71 -- xen/include/asm-arm/arm32/io.h | 96 -- xen/include/asm-arm/arm32/macros.h | 8 - xen/include/asm-arm/arm32/mm.h | 23 - xen/include/asm-arm/arm32/page.h | 118 --- xen/include/asm-arm/arm32/processor.h | 69 -- xen/include/asm-arm/arm32/sysregs.h | 78 -- xen/include/asm-arm/arm32/system.h | 77 -- xen/include/asm-arm/arm32/traps.h | 13 - xen/include/asm-arm/arm32/vfp.h | 41 - xen/include/asm-arm/arm64/atomic.h | 148 --- xen/include/asm-arm/arm64/bitops.h | 98 -- xen/include/asm-arm/arm64/brk.h | 39 - xen/include/asm-arm/arm64/bug.h | 11 - xen/include/asm-arm/arm64/cmpxchg.h | 183 ---- xen/include/asm-arm/arm64/cpufeature.h | 104 -- xen/include/asm-arm/arm64/efibind.h | 216 ----- xen/include/asm-arm/arm64/flushtlb.h | 77 -- xen/include/asm-arm/arm64/hsr.h | 159 --- xen/include/asm-arm/arm64/insn.h | 110 --- xen/include/asm-arm/arm64/io.h | 148 --- xen/include/asm-arm/arm64/macros.h | 36 - xen/include/asm-arm/arm64/mm.h | 23 - xen/include/asm-arm/arm64/page.h | 103 -- xen/include/asm-arm/arm64/processor.h | 99 -- xen/include/asm-arm/arm64/sysregs.h | 423 -------- xen/include/asm-arm/arm64/system.h | 91 -- xen/include/asm-arm/arm64/traps.h | 18 - xen/include/asm-arm/arm64/vfp.h | 23 - xen/include/asm-arm/asm_defns.h | 44 - xen/include/asm-arm/atomic.h | 236 ----- xen/include/asm-arm/bitops.h | 192 ---- xen/include/asm-arm/bug.h | 106 -- xen/include/asm-arm/byteorder.h | 16 - xen/include/asm-arm/cache.h | 19 - xen/include/asm-arm/cadence-uart.h | 55 -- xen/include/asm-arm/config.h | 207 ---- xen/include/asm-arm/cpregs.h | 375 ------- xen/include/asm-arm/cpuerrata.h | 85 -- xen/include/asm-arm/cpufeature.h | 428 -------- xen/include/asm-arm/current.h | 73 -- xen/include/asm-arm/debugger.h | 15 - xen/include/asm-arm/delay.h | 14 - xen/include/asm-arm/desc.h | 12 - xen/include/asm-arm/device.h | 124 --- xen/include/asm-arm/div64.h | 250 ----- xen/include/asm-arm/domain.h | 279 ------ xen/include/asm-arm/domain_build.h | 31 - xen/include/asm-arm/early_printk.h | 23 - xen/include/asm-arm/efibind.h | 2 - xen/include/asm-arm/elf.h | 33 - xen/include/asm-arm/event.h | 63 -- xen/include/asm-arm/exynos4210-uart.h | 112 --- xen/include/asm-arm/flushtlb.h | 77 -- xen/include/asm-arm/gic.h | 459 --------- xen/include/asm-arm/gic_v3_defs.h | 220 ----- xen/include/asm-arm/gic_v3_its.h | 283 ------ xen/include/asm-arm/grant_table.h | 108 --- xen/include/asm-arm/guest_access.h | 42 - xen/include/asm-arm/guest_atomics.h | 148 --- xen/include/asm-arm/guest_walk.h | 19 - xen/include/asm-arm/hardirq.h | 27 - xen/include/asm-arm/hsr.h | 217 ----- xen/include/asm-arm/hypercall.h | 20 - xen/include/asm-arm/init.h | 20 - xen/include/asm-arm/insn.h | 29 - xen/include/asm-arm/io.h | 20 - xen/include/asm-arm/iocap.h | 16 - xen/include/asm-arm/iommu.h | 45 - xen/include/asm-arm/iommu_fwspec.h | 68 -- xen/include/asm-arm/ioreq.h | 70 -- xen/include/asm-arm/irq.h | 109 --- xen/include/asm-arm/kernel.h | 89 -- xen/include/asm-arm/livepatch.h | 37 - xen/include/asm-arm/lpae.h | 257 ----- xen/include/asm-arm/macros.h | 32 - xen/include/asm-arm/mem_access.h | 53 - xen/include/asm-arm/mm.h | 373 ------- xen/include/asm-arm/mmio.h | 86 -- xen/include/asm-arm/monitor.h | 68 -- xen/include/asm-arm/new_vgic.h | 198 ---- xen/include/asm-arm/nospec.h | 25 - xen/include/asm-arm/numa.h | 36 - xen/include/asm-arm/p2m.h | 439 --------- xen/include/asm-arm/page-bits.h | 12 - xen/include/asm-arm/page.h | 293 ------ xen/include/asm-arm/paging.h | 16 - xen/include/asm-arm/pci.h | 133 --- xen/include/asm-arm/percpu.h | 33 - xen/include/asm-arm/perfc.h | 21 - xen/include/asm-arm/perfc_defn.h | 89 -- xen/include/asm-arm/pl011-uart.h | 87 -- xen/include/asm-arm/platform.h | 82 -- xen/include/asm-arm/platforms/exynos5.h | 20 - xen/include/asm-arm/platforms/midway.h | 21 - xen/include/asm-arm/platforms/omap5.h | 32 - xen/include/asm-arm/platforms/vexpress.h | 37 - xen/include/asm-arm/platforms/xilinx-zynqmp-eemi.h | 128 --- xen/include/asm-arm/processor.h | 598 ------------ xen/include/asm-arm/procinfo.h | 43 - xen/include/asm-arm/psci.h | 91 -- xen/include/asm-arm/random.h | 9 - xen/include/asm-arm/regs.h | 73 -- xen/include/asm-arm/scif-uart.h | 127 --- xen/include/asm-arm/setup.h | 135 --- xen/include/asm-arm/short-desc.h | 130 --- xen/include/asm-arm/smccc.h | 356 ------- xen/include/asm-arm/smp.h | 46 - xen/include/asm-arm/softirq.h | 16 - xen/include/asm-arm/spinlock.h | 15 - xen/include/asm-arm/string.h | 53 - xen/include/asm-arm/sysregs.h | 22 - xen/include/asm-arm/system.h | 73 -- xen/include/asm-arm/tee/optee_msg.h | 310 ------ xen/include/asm-arm/tee/optee_rpc_cmd.h | 318 ------ xen/include/asm-arm/tee/optee_smc.h | 567 ----------- xen/include/asm-arm/tee/tee.h | 112 --- xen/include/asm-arm/time.h | 118 --- xen/include/asm-arm/trace.h | 12 - xen/include/asm-arm/traps.h | 121 --- xen/include/asm-arm/types.h | 80 -- xen/include/asm-arm/vfp.h | 25 - xen/include/asm-arm/vgic-emul.h | 33 - xen/include/asm-arm/vgic.h | 383 -------- xen/include/asm-arm/vm_event.h | 67 -- xen/include/asm-arm/vpl011.h | 89 -- xen/include/asm-arm/vpsci.h | 42 - xen/include/asm-arm/vreg.h | 196 ---- xen/include/asm-arm/vtimer.h | 41 - xen/include/asm-arm/xenoprof.h | 12 - xen/include/asm-riscv/config.h | 47 - xen/include/asm-x86/acpi.h | 162 ---- xen/include/asm-x86/alternative-asm.h | 125 --- xen/include/asm-x86/alternative.h | 387 -------- xen/include/asm-x86/altp2m.h | 57 -- xen/include/asm-x86/amd.h | 154 --- xen/include/asm-x86/apic.h | 202 ---- xen/include/asm-x86/apicdef.h | 134 --- xen/include/asm-x86/asm-defns.h | 78 -- xen/include/asm-x86/asm_defns.h | 354 ------- xen/include/asm-x86/atomic.h | 239 ----- xen/include/asm-x86/bitops.h | 483 --------- xen/include/asm-x86/bug.h | 125 --- xen/include/asm-x86/byteorder.h | 36 - xen/include/asm-x86/bzimage.h | 11 - xen/include/asm-x86/cache.h | 14 - xen/include/asm-x86/compat.h | 20 - xen/include/asm-x86/config.h | 329 ------- xen/include/asm-x86/cpufeature.h | 214 ---- xen/include/asm-x86/cpufeatures.h | 51 - xen/include/asm-x86/cpufeatureset.h | 40 - xen/include/asm-x86/cpuid.h | 80 -- xen/include/asm-x86/cpuidle.h | 31 - xen/include/asm-x86/current.h | 210 ---- xen/include/asm-x86/debugger.h | 101 -- xen/include/asm-x86/debugreg.h | 83 -- xen/include/asm-x86/delay.h | 13 - xen/include/asm-x86/desc.h | 252 ----- xen/include/asm-x86/device.h | 25 - xen/include/asm-x86/div64.h | 14 - xen/include/asm-x86/dom0_build.h | 42 - xen/include/asm-x86/domain.h | 769 --------------- xen/include/asm-x86/e820.h | 42 - xen/include/asm-x86/edd.h | 164 ---- xen/include/asm-x86/efibind.h | 2 - xen/include/asm-x86/elf.h | 20 - xen/include/asm-x86/event.h | 56 -- xen/include/asm-x86/fixmap.h | 117 --- xen/include/asm-x86/flushtlb.h | 203 ---- xen/include/asm-x86/genapic.h | 70 -- xen/include/asm-x86/grant_table.h | 80 -- xen/include/asm-x86/guest.h | 39 - xen/include/asm-x86/guest/hyperv-hcall.h | 97 -- xen/include/asm-x86/guest/hyperv-tlfs.h | 934 ------------------ xen/include/asm-x86/guest/hyperv.h | 86 -- xen/include/asm-x86/guest/hypervisor.h | 85 -- xen/include/asm-x86/guest/pvh-boot.h | 58 -- xen/include/asm-x86/guest/xen-hcall.h | 212 ---- xen/include/asm-x86/guest/xen.h | 61 -- xen/include/asm-x86/guest_access.h | 59 -- xen/include/asm-x86/guest_atomics.h | 33 - xen/include/asm-x86/guest_pt.h | 468 --------- xen/include/asm-x86/hap.h | 60 -- xen/include/asm-x86/hardirq.h | 37 - xen/include/asm-x86/hpet.h | 101 -- xen/include/asm-x86/hvm/asid.h | 52 - xen/include/asm-x86/hvm/cacheattr.h | 23 - xen/include/asm-x86/hvm/domain.h | 173 ---- xen/include/asm-x86/hvm/emulate.h | 156 --- xen/include/asm-x86/hvm/grant_table.h | 61 -- xen/include/asm-x86/hvm/guest_access.h | 8 - xen/include/asm-x86/hvm/hvm.h | 886 ----------------- xen/include/asm-x86/hvm/io.h | 181 ---- xen/include/asm-x86/hvm/ioreq.h | 37 - xen/include/asm-x86/hvm/irq.h | 227 ----- xen/include/asm-x86/hvm/monitor.h | 65 -- xen/include/asm-x86/hvm/nestedhvm.h | 100 -- xen/include/asm-x86/hvm/save.h | 144 --- xen/include/asm-x86/hvm/support.h | 170 ---- xen/include/asm-x86/hvm/svm/asid.h | 49 - xen/include/asm-x86/hvm/svm/emulate.h | 66 -- xen/include/asm-x86/hvm/svm/intr.h | 25 - xen/include/asm-x86/hvm/svm/nestedsvm.h | 145 --- xen/include/asm-x86/hvm/svm/svm.h | 110 --- xen/include/asm-x86/hvm/svm/svmdebug.h | 30 - xen/include/asm-x86/hvm/svm/vmcb.h | 664 ------------- xen/include/asm-x86/hvm/trace.h | 114 --- xen/include/asm-x86/hvm/vcpu.h | 210 ---- xen/include/asm-x86/hvm/vioapic.h | 72 -- xen/include/asm-x86/hvm/viridian.h | 112 --- xen/include/asm-x86/hvm/vlapic.h | 157 --- xen/include/asm-x86/hvm/vm_event.h | 34 - xen/include/asm-x86/hvm/vmx/vmcs.h | 688 ------------- xen/include/asm-x86/hvm/vmx/vmx.h | 692 ------------- xen/include/asm-x86/hvm/vmx/vvmx.h | 214 ---- xen/include/asm-x86/hvm/vpic.h | 40 - xen/include/asm-x86/hvm/vpt.h | 205 ---- xen/include/asm-x86/hypercall.h | 198 ---- xen/include/asm-x86/i387.h | 40 - xen/include/asm-x86/init.h | 4 - xen/include/asm-x86/invpcid.h | 67 -- xen/include/asm-x86/io.h | 56 -- xen/include/asm-x86/io_apic.h | 212 ---- xen/include/asm-x86/iocap.h | 21 - xen/include/asm-x86/iommu.h | 155 --- xen/include/asm-x86/ioreq.h | 39 - xen/include/asm-x86/irq.h | 221 ----- xen/include/asm-x86/ldt.h | 35 - xen/include/asm-x86/livepatch.h | 25 - xen/include/asm-x86/mach-default/bios_ebda.h | 15 - xen/include/asm-x86/mach-default/io_ports.h | 30 - xen/include/asm-x86/mach-default/irq_vectors.h | 46 - xen/include/asm-x86/mach-default/mach_mpspec.h | 10 - xen/include/asm-x86/mach-generic/mach_apic.h | 80 -- xen/include/asm-x86/machine_kexec.h | 16 - xen/include/asm-x86/mc146818rtc.h | 116 --- xen/include/asm-x86/mce.h | 49 - xen/include/asm-x86/mem_access.h | 68 -- xen/include/asm-x86/mem_paging.h | 42 - xen/include/asm-x86/mem_sharing.h | 153 --- xen/include/asm-x86/microcode.h | 27 - xen/include/asm-x86/mm.h | 655 ------------- xen/include/asm-x86/monitor.h | 126 --- xen/include/asm-x86/mpspec.h | 73 -- xen/include/asm-x86/mpspec_def.h | 188 ---- xen/include/asm-x86/msi.h | 256 ----- xen/include/asm-x86/msr-index.h | 671 ------------- xen/include/asm-x86/msr.h | 381 -------- xen/include/asm-x86/mtrr.h | 103 -- xen/include/asm-x86/multicall.h | 12 - xen/include/asm-x86/mwait.h | 19 - xen/include/asm-x86/nmi.h | 46 - xen/include/asm-x86/nops.h | 70 -- xen/include/asm-x86/nospec.h | 39 - xen/include/asm-x86/numa.h | 84 -- xen/include/asm-x86/p2m.h | 1022 -------------------- xen/include/asm-x86/page-bits.h | 26 - xen/include/asm-x86/page.h | 409 -------- xen/include/asm-x86/paging.h | 433 --------- xen/include/asm-x86/pci.h | 41 - xen/include/asm-x86/percpu.h | 22 - xen/include/asm-x86/perfc.h | 12 - xen/include/asm-x86/perfc_defn.h | 120 --- xen/include/asm-x86/processor.h | 650 ------------- xen/include/asm-x86/psr.h | 99 -- xen/include/asm-x86/pv/domain.h | 120 --- xen/include/asm-x86/pv/grant_table.h | 60 -- xen/include/asm-x86/pv/mm.h | 60 -- xen/include/asm-x86/pv/shim.h | 119 --- xen/include/asm-x86/pv/trace.h | 48 - xen/include/asm-x86/pv/traps.h | 71 -- xen/include/asm-x86/random.h | 16 - xen/include/asm-x86/regs.h | 33 - xen/include/asm-x86/setup.h | 75 -- xen/include/asm-x86/shadow.h | 273 ------ xen/include/asm-x86/shared.h | 79 -- xen/include/asm-x86/smp.h | 90 -- xen/include/asm-x86/softirq.h | 14 - xen/include/asm-x86/spec_ctrl.h | 151 --- xen/include/asm-x86/spec_ctrl_asm.h | 342 ------- xen/include/asm-x86/spinlock.h | 27 - xen/include/asm-x86/string.h | 12 - xen/include/asm-x86/system.h | 295 ------ xen/include/asm-x86/tboot.h | 160 --- xen/include/asm-x86/time.h | 76 -- xen/include/asm-x86/trace.h | 4 - xen/include/asm-x86/traps.h | 34 - xen/include/asm-x86/types.h | 50 - xen/include/asm-x86/uaccess.h | 429 -------- xen/include/asm-x86/unaligned.h | 6 - xen/include/asm-x86/vm_event.h | 59 -- xen/include/asm-x86/vpmu.h | 140 --- xen/include/asm-x86/x86-defns.h | 156 --- xen/include/asm-x86/x86-vendors.h | 39 - xen/include/asm-x86/x86_64/efibind.h | 280 ------ xen/include/asm-x86/x86_64/elf.h | 85 -- xen/include/asm-x86/x86_64/page.h | 166 ---- xen/include/asm-x86/x86_64/regs.h | 28 - xen/include/asm-x86/x86_64/system.h | 62 -- xen/include/asm-x86/x86_64/uaccess.h | 70 -- xen/include/asm-x86/x86_emulate.h | 21 - xen/include/asm-x86/xenoprof.h | 107 -- xen/include/asm-x86/xstate.h | 141 --- xen/include/xen/acpi.h | 5 +- xen/include/xen/bitmap.h | 2 +- 641 files changed, 40578 insertions(+), 40579 deletions(-) diff --git a/.gitignore b/.gitignore index 111eb03b86..e13cbf84b2 100644 --- a/.gitignore +++ b/.gitignore @@ -314,6 +314,7 @@ xen/arch/x86/boot/*.lnk xen/arch/x86/efi.lds xen/arch/x86/efi/check.efi xen/arch/x86/efi/mkreloc +xen/arch/x86/include/asm/asm-macros.h xen/arch/*/xen.lds xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c @@ -321,12 +322,10 @@ xen/arch/*/efi/ebmalloc.c xen/arch/*/efi/efi.h xen/arch/*/efi/pe.c xen/arch/*/efi/runtime.c +xen/arch/*/include/asm/asm-offsets.h xen/common/config_data.S xen/common/config.gz xen/include/headers*.chk -xen/include/asm -xen/include/asm-*/asm-offsets.h -xen/include/asm-x86/asm-macros.h xen/include/compat/* xen/include/config/ xen/include/generated/ diff --git a/MAINTAINERS b/MAINTAINERS index 22ea62d964..6e84a05760 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -245,7 +245,6 @@ F: xen/drivers/char/omap-uart.c F: xen/drivers/char/pl011.c F: xen/drivers/char/scif-uart.c F: xen/drivers/passthrough/arm/ -F: xen/include/asm-arm/ F: xen/include/public/arch-arm/ F: xen/include/public/arch-arm.h @@ -290,10 +289,10 @@ EFI M: Jan Beulich S: Supported F: xen/arch/x86/efi/ +F: xen/arch/x86/include/asm/efi*.h +F: xen/arch/x86/include/asm/x86_*/efi*.h F: xen/common/efi/ F: xen/include/efi/ -F: xen/include/asm-x86/efi*.h -F: xen/include/asm-x86/x86_*/efi*.h GDBSX DEBUGGER M: Elena Ufimtseva @@ -319,8 +318,8 @@ F: xen/include/xen/hypfs.h INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) R: Lukasz Hawrylko S: Odd Fixes +F: xen/arch/x86/include/asm/tboot.h F: xen/arch/x86/tboot.c -F: xen/include/asm-x86/tboot.h INTEL(R) VT FOR DIRECTED I/O (VT-D) M: Kevin Tian @@ -331,10 +330,10 @@ INTEL(R) VT FOR X86 (VT-X) M: Jun Nakajima M: Kevin Tian S: Supported +F: xen/arch/x86/cpu/vpmu_intel.c F: xen/arch/x86/hvm/vmx/ +F: xen/arch/x86/include/asm/hvm/vmx/ F: xen/arch/x86/mm/p2m-ept.c -F: xen/include/asm-x86/hvm/vmx/ -F: xen/arch/x86/cpu/vpmu_intel.c IOMMU VENDOR INDEPENDENT CODE M: Jan Beulich @@ -401,10 +400,10 @@ M: Ross Lagerwall S: Supported F: docs/misc/livepatch.pandoc F: tools/misc/xen-livepatch.c +F: xen/arch/*/include/asm/livepatch.h F: xen/arch/*/livepatch* F: xen/arch/*/*/livepatch* F: xen/common/livepatch* -F: xen/include/asm-*/livepatch.h F: xen/include/xen/livepatch* F: xen/test/livepatch/* @@ -473,7 +472,6 @@ R: Connor Davis S: Supported F: config/riscv64.mk F: xen/arch/riscv/ -F: xen/include/asm-riscv/ RTDS SCHEDULER M: Dario Faggioli @@ -502,8 +500,8 @@ F: stubdom/ TEE MEDIATORS M: Volodymyr Babchuk S: Supported +F: xen/arch/arm/include/asm/tee F: xen/arch/arm/tee/ -F: xen/include/asm-arm/tee TOOLSTACK M: Wei Liu @@ -531,6 +529,8 @@ F: tools/misc/xen-access.c F: xen/arch/*/monitor.c F: xen/arch/*/vm_event.c F: xen/arch/arm/mem_access.c +F: xen/arch/x86/include/asm/hvm/monitor.h +F: xen/arch/x86/include/asm/hvm/vm_event.h F: xen/arch/x86/mm/mem_access.c F: xen/arch/x86/hvm/monitor.c F: xen/arch/x86/hvm/vm_event.c @@ -540,8 +540,6 @@ F: xen/common/vm_event.c F: xen/include/*/mem_access.h F: xen/include/*/monitor.h F: xen/include/*/vm_event.h -F: xen/include/asm-x86/hvm/monitor.h -F: xen/include/asm-x86/hvm/vm_event.h VPCI M: Roger Pau Monné @@ -567,7 +565,6 @@ R: Wei Liu S: Supported L: xen-devel@lists.xenproject.org F: xen/arch/x86/ -F: xen/include/asm-x86/ F: xen/include/public/arch-x86/ F: xen/include/xen/lib/x86 F: xen/lib/x86 @@ -587,10 +584,10 @@ F: xen/arch/x86/hvm/emulate.c F: xen/arch/x86/hvm/intercept.c F: xen/arch/x86/hvm/io.c F: xen/arch/x86/hvm/ioreq.c -F: xen/include/asm-x86/hvm/emulate.h -F: xen/include/asm-x86/hvm/io.h -F: xen/include/asm-x86/hvm/ioreq.h -F: xen/include/asm-x86/ioreq.h +F: xen/arch/x86/include/asm/hvm/emulate.h +F: xen/arch/x86/include/asm/hvm/io.h +F: xen/arch/x86/include/asm/hvm/ioreq.h +F: xen/arch/x86/include/asm/ioreq.h X86 MEMORY MANAGEMENT M: Jan Beulich @@ -622,10 +619,10 @@ M: Wei Liu S: Supported F: xen/arch/x86/guest/hyperv/ F: xen/arch/x86/hvm/viridian/ -F: xen/include/asm-x86/guest/hyperv.h -F: xen/include/asm-x86/guest/hyperv-hcall.h -F: xen/include/asm-x86/guest/hyperv-tlfs.h -F: xen/include/asm-x86/hvm/viridian.h +F: xen/arch/x86/include/asm/guest/hyperv.h +F: xen/arch/x86/include/asm/guest/hyperv-hcall.h +F: xen/arch/x86/include/asm/guest/hyperv-tlfs.h +F: xen/arch/x86/include/asm/hvm/viridian.h XENSTORE M: Wei Liu diff --git a/tools/include/Makefile b/tools/include/Makefile index 42605d46b9..d7b51006e0 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -30,7 +30,7 @@ xen-dir: ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/ ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/ ifeq ($(CONFIG_X86),y) - ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm + ln -s $(XEN_ROOT)/xen/arch/x86/include/asm xen/ mkdir -p xen/lib/x86 ln -s $(filter-out %autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/ ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/ diff --git a/tools/misc/xen-access.c b/tools/misc/xen-access.c index 4bbef0bd2e..0731c20b83 100644 --- a/tools/misc/xen-access.c +++ b/tools/misc/xen-access.c @@ -56,11 +56,11 @@ #define ERROR(a, b...) fprintf(stderr, a "\n", ## b) #define PERROR(a, b...) fprintf(stderr, a ": %s\n", ## b, strerror(errno)) -/* From xen/include/asm-x86/processor.h */ +/* From xen/arch/x86/include/asm/processor.h */ #define X86_TRAP_DEBUG 1 #define X86_TRAP_INT3 3 -/* From xen/include/asm-x86/x86-defns.h */ +/* From xen/arch/x86/include/asm/x86-defns.h */ #define X86_CR4_PGE 0x00000080 /* enable global pages */ typedef struct vm_event { diff --git a/tools/tests/vhpet/Makefile b/tools/tests/vhpet/Makefile index cb88dd01c5..2d56ffdfd9 100644 --- a/tools/tests/vhpet/Makefile +++ b/tools/tests/vhpet/Makefile @@ -32,7 +32,7 @@ distclean: clean .PHONY: install install: -hpet.h: $(XEN_ROOT)/xen/include/asm-x86/hpet.h +hpet.h: $(XEN_ROOT)/xen/arch/x86/include/asm/hpet.h cp $< $@ hpet.c: $(XEN_ROOT)/xen/arch/x86/hvm/hpet.c diff --git a/xen/Makefile b/xen/Makefile index 1fd48af7ae..b2a63edca1 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -166,7 +166,7 @@ ifeq ($(TARGET_ARCH),x86) t1 = $(call as-insn,$(CC),".L0: .L1: .skip (.L1 - .L0)",,-no-integrated-as) # Check whether clang asm()-s support .include. -t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/asm-defns.h\"",,-no-integrated-as) +t2 = $(call as-insn,$(CC) -I$(BASEDIR)/arch/x86/include,".include \"asm/asm-defns.h\"",,-no-integrated-as) # Check whether clang keeps .macro-s between asm()-s: # https://bugs.llvm.org/show_bug.cgi?id=36110 @@ -382,7 +382,7 @@ _clean: delete-unfresh-files -o -name ".*.o.tmp" -o -name "*~" -o -name "core" \ -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core - rm -f asm-offsets.s include/asm-*/asm-offsets.h + rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h rm -f .banner .allconfig.tmp .PHONY: _distclean @@ -396,7 +396,6 @@ $(TARGET).gz: $(TARGET) $(TARGET): delete-unfresh-files $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h - [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \ do test -r arch/$(TARGET_ARCH)/efi/$$f || \ ln -nsf ../../../common/efi/$$f arch/$(TARGET_ARCH)/efi/; \ @@ -404,7 +403,7 @@ $(TARGET): delete-unfresh-files true $(MAKE) -f $(BASEDIR)/Rules.mk -C include $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) include - $(MAKE) -f $(BASEDIR)/Rules.mk include/asm-$(TARGET_ARCH)/asm-offsets.h + $(MAKE) -f $(BASEDIR)/Rules.mk arch/$(TARGET_ARCH)/include/asm/asm-offsets.h $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) $@ # drivers/char/console.o contains static banner/compile info. Blow it away. @@ -450,7 +449,7 @@ asm-offsets.s: arch/$(TARGET_ARCH)/$(TARGET_SUBARCH)/asm-offsets.c $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< $(call move-if-changed,$@.new,$@) -include/asm-$(TARGET_ARCH)/asm-offsets.h: asm-offsets.s +arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s @(set -e; \ echo "/*"; \ echo " * DO NOT MODIFY."; \ @@ -468,8 +467,8 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: asm-offsets.s SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers lib test define all_sources - ( find include/asm-$(TARGET_ARCH) -name '*.h' -print; \ - find include -name 'asm-*' -prune -o -name '*.h' -print; \ + ( find arch/$(TARGET_ARCH)/include -name '*.h' -print; \ + find include -name '*.h' -print; \ find $(SUBDIRS) -name '*.[chS]' -print ) endef diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 664a9f89ed..1d53e6a898 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -8,19 +8,19 @@ arm64: bitops: last sync @ v3.16-rc6 (last commit: 8715466b6027) -linux/arch/arm64/include/asm/bitops.h xen/include/asm-arm/arm64/bitops.h +linux/arch/arm64/include/asm/bitops.h xen/arch/arm/include/asm/arm64/bitops.h --------------------------------------------------------------------- cmpxchg: last sync @ v3.16-rc6 (last commit: e1dfda9ced9b) -linux/arch/arm64/include/asm/cmpxchg.h xen/include/asm-arm/arm64/cmpxchg.h +linux/arch/arm64/include/asm/cmpxchg.h xen/arch/arm/include/asm/arm64/cmpxchg.h --------------------------------------------------------------------- atomics: last sync @ v3.16-rc6 (last commit: 8715466b6027) -linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h +linux/arch/arm64/include/asm/atomic.h xen/arch/arm/include/asm/arm64/atomic.h The following functions were taken from Linux: atomic_add(), atomic_add_return(), atomic_sub(), atomic_sub_return(), @@ -76,13 +76,13 @@ diff -u ../linux/arch/arm/lib/findbit.S xen/arch/arm/arm32/lib/findbit.S cmpxchg: last sync @ v3.16-rc6 (last commit: c32ffce0f66e) -linux/arch/arm/include/asm/cmpxchg.h xen/include/asm-arm/arm32/cmpxchg.h +linux/arch/arm/include/asm/cmpxchg.h xen/arch/arm/include/asm/arm32/cmpxchg.h --------------------------------------------------------------------- atomics: last sync @ v3.16-rc6 (last commit: 030d0178bdbd) -linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h +linux/arch/arm/include/asm/atomic.h xen/arch/arm/include/asm/arm32/atomic.h The following functions were taken from Linux: atomic_add(), atomic_add_return(), atomic_sub(), atomic_sub_return(), diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk index 6a29820594..c3ac443b37 100644 --- a/xen/arch/arm/arch.mk +++ b/xen/arch/arm/arch.mk @@ -2,6 +2,7 @@ # arm-specific definitions CFLAGS += -I$(BASEDIR)/include +CFLAGS += -I$(BASEDIR)/arch/$(TARGET_ARCH)/include $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) $(call cc-option-add,CFLAGS,CC,-Wnested-externs) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 7178865f48..b5912d381b 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -599,7 +599,7 @@ remove_identity_mapping: strd r2, r3, [r0, r1] identity_mapping_removed: - /* See asm-arm/arm32/flushtlb.h for the explanation of the sequence. */ + /* See asm/arm32/flushtlb.h for the explanation of the sequence. */ dsb nshst mcr CP32(r0, TLBIALLH) dsb nsh diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index aa1f88c764..51b00ab0be 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -737,7 +737,7 @@ remove_identity_mapping: str xzr, [x0, x1, lsl #3] identity_mapping_removed: - /* See asm-arm/arm64/flushtlb.h for the explanation of the sequence. */ + /* See asm/arm64/flushtlb.h for the explanation of the sequence. */ dsb nshst tlbi alle2 dsb nsh diff --git a/xen/arch/arm/include/asm/acpi.h b/xen/arch/arm/include/asm/acpi.h new file mode 100644 index 0000000000..e53973e054 --- /dev/null +++ b/xen/arch/arm/include/asm/acpi.h @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2015, Shannon Zhao + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * 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 . + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ + +#ifndef _ASM_ARM_ACPI_H +#define _ASM_ARM_ACPI_H + +#include + +#define COMPILER_DEPENDENT_INT64 long long +#define COMPILER_DEPENDENT_UINT64 unsigned long long +#define ACPI_MAP_MEM_ATTR PAGE_HYPERVISOR + +/* Tables marked as reserved in efi table */ +typedef enum { + TBL_FADT, + TBL_MADT, + TBL_STAO, + TBL_XSDT, + TBL_RSDP, + TBL_EFIT, + TBL_MMAP, + TBL_MMAX, +} EFI_MEM_RES; + +bool acpi_psci_present(void); +bool acpi_psci_hvc_present(void); +void acpi_smp_init_cpus(void); + +/* + * This function returns the offset of a given ACPI/EFI table in the allocated + * memory region. Currently, the tables should be created in the same order as + * their associated 'index' in the enum EFI_MEM_RES. This means the function + * won't return the correct offset until all the tables before a given 'index' + * are created. + */ +paddr_t acpi_get_table_offset(struct membank tbl_add[], EFI_MEM_RES index); + +/* Macros for consistency checks of the GICC subtable of MADT */ +#define ACPI_MADT_GICC_LENGTH \ + (acpi_gbl_FADT.header.revision < 6 ? 76 : 80) + +#define BAD_MADT_GICC_ENTRY(entry, end) \ + (!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) || \ + (entry)->header.length != ACPI_MADT_GICC_LENGTH) + +#ifdef CONFIG_ACPI +extern bool acpi_disabled; +/* Basic configuration for ACPI */ +static inline void disable_acpi(void) +{ + acpi_disabled = true; +} + +static inline void enable_acpi(void) +{ + acpi_disabled = false; +} +#else +#define acpi_disabled (true) +#define disable_acpi() +#define enable_acpi() +#endif + +#endif /*_ASM_ARM_ACPI_H*/ diff --git a/xen/arch/arm/include/asm/alternative.h b/xen/arch/arm/include/asm/alternative.h new file mode 100644 index 0000000000..1eb4b60fbb --- /dev/null +++ b/xen/arch/arm/include/asm/alternative.h @@ -0,0 +1,221 @@ +#ifndef __ASM_ALTERNATIVE_H +#define __ASM_ALTERNATIVE_H + +#include +#include + +#define ARM_CB_PATCH ARM_NCAPS + +#ifndef __ASSEMBLY__ + +#include +#include + +struct alt_instr { + s32 orig_offset; /* offset to original instruction */ + s32 alt_offset; /* offset to replacement instruction */ + u16 cpufeature; /* cpufeature bit set for replacement */ + u8 orig_len; /* size of original instruction(s) */ + u8 alt_len; /* size of new instruction(s), <= orig_len */ +}; + +/* Xen: helpers used by common code. */ +#define __ALT_PTR(a,f) ((void *)&(a)->f + (a)->f) +#define ALT_ORIG_PTR(a) __ALT_PTR(a, orig_offset) +#define ALT_REPL_PTR(a) __ALT_PTR(a, alt_offset) + +typedef void (*alternative_cb_t)(const struct alt_instr *alt, + const uint32_t *origptr, uint32_t *updptr, + int nr_inst); + +void apply_alternatives_all(void); +int apply_alternatives(const struct alt_instr *start, const struct alt_instr *end); + +#define ALTINSTR_ENTRY(feature, cb) \ + " .word 661b - .\n" /* label */ \ + " .if " __stringify(cb) " == 0\n" \ + " .word 663f - .\n" /* new instruction */ \ + " .else\n" \ + " .word " __stringify(cb) "- .\n" /* callback */ \ + " .endif\n" \ + " .hword " __stringify(feature) "\n" /* feature bit */ \ + " .byte 662b-661b\n" /* source len */ \ + " .byte 664f-663f\n" /* replacement len */ + +/* + * alternative assembly primitive: + * + * If any of these .org directive fail, it means that insn1 and insn2 + * don't have the same length. This used to be written as + * + * .if ((664b-663b) != (662b-661b)) + * .error "Alternatives instruction length mismatch" + * .endif + * + * but most assemblers die if insn1 or insn2 have a .inst. This should + * be fixed in a binutils release posterior to 2.25.51.0.2 (anything + * containing commit 4e4d08cf7399b606 or c1baaddf8861). + * + * Alternatives with callbacks do not generate replacement instructions. + */ +#define __ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg_enabled, cb) \ + ".if "__stringify(cfg_enabled)" == 1\n" \ + "661:\n\t" \ + oldinstr "\n" \ + "662:\n" \ + ".pushsection .altinstructions,\"a\"\n" \ + ALTINSTR_ENTRY(feature,cb) \ + ".popsection\n" \ + " .if " __stringify(cb) " == 0\n" \ + ".pushsection .altinstr_replacement, \"ax\"\n" \ + "663:\n\t" \ + newinstr "\n" \ + "664:\n\t" \ + ".popsection\n\t" \ + ".org . - (664b-663b) + (662b-661b)\n\t" \ + ".org . - (662b-661b) + (664b-663b)\n" \ + ".else\n\t" \ + "663:\n\t" \ + "664:\n\t" \ + ".endif\n" \ + ".endif\n" + +#define _ALTERNATIVE_CFG(oldinstr, newinstr, feature, cfg, ...) \ + __ALTERNATIVE_CFG(oldinstr, newinstr, feature, IS_ENABLED(cfg), 0) + +#define ALTERNATIVE_CB(oldinstr, cb) \ + __ALTERNATIVE_CFG(oldinstr, "NOT_AN_INSTRUCTION", ARM_CB_PATCH, 1, cb) +#else + +#include +#include + +.macro altinstruction_entry orig_offset alt_offset feature orig_len alt_len + .word \orig_offset - . + .word \alt_offset - . + .hword \feature + .byte \orig_len + .byte \alt_len +.endm + +.macro alternative_insn insn1, insn2, cap, enable = 1 + .if \enable +661: \insn1 +662: .pushsection .altinstructions, "a" + altinstruction_entry 661b, 663f, \cap, 662b-661b, 664f-663f + .popsection + .pushsection .altinstr_replacement, "ax" +663: \insn2 +664: .popsection + .org . - (664b-663b) + (662b-661b) + .org . - (662b-661b) + (664b-663b) + .endif +.endm + +/* + * Alternative sequences + * + * The code for the case where the capability is not present will be + * assembled and linked as normal. There are no restrictions on this + * code. + * + * The code for the case where the capability is present will be + * assembled into a special section to be used for dynamic patching. + * Code for that case must: + * + * 1. Be exactly the same length (in bytes) as the default code + * sequence. + * + * 2. Not contain a branch target that is used outside of the + * alternative sequence it is defined in (branches into an + * alternative sequence are not fixed up). + */ + +/* + * Begin an alternative code sequence. + */ +.macro alternative_if_not cap + .set .Lasm_alt_mode, 0 + .pushsection .altinstructions, "a" + altinstruction_entry 661f, 663f, \cap, 662f-661f, 664f-663f + .popsection +661: +.endm + +.macro alternative_if cap + .set .Lasm_alt_mode, 1 + .pushsection .altinstructions, "a" + altinstruction_entry 663f, 661f, \cap, 664f-663f, 662f-661f + .popsection + .pushsection .altinstr_replacement, "ax" + .align 2 /* So GAS knows label 661 is suitably aligned */ +661: +.endm + +/* + * Provide the other half of the alternative code sequence. + */ +.macro alternative_else +662: + .if .Lasm_alt_mode==0 + .pushsection .altinstr_replacement, "ax" + .else + .popsection + .endif +663: +.endm + +.macro alternative_cb cb + .set .Lasm_alt_mode, 0 + .pushsection .altinstructions, "a" + altinstruction_entry 661f, \cb, ARM_CB_PATCH, 662f-661f, 0 + .popsection +661: +.endm + +/* + * Complete an alternative code sequence. + */ +.macro alternative_endif +664: + .if .Lasm_alt_mode==0 + .popsection + .endif + .org . - (664b-663b) + (662b-661b) + .org . - (662b-661b) + (664b-663b) +.endm + +/* + * Provides a trivial alternative or default sequence consisting solely + * of NOPs. The number of NOPs is chosen automatically to match the + * previous case. + */ +.macro alternative_else_nop_endif +alternative_else + nops (662b-661b) / ARCH_PATCH_INSN_SIZE +alternative_endif +.endm + +/* + * Callback-based alternative epilogue + */ +.macro alternative_cb_end +662: +.endm + +#define _ALTERNATIVE_CFG(insn1, insn2, cap, cfg, ...) \ + alternative_insn insn1, insn2, cap, IS_ENABLED(cfg) + +#endif /* __ASSEMBLY__ */ + +/* + * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature)); + * + * Usage: asm(ALTERNATIVE(oldinstr, newinstr, feature, CONFIG_FOO)); + * N.B. If CONFIG_FOO is specified, but not selected, the whole block + * will be omitted, including oldinstr. + */ +#define ALTERNATIVE(oldinstr, newinstr, ...) \ + _ALTERNATIVE_CFG(oldinstr, newinstr, __VA_ARGS__, 1) + +#endif /* __ASM_ALTERNATIVE_H */ diff --git a/xen/arch/arm/include/asm/altp2m.h b/xen/arch/arm/include/asm/altp2m.h new file mode 100644 index 0000000000..df50cb2f09 --- /dev/null +++ b/xen/arch/arm/include/asm/altp2m.h @@ -0,0 +1,39 @@ +/* + * Alternate p2m + * + * Copyright (c) 2014, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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 . + */ + +#ifndef __ASM_ARM_ALTP2M_H +#define __ASM_ARM_ALTP2M_H + +#include + +/* Alternate p2m on/off per domain */ +static inline bool altp2m_active(const struct domain *d) +{ + /* Not implemented on ARM. */ + return false; +} + +/* Alternate p2m VCPU */ +static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) +{ + /* Not implemented on ARM, should not be reached. */ + BUG(); + return 0; +} + +#endif /* __ASM_ARM_ALTP2M_H */ diff --git a/xen/arch/arm/include/asm/arm32/atomic.h b/xen/arch/arm/include/asm/arm32/atomic.h new file mode 100644 index 0000000000..2832a72792 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/atomic.h @@ -0,0 +1,175 @@ +/* + * arch/arm/include/asm/atomic.h + * + * Copyright (C) 1996 Russell King. + * Copyright (C) 2002 Deep Blue Solutions Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ARCH_ARM_ARM32_ATOMIC__ +#define __ARCH_ARM_ARM32_ATOMIC__ + +/* + * ARMv6 UP and SMP safe atomic ops. We use load exclusive and + * store exclusive to ensure that these are atomic. We may loop + * to ensure that the update happens. + */ +static inline void atomic_add(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + prefetchw(&v->counter); + __asm__ __volatile__("@ atomic_add\n" +"1: ldrex %0, [%3]\n" +" add %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); +} + +static inline int atomic_add_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + smp_mb(); + prefetchw(&v->counter); + + __asm__ __volatile__("@ atomic_add_return\n" +"1: ldrex %0, [%3]\n" +" add %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); + + smp_mb(); + + return result; +} + +static inline void atomic_sub(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + prefetchw(&v->counter); + __asm__ __volatile__("@ atomic_sub\n" +"1: ldrex %0, [%3]\n" +" sub %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); +} + +static inline int atomic_sub_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + smp_mb(); + prefetchw(&v->counter); + + __asm__ __volatile__("@ atomic_sub_return\n" +"1: ldrex %0, [%3]\n" +" sub %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (i) + : "cc"); + + smp_mb(); + + return result; +} + +static inline void atomic_and(int m, atomic_t *v) +{ + unsigned long tmp; + int result; + + prefetchw(&v->counter); + __asm__ __volatile__("@ atomic_and\n" +"1: ldrex %0, [%3]\n" +" and %0, %0, %4\n" +" strex %1, %0, [%3]\n" +" teq %1, #0\n" +" bne 1b" + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "Ir" (m) + : "cc"); +} + +static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) +{ + int oldval; + unsigned long res; + + smp_mb(); + prefetchw(&ptr->counter); + + do { + __asm__ __volatile__("@ atomic_cmpxchg\n" + "ldrex %1, [%3]\n" + "mov %0, #0\n" + "teq %1, %4\n" + "strexeq %0, %5, [%3]\n" + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter) + : "r" (&ptr->counter), "Ir" (old), "r" (new) + : "cc"); + } while (res); + + smp_mb(); + + return oldval; +} + +static inline int __atomic_add_unless(atomic_t *v, int a, int u) +{ + int oldval, newval; + unsigned long tmp; + + smp_mb(); + prefetchw(&v->counter); + + __asm__ __volatile__ ("@ atomic_add_unless\n" +"1: ldrex %0, [%4]\n" +" teq %0, %5\n" +" beq 2f\n" +" add %1, %0, %6\n" +" strex %2, %1, [%4]\n" +" teq %2, #0\n" +" bne 1b\n" +"2:" + : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter) + : "r" (&v->counter), "r" (u), "r" (a) + : "cc"); + + if (oldval != u) + smp_mb(); + + return oldval; +} + +#endif /* __ARCH_ARM_ARM32_ATOMIC__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * indent-tabs-mode: t + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/bitops.h b/xen/arch/arm/include/asm/arm32/bitops.h new file mode 100644 index 0000000000..57938a5874 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/bitops.h @@ -0,0 +1,42 @@ +#ifndef _ARM_ARM32_BITOPS_H +#define _ARM_ARM32_BITOPS_H + +#define flsl fls + +/* + * Little endian assembly bitops. nr = 0 -> byte 0 bit 0. + */ +extern int _find_first_zero_bit_le(const void * p, unsigned size); +extern int _find_next_zero_bit_le(const void * p, int size, int offset); +extern int _find_first_bit_le(const unsigned long *p, unsigned size); +extern int _find_next_bit_le(const unsigned long *p, int size, int offset); + +/* + * Big endian assembly bitops. nr = 0 -> byte 3 bit 0. + */ +extern int _find_first_zero_bit_be(const void * p, unsigned size); +extern int _find_next_zero_bit_be(const void * p, int size, int offset); +extern int _find_first_bit_be(const unsigned long *p, unsigned size); +extern int _find_next_bit_be(const unsigned long *p, int size, int offset); + +#ifndef __ARMEB__ +/* + * These are the little endian, atomic definitions. + */ +#define find_first_zero_bit(p,sz) _find_first_zero_bit_le(p,sz) +#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_le(p,sz,off) +#define find_first_bit(p,sz) _find_first_bit_le(p,sz) +#define find_next_bit(p,sz,off) _find_next_bit_le(p,sz,off) + +#else +/* + * These are the big endian, atomic definitions. + */ +#define find_first_zero_bit(p,sz) _find_first_zero_bit_be(p,sz) +#define find_next_zero_bit(p,sz,off) _find_next_zero_bit_be(p,sz,off) +#define find_first_bit(p,sz) _find_first_bit_be(p,sz) +#define find_next_bit(p,sz,off) _find_next_bit_be(p,sz,off) + +#endif + +#endif /* _ARM_ARM32_BITOPS_H */ diff --git a/xen/arch/arm/include/asm/arm32/bug.h b/xen/arch/arm/include/asm/arm32/bug.h new file mode 100644 index 0000000000..25cce151dc --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/bug.h @@ -0,0 +1,15 @@ +#ifndef __ARM_ARM32_BUG_H__ +#define __ARM_ARM32_BUG_H__ + +#include + +/* ARMv7 provides a list of undefined opcode (see A8.8.247 DDI 0406C.b) + * Use one them encoding A1 to go in exception mode + */ +#define BUG_OPCODE 0xe7f000f0 + +#define BUG_INSTR ".word " __stringify(BUG_OPCODE) + +#define BUG_FN_REG r0 + +#endif /* __ARM_ARM32_BUG_H__ */ diff --git a/xen/arch/arm/include/asm/arm32/cmpxchg.h b/xen/arch/arm/include/asm/arm32/cmpxchg.h new file mode 100644 index 0000000000..b0bd1d8b68 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/cmpxchg.h @@ -0,0 +1,229 @@ +#ifndef __ASM_ARM32_CMPXCHG_H +#define __ASM_ARM32_CMPXCHG_H + +#include + +extern void __bad_xchg(volatile void *, int); + +static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) +{ + unsigned long ret; + unsigned int tmp; + + smp_mb(); + prefetchw((const void *)ptr); + + switch (size) { + case 1: + asm volatile("@ __xchg1\n" + "1: ldrexb %0, [%3]\n" + " strexb %1, %2, [%3]\n" + " teq %1, #0\n" + " bne 1b" + : "=&r" (ret), "=&r" (tmp) + : "r" (x), "r" (ptr) + : "memory", "cc"); + break; + case 4: + asm volatile("@ __xchg4\n" + "1: ldrex %0, [%3]\n" + " strex %1, %2, [%3]\n" + " teq %1, #0\n" + " bne 1b" + : "=&r" (ret), "=&r" (tmp) + : "r" (x), "r" (ptr) + : "memory", "cc"); + break; + default: + __bad_xchg(ptr, size), ret = 0; + break; + } + smp_mb(); + + return ret; +} + +#define xchg(ptr,x) \ + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) + +/* + * Atomic compare and exchange. Compare OLD with MEM, if identical, + * store NEW in MEM. Return the initial value in MEM. Success is + * indicated by comparing RETURN with OLD. + */ + +extern unsigned long __bad_cmpxchg(volatile void *ptr, int size); + +#define __CMPXCHG_CASE(sz, name) \ +static inline bool __cmpxchg_case_##name(volatile void *ptr, \ + unsigned long *old, \ + unsigned long new, \ + bool timeout, \ + unsigned int max_try) \ +{ \ + unsigned long oldval; \ + unsigned long res; \ + \ + do { \ + asm volatile("@ __cmpxchg_case_" #name "\n" \ + " ldrex" #sz " %1, [%2]\n" \ + " mov %0, #0\n" \ + " teq %1, %3\n" \ + " strex" #sz "eq %0, %4, [%2]\n" \ + : "=&r" (res), "=&r" (oldval) \ + : "r" (ptr), "Ir" (*old), "r" (new) \ + : "memory", "cc"); \ + \ + if (!res) \ + break; \ + } while (!timeout || ((--max_try) > 0)); \ + \ + *old = oldval; \ + \ + return !res; \ +} + +__CMPXCHG_CASE(b, 1) +__CMPXCHG_CASE(h, 2) +__CMPXCHG_CASE( , 4) + +static inline bool __cmpxchg_case_8(volatile uint64_t *ptr, + uint64_t *old, + uint64_t new, + bool timeout, + unsigned int max_try) +{ + uint64_t oldval; + uint64_t res; + + do { + asm volatile( + " ldrexd %1, %H1, [%3]\n" + " teq %1, %4\n" + " teqeq %H1, %H4\n" + " movne %0, #0\n" + " movne %H0, #0\n" + " bne 2f\n" + " strexd %0, %5, %H5, [%3]\n" + "2:" + : "=&r" (res), "=&r" (oldval), "+Qo" (*ptr) + : "r" (ptr), "r" (*old), "r" (new) + : "memory", "cc"); + if (!res) + break; + } while (!timeout || ((--max_try) > 0)); + + *old = oldval; + + return !res; +} + +static always_inline bool __int_cmpxchg(volatile void *ptr, unsigned long *old, + unsigned long new, int size, + bool timeout, unsigned int max_try) +{ + prefetchw((const void *)ptr); + + switch (size) { + case 1: + return __cmpxchg_case_1(ptr, old, new, timeout, max_try); + case 2: + return __cmpxchg_case_2(ptr, old, new, timeout, max_try); + case 4: + return __cmpxchg_case_4(ptr, old, new, timeout, max_try); + default: + return __bad_cmpxchg(ptr, size); + } + + ASSERT_UNREACHABLE(); +} + +static always_inline unsigned long __cmpxchg(volatile void *ptr, + unsigned long old, + unsigned long new, + int size) +{ + smp_mb(); + if (!__int_cmpxchg(ptr, &old, new, size, false, 0)) + ASSERT_UNREACHABLE(); + smp_mb(); + + return old; +} + +/* + * The helper may fail to update the memory if the action takes too long. + * + * @old: On call the value pointed contains the expected old value. It will be + * updated to the actual old value. + * @max_try: Maximum number of iterations + * + * The helper will return true when the update has succeeded (i.e no + * timeout) and false if the update has failed. + */ +static always_inline bool __cmpxchg_timeout(volatile void *ptr, + unsigned long *old, + unsigned long new, + int size, + unsigned int max_try) +{ + bool ret; + + smp_mb(); + ret = __int_cmpxchg(ptr, old, new, size, true, max_try); + smp_mb(); + + return ret; +} + +/* + * The helper may fail to update the memory if the action takes too long. + * + * @old: On call the value pointed contains the expected old value. It will be + * updated to the actual old value. + * @max_try: Maximum number of iterations + * + * The helper will return true when the update has succeeded (i.e no + * timeout) and false if the update has failed. + */ +static always_inline bool __cmpxchg64_timeout(volatile uint64_t *ptr, + uint64_t *old, + uint64_t new, + unsigned int max_try) +{ + bool ret; + + smp_mb(); + ret = __cmpxchg_case_8(ptr, old, new, true, max_try); + smp_mb(); + + return ret; +} + +#define cmpxchg(ptr,o,n) \ + ((__typeof__(*(ptr)))__cmpxchg((ptr), \ + (unsigned long)(o), \ + (unsigned long)(n), \ + sizeof(*(ptr)))) + +static inline uint64_t cmpxchg64(volatile uint64_t *ptr, + uint64_t old, + uint64_t new) +{ + smp_mb(); + if (!__cmpxchg_case_8(ptr, &old, new, false, 0)) + ASSERT_UNREACHABLE(); + smp_mb(); + + return old; +} + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * indent-tabs-mode: t + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/flushtlb.h b/xen/arch/arm/include/asm/arm32/flushtlb.h new file mode 100644 index 0000000000..9085e65011 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/flushtlb.h @@ -0,0 +1,63 @@ +#ifndef __ASM_ARM_ARM32_FLUSHTLB_H__ +#define __ASM_ARM_ARM32_FLUSHTLB_H__ + +/* + * Every invalidation operation use the following patterns: + * + * DSB ISHST // Ensure prior page-tables updates have completed + * TLBI... // Invalidate the TLB + * DSB ISH // Ensure the TLB invalidation has completed + * ISB // See explanation below + * + * For Xen page-tables the ISB will discard any instructions fetched + * from the old mappings. + * + * For the Stage-2 page-tables the ISB ensures the completion of the DSB + * (and therefore the TLB invalidation) before continuing. So we know + * the TLBs cannot contain an entry for a mapping we may have removed. + */ +#define TLB_HELPER(name, tlbop) \ +static inline void name(void) \ +{ \ + dsb(ishst); \ + WRITE_CP32(0, tlbop); \ + dsb(ish); \ + isb(); \ +} + +/* Flush local TLBs, current VMID only */ +TLB_HELPER(flush_guest_tlb_local, TLBIALL); + +/* Flush inner shareable TLBs, current VMID only */ +TLB_HELPER(flush_guest_tlb, TLBIALLIS); + +/* Flush local TLBs, all VMIDs, non-hypervisor mode */ +TLB_HELPER(flush_all_guests_tlb_local, TLBIALLNSNH); + +/* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ +TLB_HELPER(flush_all_guests_tlb, TLBIALLNSNHIS); + +/* Flush all hypervisor mappings from the TLB of the local processor. */ +TLB_HELPER(flush_xen_tlb_local, TLBIALLH); + +/* Flush TLB of local processor for address va. */ +static inline void __flush_xen_tlb_one_local(vaddr_t va) +{ + asm volatile(STORE_CP32(0, TLBIMVAH) : : "r" (va) : "memory"); +} + +/* Flush TLB of all processors in the inner-shareable domain for address va. */ +static inline void __flush_xen_tlb_one(vaddr_t va) +{ + asm volatile(STORE_CP32(0, TLBIMVAHIS) : : "r" (va) : "memory"); +} + +#endif /* __ASM_ARM_ARM32_FLUSHTLB_H__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/insn.h b/xen/arch/arm/include/asm/arm32/insn.h new file mode 100644 index 0000000000..c800cbfff5 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/insn.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2017 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 . + */ +#ifndef __ARCH_ARM_ARM32_INSN +#define __ARCH_ARM_ARM32_INSN + +#include + +int32_t aarch32_get_branch_offset(uint32_t insn); +uint32_t aarch32_set_branch_offset(uint32_t insn, int32_t offset); + +/* Wrapper for common code */ +static inline bool insn_is_branch_imm(uint32_t insn) +{ + /* + * Xen is using ARM execution state only on ARM32 platform. So, the + * Thumb branch instructions (CBZ, CBNZ, TBB and TBH) will not be used + * in Xen. The left ARM32 branch instructions are BX, BLX, BL and B. + * BX is using register as parameter, we don't need to rewrite it. So, + * we only need to check BLX, BL and B encodings in this function. + * + * From ARM DDI 0406C.c Section A8.8.18 and A8.8.25, we can see these + * three branch instructions' encodings: + * - b cccc1010xxxxxxxxxxxxxxxxxxxxxxxx + * - bl cccc1011xxxxxxxxxxxxxxxxxxxxxxxx + * - blx 1111101Hxxxxxxxxxxxxxxxxxxxxxxxx + * + * The H bit of blx can be 0 or 1, it depends on the Instruction Sets of + * target instruction. Regardless, if we mask the conditional bits and + * bit 24 (H bit of blx), we can see all above branch instructions have + * the same value 0x0A000000. + * + * And from ARM DDI 0406C.c Section A5.7 Table A5-23, we can see that the + * blx is the only one unconditional instruction has the same value as + * conditional branch instructions. So, mask the conditional bits will not + * make other unconditional instruction to hit this check. + */ + return ( (insn & 0x0E000000) == 0x0A000000 ); +} + +static inline int32_t insn_get_branch_offset(uint32_t insn) +{ + return aarch32_get_branch_offset(insn); +} + +static inline uint32_t insn_set_branch_offset(uint32_t insn, int32_t offset) +{ + return aarch32_set_branch_offset(insn, offset); +} + +#endif /* !__ARCH_ARM_ARM32_INSN */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/io.h b/xen/arch/arm/include/asm/arm32/io.h new file mode 100644 index 0000000000..73a879e9fb --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/io.h @@ -0,0 +1,96 @@ +/* + * Based on linux arch/arm/include/asm/io.h + * + * Copyright (C) 1996-2000 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Modifications: + * 16-Sep-1996 RMK Inlined the inx/outx functions & optimised for both + * constant addresses and variable addresses. + * 04-Dec-1997 RMK Moved a lot of this stuff to the new architecture + * specific IO header files. + * 27-Mar-1999 PJB Second parameter of memcpy_toio is const.. + * 04-Apr-1999 PJB Added check_signature. + * 12-Dec-1999 RMK More cleanups + * 18-Jun-2000 RMK Removed virt_to_* and friends definitions + * 05-Oct-2004 BJD Moved memory string functions to use void __iomem + */ +#ifndef _ARM_ARM32_IO_H +#define _ARM_ARM32_IO_H + +#include +#include + +static inline void __raw_writeb(u8 val, volatile void __iomem *addr) +{ + asm volatile("strb %1, %0" + : "+Qo" (*(volatile u8 __force *)addr) + : "r" (val)); +} + +static inline void __raw_writew(u16 val, volatile void __iomem *addr) +{ + asm volatile("strh %1, %0" + : "+Q" (*(volatile u16 __force *)addr) + : "r" (val)); +} + +static inline void __raw_writel(u32 val, volatile void __iomem *addr) +{ + asm volatile("str %1, %0" + : "+Qo" (*(volatile u32 __force *)addr) + : "r" (val)); +} + +static inline u8 __raw_readb(const volatile void __iomem *addr) +{ + u8 val; + asm volatile("ldrb %1, %0" + : "+Qo" (*(volatile u8 __force *)addr), + "=r" (val)); + return val; +} + +static inline u16 __raw_readw(const volatile void __iomem *addr) +{ + u16 val; + asm volatile("ldrh %1, %0" + : "+Q" (*(volatile u16 __force *)addr), + "=r" (val)); + return val; +} + +static inline u32 __raw_readl(const volatile void __iomem *addr) +{ + u32 val; + asm volatile("ldr %1, %0" + : "+Qo" (*(volatile u32 __force *)addr), + "=r" (val)); + return val; +} + +#define __iormb() rmb() +#define __iowmb() wmb() + +#define readb_relaxed(c) ({ u8 __r = __raw_readb(c); __r; }) +#define readw_relaxed(c) ({ u16 __r = le16_to_cpu((__force __le16) \ + __raw_readw(c)); __r; }) +#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \ + __raw_readl(c)); __r; }) + +#define writeb_relaxed(v,c) __raw_writeb(v,c) +#define writew_relaxed(v,c) __raw_writew((__force u16) cpu_to_le16(v),c) +#define writel_relaxed(v,c) __raw_writel((__force u32) cpu_to_le32(v),c) + +#define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) +#define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) +#define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) + +#define writeb(v,c) ({ __iowmb(); writeb_relaxed(v,c); }) +#define writew(v,c) ({ __iowmb(); writew_relaxed(v,c); }) +#define writel(v,c) ({ __iowmb(); writel_relaxed(v,c); }) + +#endif /* _ARM_ARM32_IO_H */ diff --git a/xen/arch/arm/include/asm/arm32/macros.h b/xen/arch/arm/include/asm/arm32/macros.h new file mode 100644 index 0000000000..a4e20aa520 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/macros.h @@ -0,0 +1,8 @@ +#ifndef __ASM_ARM_ARM32_MACROS_H +#define __ASM_ARM_ARM32_MACROS_H + + .macro ret + mov pc, lr + .endm + +#endif /* __ASM_ARM_ARM32_MACROS_H */ diff --git a/xen/arch/arm/include/asm/arm32/mm.h b/xen/arch/arm/include/asm/arm32/mm.h new file mode 100644 index 0000000000..68612499bf --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/mm.h @@ -0,0 +1,23 @@ +#ifndef __ARM_ARM32_MM_H__ +#define __ARM_ARM32_MM_H__ + +/* + * Only a limited amount of RAM, called xenheap, is always mapped on ARM32. + * For convenience always return false. + */ +static inline bool arch_mfn_in_directmap(unsigned long mfn) +{ + return false; +} + +#endif /* __ARM_ARM32_MM_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/page.h b/xen/arch/arm/include/asm/arm32/page.h new file mode 100644 index 0000000000..715a9e4fef --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/page.h @@ -0,0 +1,118 @@ +#ifndef __ARM_ARM32_PAGE_H__ +#define __ARM_ARM32_PAGE_H__ + +#ifndef __ASSEMBLY__ + +/* Write a pagetable entry. + * + * If the table entry is changing a text mapping, it is responsibility + * of the caller to issue an ISB after write_pte. + */ +static inline void write_pte(lpae_t *p, lpae_t pte) +{ + asm volatile ( + /* Ensure any writes have completed with the old mappings. */ + "dsb;" + /* Safely write the entry (STRD is atomic on CPUs that support LPAE) */ + "strd %0, %H0, [%1];" + "dsb;" + : : "r" (pte.bits), "r" (p) : "memory"); +} + +/* Inline ASM to invalidate dcache on register R (may be an inline asm operand) */ +#define __invalidate_dcache_one(R) STORE_CP32(R, DCIMVAC) + +/* Inline ASM to flush dcache on register R (may be an inline asm operand) */ +#define __clean_dcache_one(R) STORE_CP32(R, DCCMVAC) + +/* Inline ASM to clean and invalidate dcache on register R (may be an + * inline asm operand) */ +#define __clean_and_invalidate_dcache_one(R) STORE_CP32(R, DCCIMVAC) + +/* + * Invalidate all instruction caches in Inner Shareable domain to PoU. + * We also need to flush the branch predictor for ARMv7 as it may be + * architecturally visible to the software (see B2.2.4 in ARM DDI 0406C.b). + */ +static inline void invalidate_icache(void) +{ + asm volatile ( + CMD_CP32(ICIALLUIS) /* Flush I-cache. */ + CMD_CP32(BPIALLIS) /* Flush branch predictor. */ + : : : "memory"); + + dsb(ish); /* Ensure completion of the flush I-cache */ + isb(); /* Synchronize fetched instruction stream. */ +} + +/* + * Invalidate all instruction caches on the local processor to PoU. + * We also need to flush the branch predictor for ARMv7 as it may be + * architecturally visible to the software (see B2.2.4 in ARM DDI 0406C.b). + */ +static inline void invalidate_icache_local(void) +{ + asm volatile ( + CMD_CP32(ICIALLU) /* Flush I-cache. */ + CMD_CP32(BPIALL) /* Flush branch predictor. */ + : : : "memory"); + + dsb(nsh); /* Ensure completion of the flush I-cache */ + isb(); /* Synchronize fetched instruction stream. */ +} + +/* Ask the MMU to translate a VA for us */ +static inline uint64_t __va_to_par(vaddr_t va) +{ + uint64_t par, tmp; + tmp = READ_CP64(PAR); + WRITE_CP32(va, ATS1HR); + isb(); /* Ensure result is available. */ + par = READ_CP64(PAR); + WRITE_CP64(tmp, PAR); + return par; +} + +/* Ask the MMU to translate a Guest VA for us */ +static inline uint64_t gva_to_ma_par(vaddr_t va, unsigned int flags) +{ + uint64_t par, tmp; + tmp = READ_CP64(PAR); + if ( (flags & GV2M_WRITE) == GV2M_WRITE ) + WRITE_CP32(va, ATS12NSOPW); + else + WRITE_CP32(va, ATS12NSOPR); + isb(); /* Ensure result is available. */ + par = READ_CP64(PAR); + WRITE_CP64(tmp, PAR); + return par; +} +static inline uint64_t gva_to_ipa_par(vaddr_t va, unsigned int flags) +{ + uint64_t par, tmp; + tmp = READ_CP64(PAR); + if ( (flags & GV2M_WRITE) == GV2M_WRITE ) + WRITE_CP32(va, ATS1CPW); + else + WRITE_CP32(va, ATS1CPR); + isb(); /* Ensure result is available. */ + par = READ_CP64(PAR); + WRITE_CP64(tmp, PAR); + return par; +} + +#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) + +#endif /* __ASSEMBLY__ */ + +#endif /* __ARM_ARM32_PAGE_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/processor.h b/xen/arch/arm/include/asm/arm32/processor.h new file mode 100644 index 0000000000..4e679f3273 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/processor.h @@ -0,0 +1,69 @@ +#ifndef __ASM_ARM_ARM32_PROCESSOR_H +#define __ASM_ARM_ARM32_PROCESSOR_H + +#define ACTLR_CAXX_SMP (1<<6) + +#ifndef __ASSEMBLY__ +/* On stack VCPU state */ +struct cpu_user_regs +{ + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + union { + uint32_t r11; + uint32_t fp; + }; + uint32_t r12; + + uint32_t sp; /* r13 - SP: Valid for Hyp. frames only, o/w banked (see below) */ + + /* r14 - LR: is the same physical register as LR_usr */ + union { + uint32_t lr; /* r14 - LR: Valid for Hyp. Same physical register as lr_usr. */ + + uint32_t lr_usr; + }; + + union { /* Return IP, pc32 is used to allow code to be common with 64-bit */ + uint32_t pc, pc32; + }; + uint32_t cpsr; /* Return mode */ + uint32_t hsr; /* Exception Syndrome */ + + /* Outer guest frame only from here on... */ + + uint32_t sp_usr; /* LR_usr is the same register as LR, see above */ + + uint32_t sp_irq, lr_irq; + uint32_t sp_svc, lr_svc; + uint32_t sp_abt, lr_abt; + uint32_t sp_und, lr_und; + + uint32_t r8_fiq, r9_fiq, r10_fiq, r11_fiq, r12_fiq; + uint32_t sp_fiq, lr_fiq; + + uint32_t spsr_svc, spsr_abt, spsr_und, spsr_irq, spsr_fiq; + + uint32_t pad1; /* Doubleword-align the user half of the frame */ +}; + +#endif + +#endif /* __ASM_ARM_ARM32_PROCESSOR_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/sysregs.h b/xen/arch/arm/include/asm/arm32/sysregs.h new file mode 100644 index 0000000000..6841d5de43 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/sysregs.h @@ -0,0 +1,78 @@ +#ifndef __ASM_ARM_ARM32_SYSREGS_H +#define __ASM_ARM_ARM32_SYSREGS_H + +#include +#include + +/* Layout as used in assembly, with src/dest registers mixed in */ +#define __CP32(r, coproc, opc1, crn, crm, opc2) coproc, opc1, r, crn, crm, opc2 +#define __CP64(r1, r2, coproc, opc, crm) coproc, opc, r1, r2, crm +#define CP32(r, name...) __CP32(r, name) +#define CP64(r, name...) __CP64(r, name) + +/* Stringified for inline assembly */ +#define LOAD_CP32(r, name...) "mrc " __stringify(CP32(%r, name)) ";" +#define STORE_CP32(r, name...) "mcr " __stringify(CP32(%r, name)) ";" +#define LOAD_CP64(r, name...) "mrrc " __stringify(CP64(%r, %H##r, name)) ";" +#define STORE_CP64(r, name...) "mcrr " __stringify(CP64(%r, %H##r, name)) ";" + +/* Issue a CP operation which takes no argument, + * uses r0 as a placeholder register. */ +#define CMD_CP32(name...) "mcr " __stringify(CP32(r0, name)) ";" + +#ifndef __ASSEMBLY__ + +/* C wrappers */ +#define READ_CP32(name...) ({ \ + register uint32_t _r; \ + asm volatile(LOAD_CP32(0, name) : "=r" (_r)); \ + _r; }) + +#define WRITE_CP32(v, name...) do { \ + register uint32_t _r = (v); \ + asm volatile(STORE_CP32(0, name) : : "r" (_r)); \ +} while (0) + +#define READ_CP64(name...) ({ \ + register uint64_t _r; \ + asm volatile(LOAD_CP64(0, name) : "=r" (_r)); \ + _r; }) + +#define WRITE_CP64(v, name...) do { \ + register uint64_t _r = (v); \ + asm volatile(STORE_CP64(0, name) : : "r" (_r)); \ +} while (0) + +/* + * C wrappers for accessing system registers. + * + * Registers come in 3 types: + * - those which are always 32-bit regardless of AArch32 vs AArch64 + * (use {READ,WRITE}_SYSREG32). + * - those which are always 64-bit regardless of AArch32 vs AArch64 + * (use {READ,WRITE}_SYSREG64). + * - those which vary between AArch32 and AArch64 (use {READ,WRITE}_SYSREG). + */ +#define READ_SYSREG32(R...) READ_CP32(R) +#define WRITE_SYSREG32(V, R...) WRITE_CP32(V, R) + +#define READ_SYSREG64(R...) READ_CP64(R) +#define WRITE_SYSREG64(V, R...) WRITE_CP64(V, R) + +#define READ_SYSREG(R...) READ_SYSREG32(R) +#define WRITE_SYSREG(V, R...) WRITE_SYSREG32(V, R) + +/* MVFR2 is not defined on ARMv7 */ +#define MVFR2_MAYBE_UNDEFINED + +#endif /* __ASSEMBLY__ */ + +#endif /* __ASM_ARM_ARM32_SYSREGS_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/system.h b/xen/arch/arm/include/asm/arm32/system.h new file mode 100644 index 0000000000..ab57abfbc5 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/system.h @@ -0,0 +1,77 @@ +/* Portions taken from Linux arch arm */ +#ifndef __ASM_ARM32_SYSTEM_H +#define __ASM_ARM32_SYSTEM_H + +#include + +#define local_irq_disable() asm volatile ( "cpsid i @ local_irq_disable\n" : : : "cc" ) +#define local_irq_enable() asm volatile ( "cpsie i @ local_irq_enable\n" : : : "cc" ) + +#define local_save_flags(x) \ +({ \ + BUILD_BUG_ON(sizeof(x) != sizeof(long)); \ + asm volatile ( "mrs %0, cpsr @ local_save_flags\n" \ + : "=r" (x) :: "memory", "cc" ); \ +}) +#define local_irq_save(x) \ +({ \ + local_save_flags(x); \ + local_irq_disable(); \ +}) +#define local_irq_restore(x) \ +({ \ + BUILD_BUG_ON(sizeof(x) != sizeof(long)); \ + asm volatile ( \ + "msr cpsr_c, %0 @ local_irq_restore\n" \ + : \ + : "r" (x) \ + : "memory", "cc"); \ +}) + +static inline int local_irq_is_enabled(void) +{ + unsigned long flags; + local_save_flags(flags); + return !(flags & PSR_IRQ_MASK); +} + +#define local_fiq_enable() __asm__("cpsie f @ __stf\n" : : : "memory", "cc") +#define local_fiq_disable() __asm__("cpsid f @ __clf\n" : : : "memory", "cc") + +#define local_abort_enable() __asm__("cpsie a @ __sta\n" : : : "memory", "cc") +#define local_abort_disable() __asm__("cpsid a @ __sta\n" : : : "memory", "cc") + +static inline int local_fiq_is_enabled(void) +{ + unsigned long flags; + local_save_flags(flags); + return !(flags & PSR_FIQ_MASK); +} + +#define CSDB ".inst 0xe320f014" + +static inline unsigned long array_index_mask_nospec(unsigned long idx, + unsigned long sz) +{ + unsigned long mask; + + asm volatile( "cmp %1, %2\n" + "sbc %0, %1, %1\n" + CSDB + : "=r" (mask) + : "r" (idx), "Ir" (sz) + : "cc" ); + + return mask; +} +#define array_index_mask_nospec array_index_mask_nospec + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm32/traps.h b/xen/arch/arm/include/asm/arm32/traps.h new file mode 100644 index 0000000000..e3c4a8b473 --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/traps.h @@ -0,0 +1,13 @@ +#ifndef __ASM_ARM32_TRAPS__ +#define __ASM_ARM32_TRAPS__ + +#endif /* __ASM_ARM32_TRAPS__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ + diff --git a/xen/arch/arm/include/asm/arm32/vfp.h b/xen/arch/arm/include/asm/arm32/vfp.h new file mode 100644 index 0000000000..bade3bc66e --- /dev/null +++ b/xen/arch/arm/include/asm/arm32/vfp.h @@ -0,0 +1,41 @@ +#ifndef _ARM_ARM32_VFP_H +#define _ARM_ARM32_VFP_H + +#define FPEXC_EX (1u << 31) +#define FPEXC_EN (1u << 30) +#define FPEXC_FP2V (1u << 28) + +#define MVFR0_A_SIMD_MASK (0xf << 0) + + +#define FPSID_IMPLEMENTER_BIT (24) +#define FPSID_IMPLEMENTER_MASK (0xff << FPSID_IMPLEMENTER_BIT) +#define FPSID_ARCH_BIT (16) +#define FPSID_ARCH_MASK (0xf << FPSID_ARCH_BIT) +#define FPSID_PART_BIT (8) +#define FPSID_PART_MASK (0xff << FPSID_PART_BIT) +#define FPSID_VARIANT_BIT (4) +#define FPSID_VARIANT_MASK (0xf << FPSID_VARIANT_BIT) +#define FPSID_REV_BIT (0) +#define FPSID_REV_MASK (0xf << FPSID_REV_BIT) + +struct vfp_state +{ + uint64_t fpregs1[16]; /* {d0-d15} */ + uint64_t fpregs2[16]; /* {d16-d31} */ + uint32_t fpexc; + uint32_t fpscr; + /* VFP implementation specific state */ + uint32_t fpinst; + uint32_t fpinst2; +}; + +#endif /* _ARM_ARM32_VFP_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/atomic.h b/xen/arch/arm/include/asm/arm64/atomic.h new file mode 100644 index 0000000000..2d42567866 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/atomic.h @@ -0,0 +1,148 @@ +/* + * Based on arch/arm64/include/asm/atomic.h + * which in turn is + * Based on arch/arm/include/asm/atomic.h + * + * Copyright (C) 1996 Russell King. + * Copyright (C) 2002 Deep Blue Solutions Ltd. + * Copyright (C) 2012 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 . + */ +#ifndef __ARCH_ARM_ARM64_ATOMIC +#define __ARCH_ARM_ARM64_ATOMIC + +/* + * AArch64 UP and SMP safe atomic ops. We use load exclusive and + * store exclusive to ensure that these are atomic. We may loop + * to ensure that the update happens. + */ +static inline void atomic_add(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_add\n" +"1: ldxr %w0, %2\n" +" add %w0, %w0, %w3\n" +" stxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i)); +} + +static inline int atomic_add_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_add_return\n" +"1: ldxr %w0, %2\n" +" add %w0, %w0, %w3\n" +" stlxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i) + : "memory"); + + smp_mb(); + return result; +} + +static inline void atomic_sub(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_sub\n" +"1: ldxr %w0, %2\n" +" sub %w0, %w0, %w3\n" +" stxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i)); +} + +static inline int atomic_sub_return(int i, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_sub_return\n" +"1: ldxr %w0, %2\n" +" sub %w0, %w0, %w3\n" +" stlxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (i) + : "memory"); + + smp_mb(); + return result; +} + +static inline void atomic_and(int m, atomic_t *v) +{ + unsigned long tmp; + int result; + + asm volatile("// atomic_and\n" +"1: ldxr %w0, %2\n" +" and %w0, %w0, %w3\n" +" stxr %w1, %w0, %2\n" +" cbnz %w1, 1b" + : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) + : "Ir" (m)); +} + +static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) +{ + unsigned long tmp; + int oldval; + + smp_mb(); + + asm volatile("// atomic_cmpxchg\n" +"1: ldxr %w1, %2\n" +" cmp %w1, %w3\n" +" b.ne 2f\n" +" stxr %w0, %w4, %2\n" +" cbnz %w0, 1b\n" +"2:" + : "=&r" (tmp), "=&r" (oldval), "+Q" (ptr->counter) + : "Ir" (old), "r" (new) + : "cc"); + + smp_mb(); + return oldval; +} + +static inline int __atomic_add_unless(atomic_t *v, int a, int u) +{ + int c, old; + + c = atomic_read(v); + while (c != u && (old = atomic_cmpxchg((v), c, c + a)) != c) + c = old; + return c; +} + +#endif +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 8 + * indent-tabs-mode: t + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/bitops.h b/xen/arch/arm/include/asm/arm64/bitops.h new file mode 100644 index 0000000000..d85a49bca4 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/bitops.h @@ -0,0 +1,98 @@ +#ifndef _ARM_ARM64_BITOPS_H +#define _ARM_ARM64_BITOPS_H + +/* Based on linux/include/asm-generic/bitops/builtin-__ffs.h */ +/** + * __ffs - find first bit in word. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static /*__*/always_inline unsigned long __ffs(unsigned long word) +{ + return __builtin_ctzl(word); +} + +/* Based on linux/include/asm-generic/bitops/ffz.h */ +/* + * ffz - find first zero in word. + * @word: The word to search + * + * Undefined if no zero exists, so code should check against ~0UL first. + */ +#define ffz(x) __ffs(~(x)) + +static inline int flsl(unsigned long x) +{ + uint64_t ret; + + if (__builtin_constant_p(x)) + return generic_flsl(x); + + asm("clz\t%0, %1" : "=r" (ret) : "r" (x)); + + return BITS_PER_LONG - ret; +} + +/* Based on linux/include/asm-generic/bitops/find.h */ + +#ifndef find_next_bit +/** + * find_next_bit - find the next set bit in a memory region + * @addr: The address to base the search on + * @offset: The bitnumber to start searching at + * @size: The bitmap size in bits + */ +extern unsigned long find_next_bit(const unsigned long *addr, unsigned long + size, unsigned long offset); +#endif + +#ifndef find_next_zero_bit +/** + * find_next_zero_bit - find the next cleared bit in a memory region + * @addr: The address to base the search on + * @offset: The bitnumber to start searching at + * @size: The bitmap size in bits + */ +extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned + long size, unsigned long offset); +#endif + +#ifdef CONFIG_GENERIC_FIND_FIRST_BIT + +/** + * find_first_bit - find the first set bit in a memory region + * @addr: The address to start the search at + * @size: The maximum size to search + * + * Returns the bit number of the first set bit. + */ +extern unsigned long find_first_bit(const unsigned long *addr, + unsigned long size); + +/** + * find_first_zero_bit - find the first cleared bit in a memory region + * @addr: The address to start the search at + * @size: The maximum size to search + * + * Returns the bit number of the first cleared bit. + */ +extern unsigned long find_first_zero_bit(const unsigned long *addr, + unsigned long size); +#else /* CONFIG_GENERIC_FIND_FIRST_BIT */ + +#define find_first_bit(addr, size) find_next_bit((addr), (size), 0) +#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0) + +#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */ + + +#endif /* _ARM_ARM64_BITOPS_H */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/brk.h b/xen/arch/arm/include/asm/arm64/brk.h new file mode 100644 index 0000000000..04442c4b9f --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/brk.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2016 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __ASM_ARM_ARM64_BRK +#define __ASM_ARM_ARM64_BRK + +/* + * #imm16 values used for BRK instruction generation + * 0x001: xen-mode BUG() and WARN() traps + * 0x002: for triggering a fault on purpose (reserved) + */ +#define BRK_BUG_FRAME_IMM 1 +#define BRK_FAULT_IMM 2 + +/* + * BRK instruction encoding + * The #imm16 value should be placed at bits[20:5] within BRK ins + */ +#define AARCH64_BREAK_MON 0xd4200000 + +/* + * BRK instruction for provoking a fault on purpose + */ +#define AARCH64_BREAK_FAULT (AARCH64_BREAK_MON | (BRK_FAULT_IMM << 5)) + +#endif /* !__ASM_ARM_ARM64_BRK */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/bug.h b/xen/arch/arm/include/asm/arm64/bug.h new file mode 100644 index 0000000000..5e11c0dfd5 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/bug.h @@ -0,0 +1,11 @@ +#ifndef __ARM_ARM64_BUG_H__ +#define __ARM_ARM64_BUG_H__ + +#include +#include + +#define BUG_INSTR "brk " __stringify(BRK_BUG_FRAME_IMM) + +#define BUG_FN_REG x0 + +#endif /* __ARM_ARM64_BUG_H__ */ diff --git a/xen/arch/arm/include/asm/arm64/cmpxchg.h b/xen/arch/arm/include/asm/arm64/cmpxchg.h new file mode 100644 index 0000000000..10e4edc022 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/cmpxchg.h @@ -0,0 +1,183 @@ +#ifndef __ASM_ARM64_CMPXCHG_H +#define __ASM_ARM64_CMPXCHG_H + +extern void __bad_xchg(volatile void *, int); + +static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size) +{ + unsigned long ret, tmp; + + switch (size) { + case 1: + asm volatile("// __xchg1\n" + "1: ldxrb %w0, %2\n" + " stlxrb %w1, %w3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u8 *)ptr) + : "r" (x) + : "memory"); + break; + case 2: + asm volatile("// __xchg2\n" + "1: ldxrh %w0, %2\n" + " stlxrh %w1, %w3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u16 *)ptr) + : "r" (x) + : "memory"); + break; + case 4: + asm volatile("// __xchg4\n" + "1: ldxr %w0, %2\n" + " stlxr %w1, %w3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u32 *)ptr) + : "r" (x) + : "memory"); + break; + case 8: + asm volatile("// __xchg8\n" + "1: ldxr %0, %2\n" + " stlxr %w1, %3, %2\n" + " cbnz %w1, 1b\n" + : "=&r" (ret), "=&r" (tmp), "+Q" (*(u64 *)ptr) + : "r" (x) + : "memory"); + break; + default: + __bad_xchg(ptr, size), ret = 0; + break; + } + + smp_mb(); + return ret; +} + +#define xchg(ptr,x) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __ret; \ +}) + +extern unsigned long __bad_cmpxchg(volatile void *ptr, int size); + +#define __CMPXCHG_CASE(w, sz, name) \ +static inline bool __cmpxchg_case_##name(volatile void *ptr, \ + unsigned long *old, \ + unsigned long new, \ + bool timeout, \ + unsigned int max_try) \ +{ \ + unsigned long oldval; \ + unsigned long res; \ + \ + do { \ + asm volatile("// __cmpxchg_case_" #name "\n" \ + " ldxr" #sz " %" #w "1, %2\n" \ + " mov %w0, #0\n" \ + " cmp %" #w "1, %" #w "3\n" \ + " b.ne 1f\n" \ + " stxr" #sz " %w0, %" #w "4, %2\n" \ + "1:\n" \ + : "=&r" (res), "=&r" (oldval), \ + "+Q" (*(unsigned long *)ptr) \ + : "Ir" (*old), "r" (new) \ + : "cc"); \ + \ + if (!res) \ + break; \ + } while (!timeout || ((--max_try) > 0)); \ + \ From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:34:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248336.428379 (Exim 4.92) (envelope-from ) id 1my0Gg-0001MO-HE; Thu, 16 Dec 2021 23:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248336.428379; Thu, 16 Dec 2021 23:34:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gg-0001MG-EJ; Thu, 16 Dec 2021 23:34:34 +0000 Received: by outflank-mailman (input) for mailman id 248336; Thu, 16 Dec 2021 23:34:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gf-0001M6-Js for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gf-0002Tm-J9 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Gf-0004Ph-I9 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ksXVhO/UOtW6inxP3Ig5cgwFR2xXgUkaQghAyHOldbE=; b=prPY7xV7rJlm+55hobqj4fnNJE eRhmnaKqdUEUwKEi7GS4vmgbK1FUgaRHx+Wu2vVkMaJ+kgy45w4CzvAYtvWedAAFxm8JrTcEhU4tX fBZhmM2xrPqAqD5znMAdvEEuV9qgvSuB1gplkzacZJLpFrzDoZn6DcPgJCYvDzZMGa5k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: generate "include/xen/compile.h" with if_changed Message-Id: Date: Thu, 16 Dec 2021 23:34:33 +0000 commit 19427e439e01715c1a493c1528122234346efe38 Author: Anthony PERARD AuthorDate: Wed Dec 15 10:16:51 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:16:51 2021 +0100 build: generate "include/xen/compile.h" with if_changed This will avoid regenerating "compile.h" if the content hasn't changed. As it's currently the case, the file isn't regenerated during `sudo make install` if it exist and does belong to a different user, thus we can remove the target "delete-unfresh-files". Target "$(TARGET)" still need a phony dependency, so add "FORCE". Use "$(dot-target).tmp" as temporary file as this is already cover by ".*.tmp" partern in ".gitconfig". Signed-off-by: Anthony PERARD Acked-by: Jan Beulich --- xen/Makefile | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index b2a63edca1..2ad7da7ad6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -365,7 +365,7 @@ _debug: $(OBJDUMP) -D -S $(TARGET)-syms > $(TARGET).s .PHONY: _clean -_clean: delete-unfresh-files +_clean: $(MAKE) -C tools clean $(MAKE) $(clean) include $(MAKE) $(clean) common @@ -383,7 +383,7 @@ _clean: delete-unfresh-files -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h - rm -f .banner .allconfig.tmp + rm -f .banner .allconfig.tmp include/xen/compile.h .PHONY: _distclean _distclean: clean @@ -393,7 +393,7 @@ $(TARGET).gz: $(TARGET) gzip -n -f -9 < $< > $@.new mv $@.new $@ -$(TARGET): delete-unfresh-files +$(TARGET): FORCE $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \ @@ -406,14 +406,6 @@ $(TARGET): delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk arch/$(TARGET_ARCH)/include/asm/asm-offsets.h $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) $@ -# drivers/char/console.o contains static banner/compile info. Blow it away. -# Don't refresh these files during e.g., 'sudo make install' -.PHONY: delete-unfresh-files -delete-unfresh-files: - @if [ ! -r include/xen/compile.h -o -O include/xen/compile.h ]; then \ - rm -f include/xen/compile.h; \ - fi - quiet_cmd_banner = BANNER $@ define cmd_banner if which figlet >/dev/null 2>&1 ; then \ @@ -428,9 +420,11 @@ endef $(call if_changed,banner) targets += .banner -# compile.h contains dynamic build info. Rebuilt on every 'make' invocation. -include/xen/compile.h: include/xen/compile.h.in .banner - @sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ +# Don't refresh this files during e.g., 'sudo make install' +quiet_cmd_compile.h = UPD $@ +define cmd_compile.h + if [ ! -r $@ -o -O $@ ]; then \ + sed -e 's/@@date@@/$(XEN_BUILD_DATE)/g' \ -e 's/@@time@@/$(XEN_BUILD_TIME)/g' \ -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \ -e 's/@@domain@@/$(XEN_DOMAIN)/g' \ @@ -440,10 +434,17 @@ include/xen/compile.h: include/xen/compile.h.in .banner -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \ - < include/xen/compile.h.in > $@.new + < $< > $(dot-target).tmp; \ + sed -rf tools/process-banner.sed < .banner >> $(dot-target).tmp; \ + mv -f $(dot-target).tmp $@; \ + fi +endef + +include/xen/compile.h: include/xen/compile.h.in .banner FORCE @cat .banner - @sed -rf tools/process-banner.sed < .banner >> $@.new - @mv -f $@.new $@ + $(call if_changed,compile.h) + +targets += include/xen/compile.h asm-offsets.s: arch/$(TARGET_ARCH)/$(TARGET_SUBARCH)/asm-offsets.c $(CC) $(call cpp_flags,$(c_flags)) -S -g0 -o $@.new -MQ $@ $< -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:34:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:34:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248340.428394 (Exim 4.92) (envelope-from ) id 1my0Gr-0001g5-0E; Thu, 16 Dec 2021 23:34:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248340.428394; Thu, 16 Dec 2021 23:34:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gq-0001fu-TQ; Thu, 16 Dec 2021 23:34:44 +0000 Received: by outflank-mailman (input) for mailman id 248340; Thu, 16 Dec 2021 23:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gp-0001fb-Mk for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gp-0002U5-M8 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Gp-0004Qn-LL for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zjamBuavegZnd1tTn75g1EXziHdyAJKTtEwaLMU2wCA=; b=XPMNxjAUJv/I4NTF+Y1FuDw8VI jOU+i4i7wskJNdN7JvCNs3GwOzHEzq7sMP2HezWSOIRSD5T+PZmckB40RSwsqSg3FinYo6o+Z6QcH qhbYn5b6E7yu/P4BhrqyPOyWu/ogA6P72ozOBJaqb7CtD8P4f5efTQ9MfP5wYONeQgIU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: adjust $(TARGET).efi creation in arch/arm Message-Id: Date: Thu, 16 Dec 2021 23:34:43 +0000 commit a6d21af4a12d310fec72ca3e87e2a3b045643a25 Author: Anthony PERARD AuthorDate: Wed Dec 15 10:17:34 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:17:34 2021 +0100 build: adjust $(TARGET).efi creation in arch/arm There is no need to try to guess a relative path to the "xen.efi" file, we can simply use $@. Also, there's no need to use `notdir`, make already do that work via $(@F). Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index a3a497bafe..d0dee10102 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -95,7 +95,7 @@ endif $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ ifeq ($(CONFIG_ARM_64),y) - ln -sf $(notdir $@) ../../$(notdir $@).efi + ln -sf $(@F) $@.efi endif ifeq ($(CONFIG_LTO),y) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:34:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:34:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248341.428398 (Exim 4.92) (envelope-from ) id 1my0H1-0001mi-1c; Thu, 16 Dec 2021 23:34:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248341.428398; Thu, 16 Dec 2021 23:34:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0H0-0001ma-Ux; Thu, 16 Dec 2021 23:34:54 +0000 Received: by outflank-mailman (input) for mailman id 248341; Thu, 16 Dec 2021 23:34:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gz-0001lw-Pe for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Gz-0002UI-Oz for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Gz-0004Rq-OK for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:34:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=90sRBq/vDUZjGP1k6M7f7py7WOOJVou0jrvHtafu7Yg=; b=5Gocs44V3ygVRvmS6Cv6IytACx W+ckDxyPNdDxnc9jdJyEQFvAimnHETAqC237Jj4kgmmXBrJdn1iqzoDQnoU7FdMRKNwbh+y8qSfZN Z+McedEPIMA04ZQ2Da1qu8sOlTDmxFLlbeIxzakF+AGlJs4fP4E8HzFzcOwTWdVHIbPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PVH: improve Dom0 memory size calculation Message-Id: Date: Thu, 16 Dec 2021 23:34:53 +0000 commit 5b226ca74bb2c5cd84ede5c1f2b859c2e3bcd8a0 Author: Jan Beulich AuthorDate: Wed Dec 15 10:19:54 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:19:54 2021 +0100 x86/PVH: improve Dom0 memory size calculation Assuming that the accounting for IOMMU page tables will also take care of the P2M needs was wrong: dom0_paging_pages() can determine a far higher value, high enough for the system to run out of memory while setting up Dom0. Hence in the case of shared page tables the larger of the two values needs to be used (without shared page tables the sum of both continues to be applicable). To not further complicate the logic, eliminate the up-to-2-iteration loop in favor of doing a few calculations twice (before and after calling dom0_paging_pages()). While this will lead to slightly too high a value in "cpu_pages", it is deemed better to account a few too many than a few too little. As a result the calculation is now deemed good enough to no longer warrant the warning message, which therefore gets dropped. Also uniformly use paging_mode_enabled(), not is_hvm_domain(). While there also account for two further aspects in the PV case: With "iommu=dom0-passthrough" no IOMMU page tables would get allocated, so none need accounting for. And if shadow mode is to be enabled (including only potentially, because of "pv-l1tf=dom0"), setting aside a suitable amount for the P2M pool to get populated is also necessary (i.e. similar to the non-shared-page-tables case of PVH). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/dom0_build.c | 73 +++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 5a7441ed5b..a7fec05956 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -19,6 +19,7 @@ #include #include #include +#include struct memsize { long nr_pages; @@ -321,12 +322,22 @@ unsigned long __init dom0_paging_pages(const struct domain *d, return ((memkb + 1023) / 1024) << (20 - PAGE_SHIFT); } + +/* + * If allocation isn't specified, reserve 1/16th of available memory for + * things like DMA buffers. This reservation is clamped to a maximum of 128MB. + */ +static unsigned long __init default_nr_pages(unsigned long avail) +{ + return avail - (pv_shim ? pv_shim_mem(avail) + : min(avail / 16, 128UL << (20 - PAGE_SHIFT))); +} + unsigned long __init dom0_compute_nr_pages( struct domain *d, struct elf_dom_parms *parms, unsigned long initrd_len) { nodeid_t node; - unsigned long avail = 0, nr_pages, min_pages, max_pages; - bool need_paging; + unsigned long avail = 0, nr_pages, min_pages, max_pages, iommu_pages = 0; /* The ordering of operands is to work around a clang5 issue. */ if ( CONFIG_DOM0_MEM[0] && !dom0_mem_set ) @@ -344,53 +355,47 @@ unsigned long __init dom0_compute_nr_pages( avail -= d->max_vcpus - 1; /* Reserve memory for iommu_dom0_init() (rough estimate). */ - if ( is_iommu_enabled(d) ) + if ( is_iommu_enabled(d) && !iommu_hwdom_passthrough ) { unsigned int s; for ( s = 9; s < BITS_PER_LONG; s += 9 ) - avail -= max_pdx >> s; + iommu_pages += max_pdx >> s; + + avail -= iommu_pages; } - need_paging = is_hvm_domain(d) && - (!iommu_use_hap_pt(d) || !paging_mode_hap(d)); - for ( ; ; need_paging = false ) + if ( paging_mode_enabled(d) || opt_dom0_shadow || opt_pv_l1tf_hwdom ) { - nr_pages = get_memsize(&dom0_size, avail); - min_pages = get_memsize(&dom0_min_size, avail); - max_pages = get_memsize(&dom0_max_size, avail); + unsigned long cpu_pages; + + nr_pages = get_memsize(&dom0_size, avail) ?: default_nr_pages(avail); /* - * If allocation isn't specified, reserve 1/16th of available memory - * for things like DMA buffers. This reservation is clamped to a - * maximum of 128MB. + * Clamp according to min/max limits and available memory + * (preliminary). */ - if ( !nr_pages ) - { - nr_pages = avail - (pv_shim ? pv_shim_mem(avail) - : min(avail / 16, 128UL << (20 - PAGE_SHIFT))); - if ( is_hvm_domain(d) && !need_paging ) - /* - * Temporary workaround message until internal (paging) memory - * accounting required to build a pvh dom0 is improved. - */ - printk("WARNING: PVH dom0 without dom0_mem set is still unstable. " - "If you get crashes during boot, try adding a dom0_mem parameter\n"); - } - - - /* Clamp according to min/max limits and available memory. */ - nr_pages = max(nr_pages, min_pages); - nr_pages = min(nr_pages, max_pages); + nr_pages = max(nr_pages, get_memsize(&dom0_min_size, avail)); + nr_pages = min(nr_pages, get_memsize(&dom0_max_size, avail)); nr_pages = min(nr_pages, avail); - if ( !need_paging ) - break; + cpu_pages = dom0_paging_pages(d, nr_pages); - /* Reserve memory for shadow or HAP. */ - avail -= dom0_paging_pages(d, nr_pages); + if ( !iommu_use_hap_pt(d) ) + avail -= cpu_pages; + else if ( cpu_pages > iommu_pages ) + avail -= cpu_pages - iommu_pages; } + nr_pages = get_memsize(&dom0_size, avail) ?: default_nr_pages(avail); + min_pages = get_memsize(&dom0_min_size, avail); + max_pages = get_memsize(&dom0_max_size, avail); + + /* Clamp according to min/max limits and available memory (final). */ + nr_pages = max(nr_pages, min_pages); + nr_pages = min(nr_pages, max_pages); + nr_pages = min(nr_pages, avail); + if ( is_pv_domain(d) && (parms->p2m_base == UNSET_ADDR) && !memsize_gt_zero(&dom0_size) && (!memsize_gt_zero(&dom0_min_size) || (nr_pages > min_pages)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:35:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:35:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248344.428404 (Exim 4.92) (envelope-from ) id 1my0HB-0001v2-48; Thu, 16 Dec 2021 23:35:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248344.428404; Thu, 16 Dec 2021 23:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HB-0001ut-0A; Thu, 16 Dec 2021 23:35:05 +0000 Received: by outflank-mailman (input) for mailman id 248344; Thu, 16 Dec 2021 23:35:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0H9-0001uX-SW for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0H9-0002Uy-Rg for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0H9-0004TE-R6 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=IkCV/dg/UFNAPJU5SB+Y9PadnJnvCgNknKpkIsigQCs=; b=19ksaCJQyp3o/LYz1STPCta9tI VsM3rw8tB+2MZCmplHOat+2AOV5v11hwl1ZyBWxVR6qBzSgtqS1nuphyvFfuBBtQqeEKfJFKdft/T zOtA+7gIe/IVXrkc5azbjs2OvO6MG3VsxNcNSB170m8tN7brfIzjTv4dKKCzPk2EhW2s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/PVH: permit more physdevop-s to be used by Dom0 Message-Id: Date: Thu, 16 Dec 2021 23:35:03 +0000 commit 163db6a72b660f0f3c9fe1d34e8f6b07ae6bd77d Author: Jan Beulich AuthorDate: Wed Dec 15 10:20:35 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:20:35 2021 +0100 x86/PVH: permit more physdevop-s to be used by Dom0 Certain notifications of Dom0 to Xen are independent of the mode Dom0 is running in. Permit further PCI related ones (only their modern forms). Also include the USB2 debug port operation at this occasion. While largely relevant for the latter, drop the has_vpci() part of the conditional as redundant with is_hardware_domain(): There's no PVH Dom0 without vPCI. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/hypercall.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index c4e5c34c37..384724ec41 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -94,7 +94,10 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(currd) || !is_hardware_domain(currd) ) + case PHYSDEVOP_pci_device_add: + case PHYSDEVOP_pci_device_remove: + case PHYSDEVOP_dbgp_op: + if ( !is_hardware_domain(currd) ) return -ENOSYS; break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:35:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:35:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248347.428406 (Exim 4.92) (envelope-from ) id 1my0HL-00026o-52; Thu, 16 Dec 2021 23:35:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248347.428406; Thu, 16 Dec 2021 23:35:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HL-00026g-2B; Thu, 16 Dec 2021 23:35:15 +0000 Received: by outflank-mailman (input) for mailman id 248347; Thu, 16 Dec 2021 23:35:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HJ-00026L-W3 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HJ-0002VC-VH for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0HJ-0004Uv-UI for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9dM7fXhPjgBOqfqn08Z+INuI+2UPFLD10D9YyY2VtP0=; b=6EON5YWKlYAq/dYs4GENSYbwwv 0qVdxOiCUrFABtLIAXe+2DaEi9y9tgtkl/OwLgPLWsrq2qzjg0umQ5o8W6mPnMdNFP5jHFVFhklMj wlIP9huymsOHDFeYCkLj7rNUwwXgLJS/GKCIOe/olQjb60fXsnRngo1T1ICsBl2ztBFI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: drop MEMORY_GUARD Message-Id: Date: Thu, 16 Dec 2021 23:35:13 +0000 commit fdf01494560219d10f92ce3419a5551e3ce5fe4f Author: Jan Beulich AuthorDate: Wed Dec 15 10:23:51 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:23:51 2021 +0100 x86: drop MEMORY_GUARD The functions it guards are dead code. Worse, while intended to exist in debug builds only, as of commit bacbf0cb7349 ("build: convert debug to Kconfig") they also get compiled in release builds. The remaining uses in show_stack_overflow() aren't really related to any memory guarding anymore - with CET-SS support the stacks now get set up the same in debug and release builds. Drop them as well; there's no harm providing the information there in all cases. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/include/asm/config.h | 4 ---- xen/arch/x86/include/asm/mm.h | 8 -------- xen/arch/x86/mm.c | 30 ------------------------------ xen/arch/x86/traps.c | 4 ---- 4 files changed, 46 deletions(-) diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h index 883c2ef0df..de20642524 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -57,10 +57,6 @@ #define NR_hypercalls 64 -#ifndef NDEBUG -#define MEMORY_GUARD -#endif - #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index cb90527499..5dbcee8696 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -530,14 +530,6 @@ extern struct rangeset *mmio_ro_ranges; #define compat_pfn_to_cr3(pfn) (((unsigned)(pfn) << 12) | ((unsigned)(pfn) >> 20)) #define compat_cr3_to_pfn(cr3) (((unsigned)(cr3) >> 12) | ((unsigned)(cr3) << 20)) -#ifdef MEMORY_GUARD -void memguard_guard_range(void *p, unsigned long l); -void memguard_unguard_range(void *p, unsigned long l); -#else -#define memguard_guard_range(_p,_l) ((void)0) -#define memguard_unguard_range(_p,_l) ((void)0) -#endif - void memguard_guard_stack(void *p); void memguard_unguard_stack(void *p); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4a9ac8d5e6..1397f83e41 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -6109,36 +6109,6 @@ void free_perdomain_mappings(struct domain *d) d->arch.perdomain_l3_pg = NULL; } -#ifdef MEMORY_GUARD - -static void __memguard_change_range(void *p, unsigned long l, int guard) -{ - unsigned long _p = (unsigned long)p; - unsigned long _l = (unsigned long)l; - unsigned int flags = __PAGE_HYPERVISOR_RW | MAP_SMALL_PAGES; - - /* Ensure we are dealing with a page-aligned whole number of pages. */ - ASSERT(IS_ALIGNED(_p, PAGE_SIZE)); - ASSERT(IS_ALIGNED(_l, PAGE_SIZE)); - - if ( guard ) - flags &= ~_PAGE_PRESENT; - - map_pages_to_xen(_p, virt_to_mfn(p), PFN_DOWN(_l), flags); -} - -void memguard_guard_range(void *p, unsigned long l) -{ - __memguard_change_range(p, l, 1); -} - -void memguard_unguard_range(void *p, unsigned long l) -{ - __memguard_change_range(p, l, 0); -} - -#endif - static void write_sss_token(unsigned long *ptr) { /* diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 2ddcd95dce..df7ffc448b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -642,15 +642,12 @@ void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) { unsigned long esp = regs->rsp; unsigned long curr_stack_base = esp & ~(STACK_SIZE - 1); -#ifdef MEMORY_GUARD unsigned long esp_top, esp_bottom; -#endif if ( _p(curr_stack_base) != stack_base[cpu] ) printk("Current stack base %p differs from expected %p\n", _p(curr_stack_base), stack_base[cpu]); -#ifdef MEMORY_GUARD esp_bottom = (esp | (STACK_SIZE - 1)) + 1; esp_top = esp_bottom - PRIMARY_STACK_SIZE; @@ -678,7 +675,6 @@ void show_stack_overflow(unsigned int cpu, const struct cpu_user_regs *regs) _show_trace(esp, regs->rbp); printk("\n"); -#endif } void show_execution_state(const struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:35:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:35:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248350.428409 (Exim 4.92) (envelope-from ) id 1my0HV-0002B7-6w; Thu, 16 Dec 2021 23:35:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248350.428409; Thu, 16 Dec 2021 23:35:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HV-0002Au-3c; Thu, 16 Dec 2021 23:35:25 +0000 Received: by outflank-mailman (input) for mailman id 248350; Thu, 16 Dec 2021 23:35:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HU-0002An-2s for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0HU-0002VJ-2D for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0HU-0004Wd-1V for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=psXK6H0ZMmZvzddYjQrvONbiXRNenY/4eilRy7AnjBI=; b=GYHekFJTmXPdiBvtHpUrp5ZWHw FI9EcDSG47rz5rzArVS5FDj/66uKmsCIFTY0CiT5iycjhcnmapKtRSvxqSv3ZLWMOxkTYZo6ZbH9X stmN3ecIkpYSu0tjocwtdZZb5iTnoGEcuwHBpRhHRbiV5RyRjR9NEu1aR8NsxKSbJ3FI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm: drop memguard_{,un}guard_range() stubs Message-Id: Date: Thu, 16 Dec 2021 23:35:24 +0000 commit 9956fdc70f99b0f133be7f16f62417928a84622c Author: Jan Beulich AuthorDate: Wed Dec 15 10:24:45 2021 +0100 Commit: Jan Beulich CommitDate: Wed Dec 15 10:24:45 2021 +0100 Arm: drop memguard_{,un}guard_range() stubs These exist for no reason: The code using them is only ever built for Arm32. And memguard_guard_stack() has no use outside of x86-specific code at all. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/include/asm/mm.h | 4 ---- xen/common/page_alloc.c | 6 ------ 2 files changed, 10 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 7b5e7b7f69..424aaf2823 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -341,10 +341,6 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg); unsigned long domain_get_maximum_gpfn(struct domain *d); -#define memguard_guard_stack(_p) ((void)0) -#define memguard_guard_range(_p,_l) ((void)0) -#define memguard_unguard_range(_p,_l) ((void)0) - /* Release all __init and __initdata ranges to be reused */ void free_init_memory(void); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 653f1ab09f..38eea879c0 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2152,8 +2152,6 @@ void init_xenheap_pages(paddr_t ps, paddr_t pe) if ( !is_xen_heap_mfn(maddr_to_mfn(pe)) ) pe -= PAGE_SIZE; - memguard_guard_range(maddr_to_virt(ps), pe - ps); - init_heap_pages(maddr_to_page(ps), (pe - ps) >> PAGE_SHIFT); } @@ -2169,8 +2167,6 @@ void *alloc_xenheap_pages(unsigned int order, unsigned int memflags) if ( unlikely(pg == NULL) ) return NULL; - memguard_unguard_range(page_to_virt(pg), 1 << (order + PAGE_SHIFT)); - return page_to_virt(pg); } @@ -2182,8 +2178,6 @@ void free_xenheap_pages(void *v, unsigned int order) if ( v == NULL ) return; - memguard_guard_range(v, 1 << (order + PAGE_SHIFT)); - free_heap_pages(virt_to_page(v), order, false); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:35:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:35:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248351.428413 (Exim 4.92) (envelope-from ) id 1my0Hf-0002Em-9f; Thu, 16 Dec 2021 23:35:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248351.428413; Thu, 16 Dec 2021 23:35:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Hf-0002Ee-6i; Thu, 16 Dec 2021 23:35:35 +0000 Received: by outflank-mailman (input) for mailman id 248351; Thu, 16 Dec 2021 23:35:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0He-0002EF-60 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0He-0002Va-5F for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0He-0004YF-4Y for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=o4DFf9uE4vRIV4xuM6AZ85UD/MQZvr7na4BJsY19Y8Q=; b=mrQCu6ppwqW+I7fMj8LvaDp0rX bk/qP2K6AuEHO2LbHj6wkvBdqODxqp5xWBpZy/dqSZJbgBmTipykDO7KmanfKdtMJ3DGooWTS2A0r 5RikyB9zApfkq8DhpKFvYAb61qvkdygUBMmN3DgJtrtiZPAYCAho6PEsZsi4RmJUuPAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/traps: remove debugger_trap_fatal() calls Message-Id: Date: Thu, 16 Dec 2021 23:35:34 +0000 commit 8b3cbdbe782cae972e9a47cf22620ebee61a96a6 Author: Bobby Eshleman AuthorDate: Tue Sep 28 13:30:24 2021 -0700 Commit: Andrew Cooper CommitDate: Wed Dec 15 14:30:08 2021 +0000 arm/traps: remove debugger_trap_fatal() calls ARM doesn't actually use debugger_trap_* anything, and is stubbed out. This commit simply removes the unneeded calls. Signed-off-by: Bobby Eshleman Acked-by: Julien Grall --- xen/arch/arm/traps.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 8757210a79..9339d12f58 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -1267,10 +1266,6 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc) case BUGFRAME_bug: printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno); - - if ( debugger_trap_fatal(TRAP_invalid_op, regs) ) - return 0; - show_execution_state(regs); panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno); @@ -1282,8 +1277,6 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc) printk("Assertion '%s' failed at %s%s:%d\n", predicate, prefix, filename, lineno); - if ( debugger_trap_fatal(TRAP_invalid_op, regs) ) - return 0; show_execution_state(regs); panic("Assertion '%s' failed at %s%s:%d\n", predicate, prefix, filename, lineno); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:35:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:35:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248352.428418 (Exim 4.92) (envelope-from ) id 1my0Hp-0002Hz-BB; Thu, 16 Dec 2021 23:35:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248352.428418; Thu, 16 Dec 2021 23:35:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Hp-0002Hr-8B; Thu, 16 Dec 2021 23:35:45 +0000 Received: by outflank-mailman (input) for mailman id 248352; Thu, 16 Dec 2021 23:35:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Ho-0002Hc-9Y for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Ho-0002Ve-8u for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Ho-0004Zc-83 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=aukc8xswCFvh1FjFILsp4xByMUhRR+3BkQbgnh88mTo=; b=ZdcsadYz7WZ01vv+QCSFTSfFMc Fn3iI3/ndoBvsqvCMlDfRTQT+8njVWjs1UWsMBsv0KuAdHAHz2rX4uq7fsOWKG6oNecsD5IfOj9pw 0RHFFXQpDjURkfjVM7cn7d58eTKmtwTWPZ0L+rrlhvJcOoaDSSvDm8bLlRGHeG7rWdlo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add pci-domain for disabled devices Message-Id: Date: Thu, 16 Dec 2021 23:35:44 +0000 commit 1050a7b91c2ef8d102b5d216ed3d12cdb6067f60 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:15 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:34:58 2021 +0000 xen/arm: add pci-domain for disabled devices If a PCI host bridge device is present in the device tree, but is disabled, then its PCI host bridge driver was not instantiated. This results in the failure of the pci_get_host_bridge_segment() and the following panic during Xen start: (XEN) Device tree generation failed (-22). (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Could not set up DOM0 guest OS (XEN) **************************************** Fix this by adding "linux,pci-domain" property for all device tree nodes which have "pci" device type, so we know which segments will be used by the guest for which bridges. Fixes: 4cfab4425d39 ("xen/arm: Add linux,pci-domain property for hwdom if not available.") Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Rahul Singh Tested-by: Rahul Singh Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 66 ++++++++++++++++++++++++++++++-------- xen/arch/arm/include/asm/pci.h | 8 +++++ xen/arch/arm/pci/pci-host-common.c | 8 +++-- 3 files changed, 66 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d02bacbcd1..6c5d22d9be 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -654,6 +654,55 @@ static void __init allocate_static_memory(struct domain *d, } #endif +/* + * When PCI passthrough is available we want to keep the + * "linux,pci-domain" in sync for every host bridge. + * + * Xen may not have a driver for all the host bridges. So we have + * to write an heuristic to detect whether a device node describes + * a host bridge. + * + * The current heuristic assumes that a device is a host bridge + * if the type is "pci" and then parent type is not "pci". + */ +static int handle_linux_pci_domain(struct kernel_info *kinfo, + const struct dt_device_node *node) +{ + uint16_t segment; + int res; + + if ( !is_pci_passthrough_enabled() ) + return 0; + + if ( !dt_device_type_is_equal(node, "pci") ) + return 0; + + if ( node->parent && dt_device_type_is_equal(node->parent, "pci") ) + return 0; + + if ( dt_find_property(node, "linux,pci-domain", NULL) ) + return 0; + + /* Allocate and create the linux,pci-domain */ + res = pci_get_host_bridge_segment(node, &segment); + if ( res < 0 ) + { + res = pci_get_new_domain_nr(); + if ( res < 0 ) + { + printk(XENLOG_DEBUG "Can't assign PCI segment to %s\n", + node->full_name); + return -FDT_ERR_NOTFOUND; + } + + segment = res; + printk(XENLOG_DEBUG "Assigned segment %d to %s\n", + segment, node->full_name); + } + + return fdt_property_cell(kinfo->fdt, "linux,pci-domain", segment); +} + static int __init write_properties(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { @@ -755,21 +804,10 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( is_pci_passthrough_enabled() && dt_device_type_is_equal(node, "pci") ) - { - if ( !dt_find_property(node, "linux,pci-domain", NULL) ) - { - uint16_t segment; - - res = pci_get_host_bridge_segment(node, &segment); - if ( res < 0 ) - return res; + res = handle_linux_pci_domain(kinfo, node); - res = fdt_property_cell(kinfo->fdt, "linux,pci-domain", segment); - if ( res ) - return res; - } - } + if ( res ) + return res; /* * Override the property "status" to disable the device when it's diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 9736d6816d..c313423cdc 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -109,6 +109,8 @@ static always_inline bool is_pci_passthrough_enabled(void) void arch_pci_init_pdev(struct pci_dev *pdev); +int pci_get_new_domain_nr(void); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; @@ -129,5 +131,11 @@ static inline int pci_get_host_bridge_segment(const struct dt_device_node *node, return -EINVAL; } +static inline int pci_get_new_domain_nr(void) +{ + ASSERT_UNREACHABLE(); + return -1; +} + #endif /*!CONFIG_HAS_PCI*/ #endif /* __ARM_PCI_H__ */ diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index ae79a0c19b..40e779b5d8 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -30,6 +30,8 @@ static LIST_HEAD(pci_host_bridges); static atomic_t domain_nr = ATOMIC_INIT(-1); +static int use_dt_domains = -1; + static inline void __iomem *pci_remap_cfgspace(paddr_t start, size_t len) { return ioremap_nocache(start, len); @@ -137,14 +139,16 @@ void pci_add_host_bridge(struct pci_host_bridge *bridge) list_add_tail(&bridge->node, &pci_host_bridges); } -static int pci_get_new_domain_nr(void) +int pci_get_new_domain_nr(void) { + if ( use_dt_domains ) + return -1; + return atomic_inc_return(&domain_nr); } static int pci_bus_find_domain_nr(struct dt_device_node *dev) { - static int use_dt_domains = -1; int domain; domain = dt_get_pci_domain_nr(dev); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:35:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:35:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248353.428422 (Exim 4.92) (envelope-from ) id 1my0I0-0002LS-CU; Thu, 16 Dec 2021 23:35:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248353.428422; Thu, 16 Dec 2021 23:35:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0I0-0002LK-9f; Thu, 16 Dec 2021 23:35:56 +0000 Received: by outflank-mailman (input) for mailman id 248353; Thu, 16 Dec 2021 23:35:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Hy-0002Kz-D2 for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0Hy-0002Vi-CD for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0Hy-0004ao-BJ for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:35:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KPUJEsae6eG0/Ml5Gl5Dqhq8kxSPhvwJhUg02DGQ+fo=; b=QExZowddU2j6ISqR+QSt5jqh43 8GY3Sn6divStU5nCIKxS8bEOeuxkFWS/jmk6MW5sU08eG59bo7lQUcvBLAlgbyTCJt6hC6OBj3Llh NRyfPo4VQ14Ws+UKVWe5hBqQOywW91ny4uUM7qf6nrvYIiM1rhw2x+WYEIW5W5qEEhUM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: setup MMIO range trap handlers for hardware domain Message-Id: Date: Thu, 16 Dec 2021 23:35:54 +0000 commit cd54f8095e8779b2c276e4a9b2fa1715426d7b35 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:16 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:38:47 2021 +0000 xen/arm: setup MMIO range trap handlers for hardware domain In order for vPCI to work it needs to maintain guest and hardware domain's views of the configuration space. For example, BARs and COMMAND registers require emulation for guests and the guest view of the registers needs to be in sync with the real contents of the relevant registers. For that ECAM address space needs to also be trapped for the hardware domain, so we need to implement PCI host bridge specific callbacks to properly setup MMIO handlers for those ranges depending on particular host bridge implementation. Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Rahul Singh Tested-by: Rahul Singh [julieng: Add ASSERT_UNREACHABLE()] Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 + xen/arch/arm/include/asm/pci.h | 4 ++ xen/arch/arm/pci/pci-host-common.c | 19 +++++++++ xen/arch/arm/vpci.c | 87 +++++++++++++++++++++++++++++++++----- xen/arch/arm/vpci.h | 6 +++ 5 files changed, 108 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 96e1b23550..92a6c509e5 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -739,6 +739,8 @@ int arch_domain_create(struct domain *d, if ( (rc = domain_vgic_register(d, &count)) != 0 ) goto fail; + count += domain_vpci_get_num_mmio_handlers(d); + if ( (rc = domain_io_init(d, count + MAX_IO_HANDLER)) != 0 ) goto fail; diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index c313423cdc..94f003a07c 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -111,6 +111,10 @@ void arch_pci_init_pdev(struct pci_dev *pdev); int pci_get_new_domain_nr(void); +int pci_host_iterate_bridges_and_count(struct domain *d, + int (*cb)(struct domain *d, + struct pci_host_bridge *bridge)); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 40e779b5d8..84aab371cd 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -294,6 +294,25 @@ int pci_get_host_bridge_segment(const struct dt_device_node *node, return -EINVAL; } +int pci_host_iterate_bridges_and_count(struct domain *d, + int (*cb)(struct domain *d, + struct pci_host_bridge *bridge)) +{ + struct pci_host_bridge *bridge; + int count = 0; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + int ret; + + ret = cb(d, bridge); + if ( ret < 0 ) + return ret; + count += ret; + } + return count; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index 23f45386f4..ebc4c8398b 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -16,16 +16,31 @@ #include +static pci_sbdf_t vpci_sbdf_from_gpa(const struct pci_host_bridge *bridge, + paddr_t gpa) +{ + pci_sbdf_t sbdf; + + if ( bridge ) + { + sbdf.sbdf = VPCI_ECAM_BDF(gpa - bridge->cfg->phys_addr); + sbdf.seg = bridge->segment; + sbdf.bus += bridge->cfg->busn_start; + } + else + sbdf.sbdf = VPCI_ECAM_BDF(gpa - GUEST_VPCI_ECAM_BASE); + + return sbdf; +} + static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, register_t *r, void *p) { - pci_sbdf_t sbdf; + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); /* data is needed to prevent a pointer cast on 32bit */ unsigned long data; - /* We ignore segment part and always handle segment 0 */ - sbdf.sbdf = VPCI_ECAM_BDF(info->gpa - GUEST_VPCI_ECAM_BASE); - if ( vpci_ecam_read(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, &data) ) { @@ -41,10 +56,8 @@ static int vpci_mmio_read(struct vcpu *v, mmio_info_t *info, static int vpci_mmio_write(struct vcpu *v, mmio_info_t *info, register_t r, void *p) { - pci_sbdf_t sbdf; - - /* We ignore segment part and always handle segment 0 */ - sbdf.sbdf = VPCI_ECAM_BDF(info->gpa - GUEST_VPCI_ECAM_BASE); + struct pci_host_bridge *bridge = p; + pci_sbdf_t sbdf = vpci_sbdf_from_gpa(bridge, info->gpa); return vpci_ecam_write(sbdf, ECAM_REG_OFFSET(info->gpa), 1U << info->dabt.size, r); @@ -55,13 +68,67 @@ static const struct mmio_handler_ops vpci_mmio_handler = { .write = vpci_mmio_write, }; +static int vpci_setup_mmio_handler_cb(struct domain *d, + struct pci_host_bridge *bridge) +{ + struct pci_config_window *cfg = bridge->cfg; + + register_mmio_handler(d, &vpci_mmio_handler, + cfg->phys_addr, cfg->size, bridge); + + /* We have registered a single MMIO handler. */ + return 1; +} + int domain_vpci_init(struct domain *d) { if ( !has_vpci(d) ) return 0; - register_mmio_handler(d, &vpci_mmio_handler, - GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL); + /* + * The hardware domain gets as many MMIOs as required by the + * physical host bridge. + * Guests get the virtual platform layout: one virtual host bridge for now. + */ + if ( is_hardware_domain(d) ) + { + int ret; + + ret = pci_host_iterate_bridges_and_count(d, vpci_setup_mmio_handler_cb); + if ( ret < 0 ) + return ret; + } + else + register_mmio_handler(d, &vpci_mmio_handler, + GUEST_VPCI_ECAM_BASE, GUEST_VPCI_ECAM_SIZE, NULL); + + return 0; +} + +static int vpci_get_num_handlers_cb(struct domain *d, + struct pci_host_bridge *bridge) +{ + /* Each bridge has a single MMIO handler for the configuration space. */ + return 1; +} + +unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) +{ + if ( !has_vpci(d) ) + return 0; + + if ( is_hardware_domain(d) ) + { + int ret = pci_host_iterate_bridges_and_count(d, vpci_get_num_handlers_cb); + + if ( ret < 0 ) + { + ASSERT_UNREACHABLE(); + return 0; + } + + return ret; + } return 0; } diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h index d8a7b0e3e8..3c713f3fcd 100644 --- a/xen/arch/arm/vpci.h +++ b/xen/arch/arm/vpci.h @@ -17,11 +17,17 @@ #ifdef CONFIG_HAS_VPCI int domain_vpci_init(struct domain *d); +unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d); #else static inline int domain_vpci_init(struct domain *d) { return 0; } + +static inline unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) +{ + return 0; +} #endif #endif /* __ARCH_ARM_VPCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:36:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:36:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248354.428426 (Exim 4.92) (envelope-from ) id 1my0IA-0002OR-E4; Thu, 16 Dec 2021 23:36:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248354.428426; Thu, 16 Dec 2021 23:36:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0IA-0002OJ-B9; Thu, 16 Dec 2021 23:36:06 +0000 Received: by outflank-mailman (input) for mailman id 248354; Thu, 16 Dec 2021 23:36:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0I8-0002Ny-Fx for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:36:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0I8-0002WH-FH for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:36:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0I8-0004dp-EQ for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:36:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eriQBfw/Og7QK6eJoeS2JWMt5AjA371L2VWuPps0Xrc=; b=BsxVcgRP46O9Kmmqkenu4ADA8K QywTz8tCh5TPWCDSdDB4UqG/RvfLpCfZpm8eh67zREjdVp/iqh/PHsQPeNm/bu50M84aM4OzHS7k4 lR0w0V0r778rC7W1YbnU5FyNE4bqHG6lrC4PQCu7wGGKPy+j6be/s7HzQB7iXX7euzd8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: account IO handler for emulated PCI host bridge Message-Id: Date: Thu, 16 Dec 2021 23:36:04 +0000 commit b88109676376217e11d158de8325eb2234327760 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:17 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:39:56 2021 +0000 xen/arm: account IO handler for emulated PCI host bridge At the moment, we always allocate an extra 16 slots for IO handlers (see MAX_IO_HANDLER). So while adding an IO trap handler for the emulated PCI host bridge we are not breaking anything, but we have a latent bug as the maximum number of IOs may be exceeded. Fix this by explicitly telling that we have an additional IO handler, so it is accounted. Fixes: d59168dc05a5 ("xen/arm: Enable the existing x86 virtual PCI support for ARM") Signed-off-by: Oleksandr Andrushchenko Acked-by: Julien Grall Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/vpci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vpci.c b/xen/arch/arm/vpci.c index ebc4c8398b..a9fc5817f9 100644 --- a/xen/arch/arm/vpci.c +++ b/xen/arch/arm/vpci.c @@ -130,7 +130,11 @@ unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d) return ret; } - return 0; + /* + * For guests each host bridge requires one region to cover the + * configuration space. At the moment, we only expose a single host bridge. + */ + return 1; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Dec 16 23:36:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 16 Dec 2021 23:36:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248355.428430 (Exim 4.92) (envelope-from ) id 1my0IK-0002RS-G9; Thu, 16 Dec 2021 23:36:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248355.428430; Thu, 16 Dec 2021 23:36:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0IK-0002RK-Cy; Thu, 16 Dec 2021 23:36:16 +0000 Received: by outflank-mailman (input) for mailman id 248355; Thu, 16 Dec 2021 23:36:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0II-0002R9-JG for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:36:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my0II-0002WL-IT for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:36:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my0II-0004ek-Hj for xen-changelog@lists.xenproject.org; Thu, 16 Dec 2021 23:36:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=40jIpTSrnDt/wh6PNFm5R3k9mbBrFhSkIQI4/LoOT4A=; b=Tr8dd75NfYwpUsws9icjvJ8FSJ DGnPfdXEbhice/lquoaxuve5DlMtXqyN0TzxsIOMrZLR87dcrrdr4IiukJAGReMvw4bYrDNw4ajKX X4cwd3JMHEYQIybkxmn87Zb7KMovxm5xZaTyNPnXicbIx7rhCQSFECbcOChpTBpTbFoM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: do not map PCI ECAM and MMIO space to Domain-0's p2m Message-Id: Date: Thu, 16 Dec 2021 23:36:14 +0000 commit dc27c174b2fc1ba0697ed96dc96066c272e09c24 Author: Oleksandr Andrushchenko AuthorDate: Thu Dec 9 09:29:18 2021 +0200 Commit: Julien Grall CommitDate: Wed Dec 15 17:39:56 2021 +0000 xen/arm: do not map PCI ECAM and MMIO space to Domain-0's p2m PCI host bridges are special devices in terms of implementing PCI passthrough. According to [1] the current implementation depends on Domain-0 to perform the initialization of the relevant PCI host bridge hardware and perform PCI device enumeration. In order to achieve that one of the required changes is to not map all the memory ranges in map_range_to_domain as we traverse the device tree on startup and perform some additional checks if the range needs to be mapped to Domain-0. The generic PCI host controller device tree binding says [2]: - ranges: As described in IEEE Std 1275-1994, but must provide at least a definition of non-prefetchable memory. One or both of prefetchable Memory and IO Space may also be provided. - reg : The Configuration Space base address and size, as accessed from the parent bus. The base address corresponds to the first bus in the "bus-range" property. If no "bus-range" is specified, this will be bus 0 (the default). From the above none of the memory ranges from the "ranges" property needs to be mapped to Domain-0 at startup as MMIO mapping is going to be handled dynamically by vPCI as we assign PCI devices, e.g. each device assigned to Domain-0/guest will have its MMIOs mapped/unmapped as needed by Xen. The "reg" property covers not only ECAM space, but may also have other then the configuration memory ranges described, for example [3]: - reg: Should contain rc_dbi, config registers location and length. - reg-names: Must include the following entries: "rc_dbi": controller configuration registers; "config": PCIe configuration space registers. This patch makes it possible to not map all the ranges from the "ranges" property and also ECAM from the "reg". All the rest from the "reg" property still needs to be mapped to Domain-0, so the PCI host bridge remains functional in Domain-0. This is done by first skipping the mappings while traversing the device tree as it is done for usual devices and then by calling a dedicated pci_host_bridge_mappings function which only maps MMIOs required by the host bridges leaving the regions, needed for vPCI traps, unmapped. [1] https://lists.xenproject.org/archives/html/xen-devel/2020-07/msg00777.html [2] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt [3] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt Signed-off-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall Reviewed-by: Rahul Singh Tested-by: Rahul Singh --- xen/arch/arm/domain_build.c | 66 ++++++++++++++++++++++---------------- xen/arch/arm/include/asm/pci.h | 10 ++++++ xen/arch/arm/include/asm/setup.h | 13 ++++++++ xen/arch/arm/pci/ecam.c | 14 ++++++++ xen/arch/arm/pci/pci-host-common.c | 50 +++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-host-zynqmp.c | 1 + 6 files changed, 126 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 6c5d22d9be..6931c022a2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -51,12 +51,6 @@ static int __init parse_dom0_mem(const char *s) } custom_param("dom0_mem", parse_dom0_mem); -struct map_range_data -{ - struct domain *d; - p2m_type_t p2mt; -}; - /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) @@ -1720,10 +1714,10 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev, const struct dt_irq *dt_irq, void *data) { - struct domain *d = data; + struct map_range_data *mr_data = data; + struct domain *d = mr_data->d; unsigned int irq = dt_irq->irq; int res; - bool need_mapping = !dt_device_for_passthrough(dev); if ( irq < NR_LOCAL_IRQS ) { @@ -1742,18 +1736,16 @@ static int __init map_dt_irq_to_domain(const struct dt_device_node *dev, return res; } - res = map_irq_to_domain(d, irq, need_mapping, dt_node_name(dev)); + res = map_irq_to_domain(d, irq, !mr_data->skip_mapping, dt_node_name(dev)); return 0; } -static int __init map_range_to_domain(const struct dt_device_node *dev, - u64 addr, u64 len, - void *data) +int __init map_range_to_domain(const struct dt_device_node *dev, + u64 addr, u64 len, void *data) { struct map_range_data *mr_data = data; struct domain *d = mr_data->d; - bool need_mapping = !dt_device_for_passthrough(dev); int res; /* @@ -1776,7 +1768,7 @@ static int __init map_range_to_domain(const struct dt_device_node *dev, } } - if ( need_mapping ) + if ( !mr_data->skip_mapping ) { res = map_regions_p2mt(d, gaddr_to_gfn(addr), @@ -1805,23 +1797,21 @@ static int __init map_range_to_domain(const struct dt_device_node *dev, * then we may need to perform additional mappings in order to make * the child resources available to domain 0. */ -static int __init map_device_children(struct domain *d, - const struct dt_device_node *dev, - p2m_type_t p2mt) +static int __init map_device_children(const struct dt_device_node *dev, + struct map_range_data *mr_data) { - struct map_range_data mr_data = { .d = d, .p2mt = p2mt }; - int ret; - if ( dt_device_type_is_equal(dev, "pci") ) { + int ret; + dt_dprintk("Mapping children of %s to guest\n", dt_node_full_name(dev)); - ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, d); + ret = dt_for_each_irq_map(dev, &map_dt_irq_to_domain, mr_data); if ( ret < 0 ) return ret; - ret = dt_for_each_range(dev, &map_range_to_domain, &mr_data); + ret = dt_for_each_range(dev, &map_range_to_domain, mr_data); if ( ret < 0 ) return ret; } @@ -1901,14 +1891,28 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, unsigned int i; int res; u64 addr, size; - bool need_mapping = !dt_device_for_passthrough(dev); + bool own_device = !dt_device_for_passthrough(dev); + /* + * We want to avoid mapping the MMIO in dom0 for the following cases: + * - The device is owned by dom0 (i.e. it has been flagged for + * passthrough). + * - PCI host bridges with driver in Xen. They will later be mapped by + * pci_host_bridge_mappings(). + */ + struct map_range_data mr_data = { + .d = d, + .p2mt = p2mt, + .skip_mapping = !own_device || + (is_pci_passthrough_enabled() && + (device_get_class(dev) == DEVICE_PCI_HOSTBRIDGE)) + }; naddr = dt_number_of_address(dev); dt_dprintk("%s passthrough = %d naddr = %u\n", - dt_node_full_name(dev), need_mapping, naddr); + dt_node_full_name(dev), own_device, naddr); - if ( need_mapping ) + if ( own_device ) { dt_dprintk("Check if %s is behind the IOMMU and add it\n", dt_node_full_name(dev)); @@ -1934,14 +1938,13 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, } } - res = handle_device_interrupts(d, dev, need_mapping); + res = handle_device_interrupts(d, dev, own_device); if ( res < 0 ) return res; /* Give permission and map MMIOs */ for ( i = 0; i < naddr; i++ ) { - struct map_range_data mr_data = { .d = d, .p2mt = p2mt }; res = dt_device_get_address(dev, i, &addr, &size); if ( res ) { @@ -1955,7 +1958,7 @@ static int __init handle_device(struct domain *d, struct dt_device_node *dev, return res; } - res = map_device_children(d, dev, p2mt); + res = map_device_children(dev, &mr_data); if ( res ) return res; @@ -3114,7 +3117,14 @@ static int __init construct_dom0(struct domain *d) return rc; if ( acpi_disabled ) + { rc = prepare_dtb_hwdom(d, &kinfo); + if ( rc < 0 ) + return rc; +#ifdef CONFIG_HAS_PCI + rc = pci_host_bridge_mappings(d); +#endif + } else rc = prepare_acpi(d, &kinfo); diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 94f003a07c..7c7449d64f 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -17,6 +17,8 @@ #ifdef CONFIG_HAS_PCI +#include + #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) extern bool pci_passthrough_enabled; @@ -73,6 +75,9 @@ struct pci_ops { uint32_t reg, uint32_t len, uint32_t *value); int (*write)(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value); + bool (*need_p2m_hwdom_mapping)(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr); }; /* @@ -97,6 +102,9 @@ int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t value); void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t where); +bool pci_ecam_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr); struct pci_host_bridge *pci_find_host_bridge(uint16_t segment, uint8_t bus); struct dt_device_node *pci_find_host_bridge_node(struct device *dev); int pci_get_host_bridge_segment(const struct dt_device_node *node, @@ -115,6 +123,8 @@ int pci_host_iterate_bridges_and_count(struct domain *d, int (*cb)(struct domain *d, struct pci_host_bridge *bridge)); +int pci_host_bridge_mappings(struct domain *d); + #else /*!CONFIG_HAS_PCI*/ struct arch_pci_dev { }; diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 95da0b7ab9..88d9673db8 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -2,6 +2,8 @@ #define __ARM_SETUP_H_ #include +#include +#include #define MIN_FDT_ALIGN 8 #define MAX_FDT_SIZE SZ_2M @@ -77,6 +79,14 @@ struct bootinfo { #endif }; +struct map_range_data +{ + struct domain *d; + p2m_type_t p2mt; + /* Set if mapping of the memory ranges must be skipped. */ + bool skip_mapping; +}; + extern struct bootinfo bootinfo; extern domid_t max_init_domid; @@ -124,6 +134,9 @@ void device_tree_get_reg(const __be32 **cell, u32 address_cells, u32 device_tree_get_u32(const void *fdt, int node, const char *prop_name, u32 dflt); +int map_range_to_domain(const struct dt_device_node *dev, + u64 addr, u64 len, void *data); + #endif /* * Local variables: diff --git a/xen/arch/arm/pci/ecam.c b/xen/arch/arm/pci/ecam.c index 2855dea213..6aeea12a68 100644 --- a/xen/arch/arm/pci/ecam.c +++ b/xen/arch/arm/pci/ecam.c @@ -40,6 +40,19 @@ void __iomem *pci_ecam_map_bus(struct pci_host_bridge *bridge, return base + (PCI_DEVFN2(sbdf.bdf) << devfn_shift) + where; } +bool __init pci_ecam_need_p2m_hwdom_mapping(struct domain *d, + struct pci_host_bridge *bridge, + uint64_t addr) +{ + struct pci_config_window *cfg = bridge->cfg; + + /* + * We do not want ECAM address space to be mapped in Domain-0's p2m, + * so we can trap access to it. + */ + return cfg->phys_addr != addr; +} + /* ECAM ops */ const struct pci_ecam_ops pci_generic_ecam_ops = { .bus_shift = 20, @@ -47,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = { .map_bus = pci_ecam_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, } }; diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index 84aab371cd..fd8c0f837a 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -22,6 +22,8 @@ #include #include +#include + /* * List for all the pci host bridges. */ @@ -313,6 +315,54 @@ int pci_host_iterate_bridges_and_count(struct domain *d, return count; } +/* + * For each PCI host bridge we need to only map those ranges + * which are used by Domain-0 to properly initialize the bridge, + * e.g. we do not want to map ECAM configuration space which lives in + * "reg" device tree property, but we want to map other regions of + * the host bridge. The PCI aperture defined by the "ranges" device + * tree property should also be skipped. + */ +int __init pci_host_bridge_mappings(struct domain *d) +{ + struct pci_host_bridge *bridge; + struct map_range_data mr_data = { + .d = d, + .p2mt = p2m_mmio_direct_dev, + .skip_mapping = false + }; + + list_for_each_entry( bridge, &pci_host_bridges, node ) + { + const struct dt_device_node *dev = bridge->dt_node; + unsigned int i; + + for ( i = 0; i < dt_number_of_address(dev); i++ ) + { + uint64_t addr, size; + int err; + + err = dt_device_get_address(dev, i, &addr, &size); + if ( err ) + { + printk(XENLOG_ERR + "Unable to retrieve address range index=%u for %s\n", + i, dt_node_full_name(dev)); + return err; + } + + if ( bridge->ops->need_p2m_hwdom_mapping(d, bridge, addr) ) + { + err = map_range_to_domain(dev, addr, size, &mr_data); + if ( err ) + return err; + } + } + } + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 516982bca8..101edb8593 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -34,6 +34,7 @@ const struct pci_ecam_ops nwl_pcie_ops = { .map_bus = pci_ecam_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, } }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 08:00:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 08:00:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248467.428587 (Exim 4.92) (envelope-from ) id 1my89u-0001HA-LL; Fri, 17 Dec 2021 08:00:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248467.428587; Fri, 17 Dec 2021 08:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my89u-0001H1-I6; Fri, 17 Dec 2021 08:00:06 +0000 Received: by outflank-mailman (input) for mailman id 248467; Fri, 17 Dec 2021 08:00:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my89u-0001Cs-1u for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 08:00:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my89t-0006IT-Qy for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 08:00:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my89t-0005Fq-PB for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 08:00:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Axruz47DyFEYXNiFvxNeQLWffDtOWKfKYk4GAWq7zkg=; b=lFElV4ESkPpu0CXjgciLaz8RdL RMazhrL6zNMly6Vn6sGLul3BvJNcRR+XY8lkIhlmFwdn42jde8Lo+gvEirnl63pJ1S2Ym6qIuo48g wxFhVMda8T+l41ZpkWBbxt62+CzwAx6DQ50amJ/HDw9pmas1Msm2y0+0BXFF9gWgl2cQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] revert "hvmloader: PA range 0xfc000000-0xffffffff should be UC" Message-Id: Date: Fri, 17 Dec 2021 08:00:05 +0000 commit ea187c0b7a73c26258c0e91e4f3656989804555f Author: Jan Beulich AuthorDate: Fri Dec 17 08:56:15 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 17 08:56:15 2021 +0100 revert "hvmloader: PA range 0xfc000000-0xffffffff should be UC" This reverts commit c22bd567ce22f6ad9bd93318ad0d7fd1c2eadb0d. While its description is correct from an abstract or real hardware pov, the range is special inside HVM guests. The range being UC in particular gets in the way of OVMF, which places itself at [FFE00000,FFFFFFFF]. While this is benign to epte_get_entry_emt() as long as the IOMMU isn't enabled for a guest, it becomes a very noticable problem otherwise: It takes about half a minute for OVMF to decompress itself into its designated address range. And even beyond OVMF there's no reason to have e.g. the ACPI memory range marked UC. Fixes: c22bd567ce22 ("hvmloader: PA range 0xfc000000-0xffffffff should be UC") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- tools/firmware/hvmloader/cacheattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/cacheattr.c b/tools/firmware/hvmloader/cacheattr.c index 1ac6656c70..1c67819748 100644 --- a/tools/firmware/hvmloader/cacheattr.c +++ b/tools/firmware/hvmloader/cacheattr.c @@ -98,12 +98,12 @@ void cacheattr_init(void) { uint64_t base = pci_mem_start, size; - for ( i = 0; !(base >> 32) && (i < nr_var_ranges); i++ ) + for ( i = 0; (base != pci_mem_end) && (i < nr_var_ranges); i++ ) { size = PAGE_SIZE; while ( !(base & size) ) size <<= 1; - while ( ((base + size) < base) || ((base + size - 1) >> 32) ) + while ( ((base + size) < base) || ((base + size) > pci_mem_end) ) size >>= 1; wrmsr(MSR_MTRRphysBase(i), base); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 08:00:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 08:00:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248468.428592 (Exim 4.92) (envelope-from ) id 1my8A4-0001QM-NB; Fri, 17 Dec 2021 08:00:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248468.428592; Fri, 17 Dec 2021 08:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my8A4-0001QB-Jf; Fri, 17 Dec 2021 08:00:16 +0000 Received: by outflank-mailman (input) for mailman id 248468; Fri, 17 Dec 2021 08:00:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my8A4-0001Q0-0T for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 08:00:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1my8A3-0006No-Vt for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 08:00:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1my8A3-0005Hg-Tl for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 08:00:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2p9aBTmvxMdB2ee+noetXXVbGNfjlGngPo6mah6B1ZQ=; b=y4WzI+op0Fy0i7yzkpJvLGS0kW tSSvZMcgTFAh2qwx0siS9/38EJZzhJeh7IyEuGwk70n47i42f7k30pl6h0vGh73UJplx5+RPQT7we QgK0xUeg3cYQR+2xFe1+GZZ+qJiAEv7apiKWTsXxdGfxa9z/rU8QUDuH12w8MKQAAvCI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] hvmloader: tidy pci_mem_{start,end} Message-Id: Date: Fri, 17 Dec 2021 08:00:15 +0000 commit 1c4589280ae4e9ba34266e674459fffd6f0282dc Author: Jan Beulich AuthorDate: Fri Dec 17 08:56:34 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 17 08:56:34 2021 +0100 hvmloader: tidy pci_mem_{start,end} For one at least pci_mem_start has to be precisely 32 bits wide, so use uint32_t for both. Otherwise expressions like "pci_mem_start <<= 1" won't have the intended effect (in their context). Further since its introduction pci_mem_end was never written to. Mark it const to make this explicit. Finally drop PCI_MEM_END: It is used just once and needlessly disconnected from the other constant (RESERVED_MEMBASE) it needs to match. Use RESERVED_MEMBASE as initializer of pci_mem_end instead. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/firmware/hvmloader/config.h | 6 ++---- tools/firmware/hvmloader/pci.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 844120bc87..c82adf6dc5 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -55,12 +55,10 @@ extern uint8_t ioapic_version; #define PCI_ISA_DEVFN 0x08 /* dev 1, fn 0 */ #define PCI_ISA_IRQ_MASK 0x0c20U /* ISA IRQs 5,10,11 are PCI connected */ -/* MMIO hole: Hardcoded defaults, which can be dynamically expanded. */ -#define PCI_MEM_END 0xfc000000 - #define ACPI_TIS_HDR_ADDRESS 0xFED40F00UL -extern unsigned long pci_mem_start, pci_mem_end; +extern uint32_t pci_mem_start; +extern const uint32_t pci_mem_end; extern uint64_t pci_hi_mem_start, pci_hi_mem_end; extern bool acpi_enabled; diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 72f92d4450..257a6feb61 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -29,8 +29,8 @@ #include #include -unsigned long pci_mem_start = HVM_BELOW_4G_MMIO_START; -unsigned long pci_mem_end = PCI_MEM_END; +uint32_t pci_mem_start = HVM_BELOW_4G_MMIO_START; +const uint32_t pci_mem_end = RESERVED_MEMBASE; uint64_t pci_hi_mem_start = 0, pci_hi_mem_end = 0; enum virtual_vga virtual_vga = VGA_none; @@ -329,7 +329,7 @@ void pci_setup(void) else { pci_mem_start = max_ram_below_4g; - printf("pci_mem_start=0x%lx (was 0x%x) for mmio_hole_size=%lu\n", + printf("pci_mem_start=0x%x (was 0x%x) for mmio_hole_size=0x%lx\n", pci_mem_start, HVM_BELOW_4G_MMIO_START, (long)mmio_hole_size); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 11:55:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 11:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248585.428772 (Exim 4.92) (envelope-from ) id 1myBpJ-00022s-OJ; Fri, 17 Dec 2021 11:55:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248585.428772; Fri, 17 Dec 2021 11:55:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myBpJ-00022l-LQ; Fri, 17 Dec 2021 11:55:05 +0000 Received: by outflank-mailman (input) for mailman id 248585; Fri, 17 Dec 2021 11:55:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myBpJ-00022f-7E for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 11:55:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myBpJ-000233-3x for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 11:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myBpJ-0004ah-2s for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 11:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=kzmXke0xmU1DeOmXk9Ere325vc8+5iXRggDgexlvOSA=; b=lv3nNvNZj82b5at3E13WLl+39u ZC/HHD5ZTyD15civAMFBmFVhMz2NZ5V68YD6n+pXGJRR47TpAnRTBK/Z/FrrEoZORUU7vIbY+kI+O 8WvBqHjCjOUAPKMb/bhGFC1g+qN6gH1eKTRyBTXjQAo+7roG+5AoPTAVfBDAp9pC0gvI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] tools/xenstore: drop support for running under SunOS Message-Id: Date: Fri, 17 Dec 2021 11:55:05 +0000 commit c81fc9f313c031f1201181cfb40e3c3ee599e04f Author: Juergen Gross AuthorDate: Fri Dec 17 08:50:59 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 11:48:52 2021 +0000 tools/xenstore: drop support for running under SunOS Since several years now xenstored is no longer capable to run under SunOS, as the needed libxengnttab interfaces are not available there. Several attempts to let the SunOS maintainers address this situation didn't change anything in this regard. For those reasons drop SunOS support in xenstored by removing the SunOS specific code. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Reviewed-by: Julien Grall --- tools/xenstore/Makefile | 15 +--- tools/xenstore/xenstored_core.c | 7 -- tools/xenstore/xenstored_core.h | 4 - tools/xenstore/xenstored_minios.c | 4 - tools/xenstore/xenstored_posix.c | 6 -- tools/xenstore/xenstored_probes.d | 28 ------- tools/xenstore/xenstored_solaris.c | 168 ------------------------------------- 7 files changed, 1 insertion(+), 231 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 292b478fa1..c86278fdb1 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -27,7 +27,6 @@ XENSTORED_OBJS += xenstored_transaction.o xenstored_control.o XENSTORED_OBJS += xs_lib.o talloc.o utils.o tdb.o hashtable.o XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_posix.o -XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o xenstored_posix.o xenstored_probes.o XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_posix.o XENSTORED_OBJS_$(CONFIG_FreeBSD) = xenstored_posix.o XENSTORED_OBJS_$(CONFIG_MiniOS) = xenstored_minios.o @@ -50,18 +49,6 @@ all: $(ALL_TARGETS) .PHONY: clients clients: xenstore $(CLIENTS) xenstore-control -ifeq ($(CONFIG_SunOS),y) -xenstored_probes.h: xenstored_probes.d - dtrace -C -h -s xenstored_probes.d - -xenstored_solaris.o: xenstored_probes.h - -xenstored_probes.o: xenstored_solaris.o - dtrace -C -G -s xenstored_probes.d xenstored_solaris.o - -CFLAGS += -DHAVE_DTRACE=1 -endif - ifeq ($(CONFIG_SYSTEMD),y) $(XENSTORED_OBJS): CFLAGS += $(SYSTEMD_CFLAGS) xenstored: LDFLAGS += $(SYSTEMD_LIBS) @@ -89,7 +76,7 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o .PHONY: clean clean: - rm -f *.a *.o xenstored_probes.h + rm -f *.a *.o rm -f xenstored rm -f xs_tdb_dump xenstore-control init-xenstore-domain rm -f xenstore $(CLIENTS) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 91d093a12e..c386ae6129 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -146,10 +146,6 @@ static void trace_io(const struct connection *conn, time_t now; struct tm *tm; -#ifdef HAVE_DTRACE - dtrace_io(conn, data, out); -#endif - if (tracefd < 0) return; @@ -2337,9 +2333,6 @@ int main(int argc, char *argv[]) /* Get ready to listen to the tools. */ initialize_fds(&sock_pollfd_idx, &timeout); - /* Tell the kernel we're up and running. */ - xenbus_notify_running(); - #if defined(XEN_SYSTEMD_ENABLED) if (!live_update) { sd_notify(1, "READY=1"); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 07d861d924..190d2447cd 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -225,7 +225,6 @@ int delay_request(struct connection *conn, struct buffered_data *in, void trace_create(const void *data, const char *type); void trace_destroy(const void *data, const char *type); void trace(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -void dtrace_io(const struct connection *conn, const struct buffered_data *data, int out); void reopen_log(void); void close_log(void); @@ -250,9 +249,6 @@ static inline int xenbus_master_domid(void) { return dom0_domid; } /* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn(void); -/* Tell the kernel xenstored is running. */ -void xenbus_notify_running(void); - /* Write out the pidfile */ void write_pidfile(const char *pidfile); diff --git a/tools/xenstore/xenstored_minios.c b/tools/xenstore/xenstored_minios.c index c94493e52a..aa384e50c8 100644 --- a/tools/xenstore/xenstored_minios.c +++ b/tools/xenstore/xenstored_minios.c @@ -38,10 +38,6 @@ void init_pipe(int reopen_log_pipe[2]) reopen_log_pipe[1] = -1; } -void xenbus_notify_running(void) -{ -} - evtchn_port_t xenbus_evtchn(void) { return dom0_event; diff --git a/tools/xenstore/xenstored_posix.c b/tools/xenstore/xenstored_posix.c index 48c37ffe3e..b20504d1b6 100644 --- a/tools/xenstore/xenstored_posix.c +++ b/tools/xenstore/xenstored_posix.c @@ -111,7 +111,6 @@ void unmap_xenbus(void *interface) munmap(interface, getpagesize()); } -#ifndef __sun__ evtchn_port_t xenbus_evtchn(void) { int fd; @@ -158,8 +157,3 @@ void *xenbus_map(void) return addr; } - -void xenbus_notify_running(void) -{ -} -#endif /* !__sun__ */ diff --git a/tools/xenstore/xenstored_probes.d b/tools/xenstore/xenstored_probes.d deleted file mode 100644 index f72d38f935..0000000000 --- a/tools/xenstore/xenstored_probes.d +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * 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, version 2 of the License. - */ - -#include - -provider xenstore { - /* tx id, dom id, pid, type, msg */ - probe msg(uint32_t, unsigned int, pid_t, int, const char *); - /* tx id, dom id, pid, type, reply */ - probe reply(uint32_t, unsigned int, pid_t, int, const char *); - /* tx id, dom id, pid, reply */ - probe error(uint32_t, unsigned int, pid_t, const char *); - /* dom id, pid, watch details */ - probe watch_event(unsigned int, pid_t, const char *); -}; - -#pragma D attributes Evolving/Evolving/Common provider xenstore provider -#pragma D attributes Private/Private/Unknown provider xenstore module -#pragma D attributes Private/Private/Unknown provider xenstore function -#pragma D attributes Evolving/Evolving/Common provider xenstore name -#pragma D attributes Evolving/Evolving/Common provider xenstore args - diff --git a/tools/xenstore/xenstored_solaris.c b/tools/xenstore/xenstored_solaris.c deleted file mode 100644 index 06052d124a..0000000000 --- a/tools/xenstore/xenstored_solaris.c +++ /dev/null @@ -1,168 +0,0 @@ -/****************************************************************************** - * - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * Copyright (C) 2005 Rusty Russell IBM Corporation - * - * 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, version 2 of the - * License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_probes.h" - -evtchn_port_t xenbus_evtchn(void) -{ - int fd; - evtchn_port_t port; - - fd = open("/dev/xen/xenbus", O_RDONLY); - if (fd == -1) - return -1; - - port = ioctl(fd, IOCTL_XENBUS_XENSTORE_EVTCHN); - - close(fd); - return port; -} - -void *xenbus_map(void) -{ - int fd; - void *addr; - - fd = open("/dev/xen/xenbus", O_RDWR); - if (fd == -1) - return NULL; - - addr = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, - MAP_SHARED, fd, 0); - - if (addr == MAP_FAILED) - addr = NULL; - - close(fd); - - return addr; -} - -void xenbus_notify_running(void) -{ - int fd; - - fd = open("/dev/xen/xenbus", O_RDONLY); - - (void) ioctl(fd, IOCTL_XENBUS_NOTIFY_UP); - - close(fd); -} - -static pid_t cred(const struct connection *conn) -{ - ucred_t *ucred = NULL; - pid_t pid; - - if (conn->domain) - return (0); - - if (getpeerucred(conn->fd, &ucred) == -1) - return (0); - - pid = ucred_getpid(ucred); - - ucred_free(ucred); - return (pid); -} - -/* - * The strings are often a number of nil-separated strings. We'll just - * replace the separators with spaces - not quite right, but good - * enough. - */ -static char * -mangle(const struct connection *conn, const struct buffered_data *in) -{ - char *str; - int i; - - if (in->hdr.msg.len == 0) - return (talloc_strdup(conn, "")); - - if ((str = talloc_zero_size(conn, in->hdr.msg.len + 1)) == NULL) - return (NULL); - - memcpy(str, in->buffer, in->hdr.msg.len); - - /* - * The protocol is absurdly inconsistent in whether the length - * includes the terminating nil or not; replace all nils that - * aren't the last one. - */ - for (i = 0; i < (in->hdr.msg.len - 1); i++) { - if (str[i] == '\0') - str[i] = ' '; - } - - return (str); -} - -void -dtrace_io(const struct connection *conn, const struct buffered_data *in, - int io_out) -{ - if (!io_out) { - if (XENSTORE_MSG_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_MSG(in->hdr.msg.tx_id, conn->id, cred(conn), - in->hdr.msg.type, mangled); - } - - goto out; - } - - switch (in->hdr.msg.type) { - case XS_ERROR: - if (XENSTORE_ERROR_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_ERROR(in->hdr.msg.tx_id, conn->id, - cred(conn), mangled); - } - break; - - case XS_WATCH_EVENT: - if (XENSTORE_WATCH_EVENT_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_WATCH_EVENT(conn->id, cred(conn), mangled); - } - break; - - default: - if (XENSTORE_REPLY_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_REPLY(in->hdr.msg.tx_id, conn->id, cred(conn), - in->hdr.msg.type, mangled); - } - break; - } - -out: - /* - * 6589130 dtrace -G fails for certain tail-calls on x86 - */ - asm("nop"); -} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 13:33:10 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 13:33:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248642.428864 (Exim 4.92) (envelope-from ) id 1myDMA-0000vX-3l; Fri, 17 Dec 2021 13:33:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248642.428864; Fri, 17 Dec 2021 13:33:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myDMA-0000vP-0o; Fri, 17 Dec 2021 13:33:06 +0000 Received: by outflank-mailman (input) for mailman id 248642; Fri, 17 Dec 2021 13:33:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myDM9-0000vJ-7w for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 13:33:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myDM9-0003jz-5a for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 13:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myDM9-0002pM-4A for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 13:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iWovyZdsrrL3da1yUWywEB3i/dRs0jGxgItNzMKNZUI=; b=PY05Tygk0bFEMduj6RsJgf7tBg YZXW7LnGVcnR19e0Dl+MRG9HocguCxRfRqLi3LqtJelgglNd3E8uDnO3lxxVQTbq55huBNNjY3Tzb S4kiJrpET/ha/NEtc5oo2StpGB8/LK27+tHQ59jMsTYpiYtODo+qWzciQJMIKinZakPY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/arm64: Zero the top 32 bits of gp registers on entry... Message-Id: Date: Fri, 17 Dec 2021 13:33:05 +0000 commit 32365f3476ac4655f2f26111cd7879912808cd77 Author: Michal Orzel AuthorDate: Fri Dec 17 08:21:59 2021 +0100 Commit: Julien Grall CommitDate: Fri Dec 17 13:23:03 2021 +0000 xen/arm64: Zero the top 32 bits of gp registers on entry... to hypervisor when switching from AArch32 state. According to section D1.20.2 of Arm Arm(DDI 0487A.j): "If the general-purpose register was accessible from AArch32 state the upper 32 bits either become zero, or hold the value that the same architectural register held before any AArch32 execution. The choice between these two options is IMPLEMENTATION DEFINED" Currently Xen does not ensure that the top 32 bits are zeroed and this needs to be fixed. The reason why is that there are places in Xen where we assume that top 32bits are zero for AArch32 guests. If they are not, this can lead to misinterpretation of Xen regarding what the guest requested. For example hypercalls returning an error encoded in a signed long like do_sched_op, do_hmv_op, do_memory_op would return -ENOSYS if the command passed as the first argument was clobbered. Create a macro clobber_gp_top_halves to clobber top 32 bits of gp registers when hyp == 0 (guest mode) and compat == 1 (AArch32 mode). Add a compile time check to ensure that save_x0_x1 == 1 if compat == 1. Signed-off-by: Michal Orzel [julieng: Tweak the comment in clobber_gp_top_halves] Acked-by: Julien Grall --- xen/arch/arm/arm64/entry.S | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index fc3811ad0a..8c48087256 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -102,6 +102,30 @@ .endif .endm + +/* + * Clobber top 32 bits of gp registers when switching from AArch32 + */ + .macro clobber_gp_top_halves, compat, save_x0_x1 + + .if \compat == 1 /* AArch32 mode */ + + /* + * At the moment, no-one is using save_x0_x1 == 0 with compat == 1. + * So the code is not handling it to simplify the implementation. + */ + .if \save_x0_x1 == 0 + .error "save_x0_x1 is 0 but compat is 1" + .endif + + .irp n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 + mov w\n, w\n + .endr + + .endif + + .endm + /* * Save state on entry to hypervisor, restore on exit * @@ -111,6 +135,11 @@ */ .macro entry, hyp, compat, save_x0_x1=1 sub sp, sp, #(UREGS_SPSR_el1 - UREGS_LR) /* CPSR, PC, SP, LR */ + + .if \hyp == 0 /* Guest mode */ + clobber_gp_top_halves compat=\compat, save_x0_x1=\save_x0_x1 + .endif + push x28, x29 push x26, x27 push x24, x25 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 17:11:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 17:11:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248786.429132 (Exim 4.92) (envelope-from ) id 1myGl7-0005Xo-5y; Fri, 17 Dec 2021 17:11:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248786.429132; Fri, 17 Dec 2021 17:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGl7-0005Xg-2z; Fri, 17 Dec 2021 17:11:05 +0000 Received: by outflank-mailman (input) for mailman id 248786; Fri, 17 Dec 2021 17:11:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGl6-0005Xa-Pk for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGl6-0008C1-OB for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myGl6-000627-N7 for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jgvLb1zdP0PxEA737tgRE8ODd5So4mPhMf/JdX4j1OM=; b=TAdLAH2gZf2JzBU5lGlU89j8mP jkNapCEEMfhFXpy0gtYudTuhjr6WWftxUxhx0z1QZeqPptAOYkv5eD2L4i7FbwNGKBC+b3gX+7+TM 8Re8fGanwZHOPMsbw3/sPfVKDBX+SYu0fUT+EjXxvEt+tLZ+vO6GZY1NyFo/aaWahD+0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] xen/domain: Remove function pointers from domain pause helpers Message-Id: Date: Fri, 17 Dec 2021 17:11:04 +0000 commit 52c06465fc7286cb06743adf15f10b0759ed8f4e Author: Andrew Cooper AuthorDate: Thu Oct 28 04:07:02 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 17:03:54 2021 +0000 xen/domain: Remove function pointers from domain pause helpers Function pointer calls are expensive (especially with Spectre v2 protections), and all these do are select between the sync and nosync helpers. Pass a boolean instead, and use direct calls everywhere. Pause/unpause operations on behalf of dom0 are not fastpaths, so avoid exposing the __domain_pause_by_systemcontroller() internal. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/domain.c | 30 +++++++++++++++++++++--------- xen/include/xen/sched.h | 15 +++++---------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 093bb4403f..2048ebad86 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1226,15 +1226,18 @@ int vcpu_unpause_by_systemcontroller(struct vcpu *v) return 0; } -static void do_domain_pause(struct domain *d, - void (*sleep_fn)(struct vcpu *v)) +static void _domain_pause(struct domain *d, bool sync) { struct vcpu *v; atomic_inc(&d->pause_count); - for_each_vcpu( d, v ) - sleep_fn(v); + if ( sync ) + for_each_vcpu ( d, v ) + vcpu_sleep_sync(v); + else + for_each_vcpu ( d, v ) + vcpu_sleep_nosync(v); arch_domain_pause(d); } @@ -1242,12 +1245,12 @@ static void do_domain_pause(struct domain *d, void domain_pause(struct domain *d) { ASSERT(d != current->domain); - do_domain_pause(d, vcpu_sleep_sync); + _domain_pause(d, true /* sync */); } void domain_pause_nosync(struct domain *d) { - do_domain_pause(d, vcpu_sleep_nosync); + _domain_pause(d, false /* nosync */); } void domain_unpause(struct domain *d) @@ -1261,8 +1264,7 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -int __domain_pause_by_systemcontroller(struct domain *d, - void (*pause_fn)(struct domain *d)) +static int _domain_pause_by_systemcontroller(struct domain *d, bool sync) { int old, new, prev = d->controller_pause_count; @@ -1281,11 +1283,21 @@ int __domain_pause_by_systemcontroller(struct domain *d, prev = cmpxchg(&d->controller_pause_count, old, new); } while ( prev != old ); - pause_fn(d); + _domain_pause(d, sync); return 0; } +int domain_pause_by_systemcontroller(struct domain *d) +{ + return _domain_pause_by_systemcontroller(d, true /* sync */); +} + +int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return _domain_pause_by_systemcontroller(d, false /* nosync */); +} + int domain_unpause_by_systemcontroller(struct domain *d) { int old, new, prev = d->controller_pause_count; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 28146ee404..37f78cc4c4 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -920,26 +920,21 @@ static inline bool vcpu_cpu_dirty(const struct vcpu *v) void vcpu_block(void); void vcpu_unblock(struct vcpu *v); + void vcpu_pause(struct vcpu *v); void vcpu_pause_nosync(struct vcpu *v); void vcpu_unpause(struct vcpu *v); + int vcpu_pause_by_systemcontroller(struct vcpu *v); int vcpu_unpause_by_systemcontroller(struct vcpu *v); void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void domain_unpause(struct domain *d); + +int domain_pause_by_systemcontroller(struct domain *d); +int domain_pause_by_systemcontroller_nosync(struct domain *d); int domain_unpause_by_systemcontroller(struct domain *d); -int __domain_pause_by_systemcontroller(struct domain *d, - void (*pause_fn)(struct domain *d)); -static inline int domain_pause_by_systemcontroller(struct domain *d) -{ - return __domain_pause_by_systemcontroller(d, domain_pause); -} -static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) -{ - return __domain_pause_by_systemcontroller(d, domain_pause_nosync); -} /* domain_pause() but safe against trying to pause current. */ int __must_check domain_pause_except_self(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 17:11:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 17:11:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248787.429136 (Exim 4.92) (envelope-from ) id 1myGlH-0005Zg-7a; Fri, 17 Dec 2021 17:11:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248787.429136; Fri, 17 Dec 2021 17:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGlH-0005ZY-4P; Fri, 17 Dec 2021 17:11:15 +0000 Received: by outflank-mailman (input) for mailman id 248787; Fri, 17 Dec 2021 17:11:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGlG-0005ZS-SS for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGlG-0008CR-Rf for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myGlG-000636-QX for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rCjQgUELIQQj6EMfo8si0+A2d2aQc6fAqC8dJPJSnXQ=; b=L8MZwABECAlhjyhZt45oOCy7Ft Bv/tcIHY613VVnYexeUTYDpKtWzEihlpZWFIw9UhEbKOdOyiWiVFYvI2rEv0ZSaP6zOM7raaawoII UIip6ad0yMPgAEc470lYtYMFYp+btZQyWaKeZpGGhFJtIKIZH5gFeezRdhKSGLnyqddE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Drop exception_table[] and use if/else dispatching Message-Id: Date: Fri, 17 Dec 2021 17:11:14 +0000 commit 327db3837a223dd0772348192126302852de5762 Author: Andrew Cooper AuthorDate: Thu Oct 7 14:04:03 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 17:03:54 2021 +0000 x86/traps: Drop exception_table[] and use if/else dispatching There is also a lot of redundancy in the table. 8 vectors head to do_trap(), 3 are handled in the IST logic, and that only leaves 7 others not heading to the do_reserved_trap() catch-all. This also removes the fragility that any accidental NULL entry in the table becomes a ticking timebomb. Function pointers are expensive under retpoline, and different vectors have wildly different frequences. Drop the indirect call, and use an if/else chain instead, which is a code layout technique used by profile-guided optimsiation. Using Xen's own perfcounter infrastructure, we see the following frequences of vectors measured from boot until I can SSH into dom0 and collect the stats: vec | CFL-R | Milan | Notes ----+---------+---------+ NMI | 345 | 3768 | Watchdog. Milan has many more CPUs. ----+---------+---------+ #PF | 1233234 | 2006441 | #GP | 90054 | 96193 | #UD | 848 | 851 | #NM | 0 | 132 | Per-vendor lazy vs eager FPU policy. #DB | 67 | 67 | No clue, but it's something in userspace. Bloat-o-meter (after some manual insertion of ELF metadata) reports: add/remove: 0/1 grow/shrink: 2/0 up/down: 102/-256 (-154) Function old new delta handle_exception_saved 148 226 +78 handle_ist_exception 453 477 +24 exception_table 256 - -256 showing that the if/else chains are less than half the size that exception_table[] was in the first place. As part of this change, make two other minor changes. do_reserved_trap() is renamed to do_unhandled_trap() because it is the catchall, and already covers things that aren't reserved any more (#VE/#VC/#HV/#SX). Furthermore, don't forward #TS to guests. #TS is specifically for errors relating to the Task State Segment, which is a Xen-owned structure, not a guest-owned structure. Even in the 32bit days, we never let guests register their own Task State Segments. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/processor.h | 3 -- xen/arch/x86/traps.c | 34 ++---------------- xen/arch/x86/x86_64/entry.S | 67 ++++++++++++++++++++++++++++++++---- 3 files changed, 62 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 400b4fac5e..e2e1eaf5bd 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -505,9 +505,6 @@ extern void mtrr_bp_init(void); void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp); -/* Dispatch table for exceptions */ -extern void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs); - #define DECLARE_TRAP_HANDLER(_name) \ void _name(void); \ void do_ ## _name(struct cpu_user_regs *regs) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index df7ffc448b..581d8be2aa 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -135,36 +135,6 @@ const unsigned int nmi_cpu; #define stack_words_per_line 4 #define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)regs->rsp) -static void do_trap(struct cpu_user_regs *regs); -static void do_reserved_trap(struct cpu_user_regs *regs); - -void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs) = { - [TRAP_divide_error] = do_trap, - [TRAP_debug] = do_debug, - [TRAP_nmi] = (void *)do_nmi, - [TRAP_int3] = do_int3, - [TRAP_overflow] = do_trap, - [TRAP_bounds] = do_trap, - [TRAP_invalid_op] = do_invalid_op, - [TRAP_no_device] = do_device_not_available, - [TRAP_double_fault] = do_reserved_trap, - [TRAP_copro_seg] = do_reserved_trap, - [TRAP_invalid_tss] = do_trap, - [TRAP_no_segment] = do_trap, - [TRAP_stack_error] = do_trap, - [TRAP_gp_fault] = do_general_protection, - [TRAP_page_fault] = do_page_fault, - [TRAP_spurious_int] = do_reserved_trap, - [TRAP_copro_error] = do_trap, - [TRAP_alignment_check] = do_trap, - [TRAP_machine_check] = (void *)do_machine_check, - [TRAP_simd_error] = do_trap, - [TRAP_virtualisation] = do_reserved_trap, - [X86_EXC_CP] = do_entry_CP, - [X86_EXC_CP + 1 ... - (ARRAY_SIZE(exception_table) - 1)] = do_reserved_trap, -}; - void show_code(const struct cpu_user_regs *regs) { unsigned char insns_before[8] = {}, insns_after[16] = {}; @@ -889,7 +859,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } -static void do_reserved_trap(struct cpu_user_regs *regs) +void do_unhandled_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; @@ -981,7 +951,7 @@ static bool extable_fixup(struct cpu_user_regs *regs, bool print) return true; } -static void do_trap(struct cpu_user_regs *regs) +void do_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 3caa565476..3eaf0e67b2 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -773,14 +773,48 @@ handle_exception_saved: sti 1: movq %rsp,%rdi movzbl UREGS_entry_vector(%rsp),%eax - leaq exception_table(%rip),%rdx #ifdef CONFIG_PERF_COUNTERS lea per_cpu__perfcounters(%rip), %rcx add STACK_CPUINFO_FIELD(per_cpu_offset)(%r14), %rcx incl ASM_PERFC_exceptions * 4(%rcx, %rax, 4) #endif - mov (%rdx, %rax, 8), %rdx - INDIRECT_CALL %rdx + + /* + * Dispatch to appropriate C handlers. + * + * The logic is implemented as an if/else chain. DISPATCH() calls + * need be in frequency order for best performance. + */ +#define DISPATCH(vec, handler) \ + cmp $vec, %al; \ + jne .L_ ## vec ## _done; \ + call handler; \ + jmp .L_exn_dispatch_done; \ +.L_ ## vec ## _done: + + DISPATCH(X86_EXC_PF, do_page_fault) + DISPATCH(X86_EXC_GP, do_general_protection) + DISPATCH(X86_EXC_UD, do_invalid_op) + DISPATCH(X86_EXC_NM, do_device_not_available) + DISPATCH(X86_EXC_BP, do_int3) + + /* Logically "if ( (1 << vec) & MASK ) { do_trap(); }" */ + mov $(1 << X86_EXC_DE) | (1 << X86_EXC_OF) | (1 << X86_EXC_BR) |\ + (1 << X86_EXC_NP) | (1 << X86_EXC_SS) | (1 << X86_EXC_MF) |\ + (1 << X86_EXC_AC) | (1 << X86_EXC_XM), %edx + bt %eax, %edx + jnc .L_do_trap_done + call do_trap + jmp .L_exn_dispatch_done +.L_do_trap_done: + + DISPATCH(X86_EXC_CP, do_entry_CP) +#undef DISPATCH + + call do_unhandled_trap + BUG /* do_unhandled_trap() shouldn't return. */ + +.L_exn_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %r13b, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) #ifdef CONFIG_PV @@ -1012,9 +1046,28 @@ handle_ist_exception: incl ASM_PERFC_exceptions * 4(%rcx, %rax, 4) #endif - leaq exception_table(%rip),%rdx - mov (%rdx, %rax, 8), %rdx - INDIRECT_CALL %rdx + /* + * Dispatch to appropriate C handlers. + * + * The logic is implemented as an if/else chain. DISPATCH() calls + * need be in frequency order for best performance. + */ +#define DISPATCH(vec, handler) \ + cmp $vec, %al; \ + jne .L_ ## vec ## _done; \ + call handler; \ + jmp .L_ist_dispatch_done; \ +.L_ ## vec ## _done: + + DISPATCH(X86_EXC_NMI, do_nmi) + DISPATCH(X86_EXC_DB, do_debug) + DISPATCH(X86_EXC_MC, do_machine_check) +#undef DISPATCH + + call do_unhandled_trap + BUG /* do_unhandled_trap() shouldn't return. */ + +.L_ist_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %bl, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) @@ -1088,7 +1141,7 @@ autogen_stubs: /* Automatically generated stubs. */ entrypoint 1b - /* Reserved exceptions, heading towards do_reserved_trap(). */ + /* Reserved exceptions, heading towards do_unhandled_trap(). */ .elseif vec == X86_EXC_CSO || vec == X86_EXC_SPV || \ vec == X86_EXC_VE || (vec > X86_EXC_CP && vec < TRAP_nr) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Dec 17 17:11:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 17 Dec 2021 17:11:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.248788.429140 (Exim 4.92) (envelope-from ) id 1myGlS-0005ce-8z; Fri, 17 Dec 2021 17:11:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 248788.429140; Fri, 17 Dec 2021 17:11:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGlS-0005cW-5v; Fri, 17 Dec 2021 17:11:26 +0000 Received: by outflank-mailman (input) for mailman id 248788; Fri, 17 Dec 2021 17:11:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGlQ-0005cL-Vu for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myGlQ-0008Cg-V5 for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myGlQ-00063s-Tz for xen-changelog@lists.xenproject.org; Fri, 17 Dec 2021 17:11:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=q6nX9ZxxPRWno83zschDEJAJGOkRhDSoaBdrH2D5BaE=; b=KSPgNIeRLBI7VA4nd3NBw0mIZz /F/h4qJoMePoSusLuVizYzXsVjxyoI8ykoZS1Vsl4cWWxDvvsVxmdHZs4Fsm0puX28DZ+8rYL6GgV BMM9s7IOWPz6JH+iXrdRd4L6PtGggbIqYgWTG5cRvMDosXvH+balo0zhyQTFJDTeKVMc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/traps: Clean up diagnostics Message-Id: Date: Fri, 17 Dec 2021 17:11:24 +0000 commit 8e3edefb880caeeaaf80123d5599139e8c2c9ecf Author: Andrew Cooper AuthorDate: Fri Oct 8 13:40:17 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 17:03:54 2021 +0000 x86/traps: Clean up diagnostics do{_unhandled,}_trap() should use fatal_trap() rather than opencoding part of it. This lets the remote stack trace logic work in more fatal error conditions. With do_trap() converted, there is only one single user of trapstr() remaining. Tweak the formatting in pv_inject_event(), and remove trapstr() entirely. Rename vec_name() to vector_name() now that it is exported. Take the opportunity of vector_name() being exported to improve the diagnostics in stub_selftest(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/extable.c | 8 +++++--- xen/arch/x86/include/asm/traps.h | 2 +- xen/arch/x86/pv/traps.c | 6 +++--- xen/arch/x86/traps.c | 29 +++++------------------------ 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 109ab7da98..78d6727225 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -124,6 +124,8 @@ search_exception_table(const struct cpu_user_regs *regs) } #ifndef NDEBUG +#include + static int __init stub_selftest(void) { static const struct { @@ -172,10 +174,10 @@ static int __init stub_selftest(void) if ( res.raw != tests[i].res.raw ) { printk("Selftest %u failed: Opc %*ph " - "expected %u[%04x], got %u[%04x]\n", + "expected %s[%04x], got %s[%04x]\n", i, (int)ARRAY_SIZE(tests[i].opc), tests[i].opc, - tests[i].res.fields.trapnr, tests[i].res.fields.ec, - res.fields.trapnr, res.fields.ec); + vector_name(tests[i].res.fields.trapnr), tests[i].res.fields.ec, + vector_name(res.fields.trapnr), res.fields.ec); fail = true; } diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index ec23d3a70b..b0dd2d2461 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -19,7 +19,7 @@ #ifndef ASM_TRAP_H #define ASM_TRAP_H -const char *trapstr(unsigned int trapnr); +const char *vector_name(unsigned int vec); #endif /* ASM_TRAP_H */ diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 1e05a9f1cd..170e103098 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -89,9 +89,9 @@ void pv_inject_event(const struct x86_event *event) if ( unlikely(null_trap_bounce(curr, tb)) ) { - gprintk(XENLOG_WARNING, - "Unhandled %s fault/trap [#%d, ec=%04x]\n", - trapstr(vector), vector, error_code); + gprintk(XENLOG_ERR, + "Unhandled: vec %u, %s[%04x]\n", + vector, vector_name(vector), error_code); if ( vector == TRAP_page_fault ) show_page_walk(event->cr2); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 581d8be2aa..485bd66971 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -767,21 +767,7 @@ static int nmi_show_execution_state(const struct cpu_user_regs *regs, int cpu) return 1; } -const char *trapstr(unsigned int trapnr) -{ - static const char * const strings[] = { - "divide error", "debug", "nmi", "bkpt", "overflow", "bounds", - "invalid opcode", "device not available", "double fault", - "coprocessor segment", "invalid tss", "segment not found", - "stack error", "general protection fault", "page fault", - "spurious interrupt", "coprocessor error", "alignment check", - "machine check", "simd error", "virtualisation exception" - }; - - return trapnr < ARRAY_SIZE(strings) ? strings[trapnr] : "???"; -} - -static const char *vec_name(unsigned int vec) +const char *vector_name(unsigned int vec) { static const char names[][4] = { #define P(x) [X86_EXC_ ## x] = "#" #x @@ -855,7 +841,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) } panic("FATAL TRAP: vec %u, %s[%04x]%s\n", - trapnr, vec_name(trapnr), regs->error_code, + trapnr, vector_name(trapnr), regs->error_code, (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } @@ -866,9 +852,7 @@ void do_unhandled_trap(struct cpu_user_regs *regs) if ( debugger_trap_fatal(trapnr, regs) ) return; - show_execution_state(regs); - panic("FATAL RESERVED TRAP: vec %u, %s[%04x]\n", - trapnr, vec_name(trapnr), regs->error_code); + fatal_trap(regs, false); } static void fixup_exception_return(struct cpu_user_regs *regs, @@ -942,7 +926,7 @@ static bool extable_fixup(struct cpu_user_regs *regs, bool print) */ if ( IS_ENABLED(CONFIG_DEBUG) && print ) printk(XENLOG_GUEST XENLOG_WARNING "Fixup %s[%04x]: %p [%ps] -> %p\n", - vec_name(regs->entry_vector), regs->error_code, + vector_name(regs->entry_vector), regs->error_code, _p(regs->rip), _p(regs->rip), _p(fixup)); fixup_exception_return(regs, fixup); @@ -978,10 +962,7 @@ void do_trap(struct cpu_user_regs *regs) if ( debugger_trap_fatal(trapnr, regs) ) return; - show_execution_state(regs); - panic("FATAL TRAP: vector = %d (%s)\n" - "[error_code=%04x]\n", - trapnr, trapstr(trapnr), regs->error_code); + fatal_trap(regs, false); } int guest_rdmsr_xen(const struct vcpu *v, uint32_t idx, uint64_t *val) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:33:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:33:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249086.429511 (Exim 4.92) (envelope-from ) id 1myZpg-0008FG-64; Sat, 18 Dec 2021 13:33:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249086.429511; Sat, 18 Dec 2021 13:33:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpg-0008F8-35; Sat, 18 Dec 2021 13:33:04 +0000 Received: by outflank-mailman (input) for mailman id 249086; Sat, 18 Dec 2021 13:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpe-0008F2-SO for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpe-0007Am-Q2 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZpe-000882-Ot for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=B/3lIBsWZStJQUOHliHHFFBrt3vZNoGBbt+JjKpHI/E=; b=iYOyLKIkJsGTNCyVi0C8xBVmNY o7PFOgE5F+uaG2/PRzNRcKDhLPrpJzuGfL7evORPd89IcfvwF5AeN7PAjoiP/v/WsyJA8k2V5S4Az Ywv19orSdZMMt2NuARWz9RQZ0g5sAy5VmDHMvqjjpnM8l/io0K6smHDUDVsu1EHPL6qA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: make some per-scheduler performance counters sched global ones Message-Id: Date: Sat, 18 Dec 2021 13:33:02 +0000 commit c5f39993e42d0d26fbfdcfde4e95651a23748ee0 Author: Juergen Gross AuthorDate: Thu Dec 16 06:45:02 2021 +0100 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:09 2021 +0000 xen: make some per-scheduler performance counters sched global ones Some performance counters listed to be credit or credit2 specific are being used by the null scheduler, too. Make those sched global ones. Fixes: ab6ba8c6753fa76 ("perfc: conditionalize credit/credit2 counters") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Tested-by: Stefano Stabellini --- xen/include/xen/perfc_defn.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h index 672b51c456..0027d95a60 100644 --- a/xen/include/xen/perfc_defn.h +++ b/xen/include/xen/perfc_defn.h @@ -34,6 +34,9 @@ PERFCOUNTER(tickled_idle_cpu, "sched: tickled_idle_cpu") PERFCOUNTER(tickled_idle_cpu_excl, "sched: tickled_idle_cpu_exclusive") PERFCOUNTER(tickled_busy_cpu, "sched: tickled_busy_cpu") PERFCOUNTER(unit_check, "sched: unit_check") +PERFCOUNTER(migrate_running, "sched: migrate_running") +PERFCOUNTER(migrate_on_runq, "sched: migrate_on_runq") +PERFCOUNTER(migrated, "sched: migrated") /* credit specific counters */ #ifdef CONFIG_SCHED_CREDIT @@ -55,7 +58,6 @@ PERFCOUNTER(steal_trylock, "csched: steal_trylock") PERFCOUNTER(steal_trylock_failed, "csched: steal_trylock_failed") PERFCOUNTER(steal_peer_idle, "csched: steal_peer_idle") PERFCOUNTER(migrate_queued, "csched: migrate_queued") -PERFCOUNTER(migrate_running, "csched: migrate_running") PERFCOUNTER(migrate_kicked_away, "csched: migrate_kicked_away") PERFCOUNTER(unit_hot, "csched: unit_hot") #endif @@ -67,13 +69,11 @@ PERFCOUNTER(acct_load_balance, "csched2: acct_load_balance") PERFCOUNTER(upd_max_weight_quick, "csched2: update_max_weight_quick") PERFCOUNTER(upd_max_weight_full, "csched2: update_max_weight_full") PERFCOUNTER(migrate_requested, "csched2: migrate_requested") -PERFCOUNTER(migrate_on_runq, "csched2: migrate_on_runq") PERFCOUNTER(migrate_no_runq, "csched2: migrate_no_runq") PERFCOUNTER(runtime_min_timer, "csched2: runtime_min_timer") PERFCOUNTER(runtime_max_timer, "csched2: runtime_max_timer") PERFCOUNTER(pick_resource, "csched2: pick_resource") PERFCOUNTER(need_fallback_cpu, "csched2: need_fallback_cpu") -PERFCOUNTER(migrated, "csched2: migrated") PERFCOUNTER(migrate_resisted, "csched2: migrate_resisted") PERFCOUNTER(credit_reset, "csched2: credit_reset") PERFCOUNTER(deferred_to_tickled_cpu,"csched2: deferred_to_tickled_cpu") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:33:14 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:33:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249087.429515 (Exim 4.92) (envelope-from ) id 1myZpq-0008Gt-8A; Sat, 18 Dec 2021 13:33:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249087.429515; Sat, 18 Dec 2021 13:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpq-0008Gl-4u; Sat, 18 Dec 2021 13:33:14 +0000 Received: by outflank-mailman (input) for mailman id 249087; Sat, 18 Dec 2021 13:33:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpo-0008Gb-UK for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpo-0007Aq-Tf for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZpo-00088j-SU for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PMBA//9l6tEr2S3pk+mA0noNwIzVFHySYu88SYkHEro=; b=M5uu6ooaRqnObfOYoXdsTsm9sI hBHC1rb0gXX/BXXdC/Fx9lg8S0r5lZUjQ04yBLU9Zj5a0hEb+/aDmjY6uZ/c4K4y8q4uf2FH3jM/R e6N0JDVxnk3aFIhRVwEwQe/342VRZ9h5m4O5+F/nwxJnnkeXYblhUauxoDB2AwNp5ENk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/build: Fix `make cscope` rune Message-Id: Date: Sat, 18 Dec 2021 13:33:12 +0000 commit fa3cc3ff3b7685dd6b930d1901d8de7be9527794 Author: Andrew Cooper AuthorDate: Thu Dec 16 02:38:57 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 xen/build: Fix `make cscope` rune There are two problems, both in the all_sources definition. First, everything in arch/*/include gets double hits with cscope queries, because they end up getting listed twice in cscope.files. Drop the first `find` rune of the three, because it's redundant with the third rune following c/s 725381a5eab3 ("xen: move include/asm-* to arch/*/include/asm"). Second, and this way for a long time: $ make cscope ( find arch/x86/include -name '*.h' -print; find include -name '*.h' -print; find xsm arch/x86 common drivers lib test -name '*.[chS]' -print ) > cscope.files cscope -k -b -q cscope: cannot find file arch/x86/efi/efi.h cscope: cannot find file arch/x86/efi/ebmalloc.c cscope: cannot find file arch/x86/efi/compat.c cscope: cannot find file arch/x86/efi/pe.c cscope: cannot find file arch/x86/efi/boot.c cscope: cannot find file arch/x86/efi/runtime.c This is caused by these being symlinks to common/efi. Restrict all find runes to `-type f` to skip symlinks, because common/efi/*.c are already listed. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Volodymyr Babchuk --- xen/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 2ad7da7ad6..dc6bdc44c7 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -468,9 +468,8 @@ arch/$(TARGET_ARCH)/include/asm/asm-offsets.h: asm-offsets.s SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers lib test define all_sources - ( find arch/$(TARGET_ARCH)/include -name '*.h' -print; \ - find include -name '*.h' -print; \ - find $(SUBDIRS) -name '*.[chS]' -print ) + ( find include -type f -name '*.h' -print; \ + find $(SUBDIRS) -type f -name '*.[chS]' -print ) endef define set_exuberant_flags -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:33:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:33:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249088.429519 (Exim 4.92) (envelope-from ) id 1myZq0-0008Js-9h; Sat, 18 Dec 2021 13:33:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249088.429519; Sat, 18 Dec 2021 13:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZq0-0008Jh-6j; Sat, 18 Dec 2021 13:33:24 +0000 Received: by outflank-mailman (input) for mailman id 249088; Sat, 18 Dec 2021 13:33:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpz-0008JP-1a for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZpz-0007BU-0q for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZpy-00089U-W2 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KgpQyeQSbqumyzm6Npkrd3A9W61UI4SpOKIKCMHBQh0=; b=juVjzKRaTUySUsthOXlVmg2FHW I+3pW9pysV1aeR/sFR5RPJiFM0NcYPtIA1ZxDd/MiL/oCM1Tsbdtjb7Ln1Q8Xjcyx11zo7ufx4OM4 iHBReAAPy62id+ujAYDrPzE0VKjYI1z9dH9dUM5eUuwboCMOFwJKBkouDUb1+aLAxMwc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libxl: Don't read STORE/CONSOLE_PFN from Xen Message-Id: Date: Sat, 18 Dec 2021 13:33:22 +0000 commit 989289e23f9c2700b73be8386115ffc98bfec906 Author: Andrew Cooper AuthorDate: Thu Dec 9 16:59:06 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/libxl: Don't read STORE/CONSOLE_PFN from Xen The values are already available in dom->{console,xenstore}_pfn, just like on the PV side of things. No need to ask Xen. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_dom.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index c9c24666cd..03841243ab 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -722,13 +722,10 @@ out: } static int hvm_build_set_params(xc_interface *handle, uint32_t domid, - libxl_domain_build_info *info, - unsigned long *store_mfn, - unsigned long *console_mfn) + libxl_domain_build_info *info) { struct hvm_info_table *va_hvm; uint8_t *va_map, sum; - uint64_t str_mfn, cons_mfn; int i; if (info->type == LIBXL_DOMAIN_TYPE_HVM) { @@ -749,12 +746,6 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, munmap(va_map, XC_PAGE_SIZE); } - xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); - xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); - - *store_mfn = str_mfn; - *console_mfn = cons_mfn; - return 0; } @@ -1168,12 +1159,14 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (rc != 0) goto out; - rc = hvm_build_set_params(ctx->xch, domid, info, &state->store_mfn, - &state->console_mfn); + rc = hvm_build_set_params(ctx->xch, domid, info); if (rc != 0) { LOG(ERROR, "hvm build set params failed"); goto out; } + + state->console_mfn = dom->console_pfn; + state->store_mfn = dom->xenstore_pfn; state->vuart_gfn = dom->vuart_gfn; rc = hvm_build_set_xs_values(gc, domid, dom, info); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:33:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:33:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249089.429523 (Exim 4.92) (envelope-from ) id 1myZqA-0008N6-B2; Sat, 18 Dec 2021 13:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249089.429523; Sat, 18 Dec 2021 13:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqA-0008My-8B; Sat, 18 Dec 2021 13:33:34 +0000 Received: by outflank-mailman (input) for mailman id 249089; Sat, 18 Dec 2021 13:33:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZq9-0008MX-4q for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZq9-0007Bf-44 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZq9-0008A7-2w for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ChVeF9cncYDQo1I3nmEdt8BPJeh+P+gCqw2WVXo0xtE=; b=X55jpn5NY7Y2AZ8Y0GdeKTSg1a qhe2b3AVTbRxWdg9ZAdXVn00FhsBc5utNWNXFeM5fSC3Ul5yxNYzhqRfn586yOnKx0kwmyH+9bu9k nJxY4R/nv8inqgOamgrCrHsU89y2JKgjQboJI0dtBPWfx11d/DKdnEI3UDAMYJDI/0F0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs: Don't recursively expand MAJOR ?= $(shell ...) Message-Id: Date: Sat, 18 Dec 2021 13:33:33 +0000 commit a4885765eedbddafcc57bce6cbfcd443d0a7eca9 Author: Andrew Cooper AuthorDate: Mon Dec 13 18:49:17 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/libs: Don't recursively expand MAJOR ?= $(shell ...) ?= is a deferred assignment. Switch to an alternative form which lets us use an immediate assignment. Before, version.sh gets run anywhere between 46 and 88 times, with 50 on a `clean`. After, between 6 and 12 times. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- tools/libs/libs.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index dfbbef4080..b21e0bf083 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -6,7 +6,10 @@ # MINOR: minor version of lib (0 if empty) LIBNAME := $(notdir $(CURDIR)) -MAJOR ?= $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) + +ifeq ($(origin MAJOR), undefined) +MAJOR := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) +endif MINOR ?= 0 SHLIB_LDFLAGS += -Wl,--version-script=libxen$(LIBNAME).map -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:33:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:33:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249090.429527 (Exim 4.92) (envelope-from ) id 1myZqK-0008Q4-CV; Sat, 18 Dec 2021 13:33:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249090.429527; Sat, 18 Dec 2021 13:33:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqK-0008Pw-9e; Sat, 18 Dec 2021 13:33:44 +0000 Received: by outflank-mailman (input) for mailman id 249090; Sat, 18 Dec 2021 13:33:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqJ-0008Pm-7n for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqJ-0007Bt-74 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZqJ-0008Ak-6A for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=9HKkrH8QRikDkoiZC0YtuaD1iXzp2V+IaYHTEgyD6nM=; b=5i2Rz7+PIBVh315ljw1cVRCWjJ zNZtifP0eTS6RoE4nFam70W0LyokLA9NrPAQ14KgSH6bQaozF3X3PGuYsYHD5axAn/khkf9cax4Sd vgW3AesVQS6ept2ri9th0zNB3qx2eYQujvdlIPsEQMXurnPrH0dFSuWOJ9PBaROSGd/8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/flask/utils: remove unused variables/targets from Makefile Message-Id: Date: Sat, 18 Dec 2021 13:33:43 +0000 commit c1634f0c86095e22228a1e1f6f917bfe1c91001d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:57 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/flask/utils: remove unused variables/targets from Makefile They are no *.opic or *.so in this subdir, so no need to clean them. The TEST* variables doesn't seems to be used anywhere, and they weren't used by xen.git when introduced. Both CLIENTS_* variables aren't used. Both target "print-dir" and "print-end" only exist in this directory and are probably not used anywhere. Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Smith [Drop trailing whitespace and use $(RM) consistently] Signed-off-by: Andrew Cooper --- tools/flask/utils/Makefile | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index ae87102144..db567b13dc 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -4,13 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) -TESTDIR = testsuite/tmp -TESTFLAGS= -DTESTING -TESTENV = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR) - CLIENTS := flask-loadpolicy flask-setenforce flask-getenforce flask-label-pci flask-get-bool flask-set-bool -CLIENTS_SRCS := $(patsubst flask-%,%.c,$(CLIENTS)) -CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) .PHONY: all all: $(CLIENTS) @@ -34,22 +28,12 @@ flask-set-bool: set-bool.o $(CC) $(LDFLAGS) $< $(LDLIBS) $(LDLIBS_libxenctrl) -o $@ .PHONY: clean -clean: - rm -f *.o *.opic *.so - rm -f $(CLIENTS) - $(RM) $(DEPS_RM) +clean: + $(RM) *.o $(CLIENTS) $(DEPS_RM) .PHONY: distclean distclean: clean -.PHONY: print-dir -print-dir: - @echo -n tools/flask/utils: - -.PHONY: print-end -print-end: - @echo - .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:33:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:33:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249091.429531 (Exim 4.92) (envelope-from ) id 1myZqV-0008T0-E5; Sat, 18 Dec 2021 13:33:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249091.429531; Sat, 18 Dec 2021 13:33:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqV-0008Ss-B4; Sat, 18 Dec 2021 13:33:55 +0000 Received: by outflank-mailman (input) for mailman id 249091; Sat, 18 Dec 2021 13:33:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqT-0008Sb-B6 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqT-0007C3-AF for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZqT-0008BV-9M for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:33:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FkHJPU9P/m9Mzqqz1hm377awIrACGZXM7+MALABP3Q4=; b=5OfwQt0ImRt2Us5aLxky/VTDEP 79GQGRipm2kSWnClF2Nuv3JMRa4xTtqtZErGMNe526CXzsiyQsPulidpc0HATBJJAU2+dRkFtvBEp /UXgK2y3laO8RgVLvvMTtR6OpSNaH9yqRB627oNzAfj0bAT1cRlCqZMzKB9KyRMz/AMw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libacpi: cleanup Makefile, don't check for iasl binary Message-Id: Date: Sat, 18 Dec 2021 13:33:53 +0000 commit 5a8b28bfd4315d9b5c1d57d60a33c81413ee9c8f Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:58 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/libacpi: cleanup Makefile, don't check for iasl binary iasl is been check for presence by ./configure, so this Makefile doesn't have to do it. Also start to use $(IASL) that ./configure generate. iasl hasn't been download by our build system for a while and the dependency on iasl is in the main xen.git README. Make use of $< in one rule instead of spelling the %.asl file again. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/libacpi/Makefile | 17 ++++------------- tools/libacpi/README | 6 ------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile index 2448687dbb..60860eaa00 100644 --- a/tools/libacpi/Makefile +++ b/tools/libacpi/Makefile @@ -38,11 +38,10 @@ MKDSDT_CFLAGS-$(CONFIG_X86) = -DCONFIG_X86 # complete $(ACPI_BUILD_DIR) as path, even if it has '.' symbols. TMP_SUFFIX = tmp -vpath iasl $(PATH) all: $(C_SRC) $(H_SRC) -$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl - iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< +$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl + $(IASL) -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex) @@ -74,21 +73,13 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT) $(MK_DSDT) --debug=$(debug) >> $@.$(TMP_SUFFIX) mv -f $@.$(TMP_SUFFIX) $@ -$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl - iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl +$(C_SRC): $(ACPI_BUILD_DIR)/%.c: $(ACPI_BUILD_DIR)/%.asl + $(IASL) -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX) echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX) mv -f $@.$(TMP_SUFFIX) $@ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex) -iasl: - @echo - @echo "ACPI ASL compiler (iasl) is needed" - @echo "Download and install Intel ACPI CA from" - @echo "http://acpica.org/downloads/" - @echo - @exit 1 - clean: rm -f $(C_SRC) $(H_SRC) $(MK_DSDT) $(C_SRC:=.$(TMP_SUFFIX)) rm -f $(patsubst %.c,%.hex,$(C_SRC)) $(patsubst %.c,%.aml,$(C_SRC)) $(patsubst %.c,%.asl,$(C_SRC)) diff --git a/tools/libacpi/README b/tools/libacpi/README index 2b9d6e188c..4ab5ed2de7 100644 --- a/tools/libacpi/README +++ b/tools/libacpi/README @@ -24,9 +24,3 @@ In case that the acpi_dsdt.asl need to be updated, please Follow the instruction: # make acpi_dsdt.c - -Note: -DSDT compiler "iasl" is needed. By default, it will be downloaded -using wget in Makefile. if it failed, please download manually from -http://developer.intel.com/technology/iapc/acpi/downloads.htm. -then compile and install iasl -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:34:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:34:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249092.429535 (Exim 4.92) (envelope-from ) id 1myZqf-0008Vg-Ft; Sat, 18 Dec 2021 13:34:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249092.429535; Sat, 18 Dec 2021 13:34:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqf-0008VY-Cb; Sat, 18 Dec 2021 13:34:05 +0000 Received: by outflank-mailman (input) for mailman id 249092; Sat, 18 Dec 2021 13:34:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqd-0008VA-Ea for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqd-0007CQ-Dm for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZqd-0008C8-Ci for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VAU1ztfjwQOkepxaX0YlVJyTDd2qGPAufP/rbcDMG/g=; b=K83kTP35VkBrNtJnM6ALz+Bsze zg2089BZ1CCY7btyuZMngYmxiF2zQQFQp+lVo2dc5xvYb9QVwRh6gUBADVYj1nXItP1Nmh/h9T+d/ af3fsBn0c8PeYfQK0fT8GcabB/J3RiyH8ikWyHUo0D3oAKE+Vpscxd24cHxCBzhr9HMg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/ocaml: Remove generation of _paths.h Message-Id: Date: Sat, 18 Dec 2021 13:34:03 +0000 commit ba9e57ef6dc8ea6da1719b4b5c321c2fb794a706 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:01:59 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/ocaml: Remove generation of _paths.h _paths.h isn't useful anymore in systemd_stubs. Signed-off-by: Anthony PERARD Acked-by: Christian Lindig --- .gitignore | 1 - tools/ocaml/xenstored/Makefile | 7 ------- tools/ocaml/xenstored/systemd_stubs.c | 2 -- 3 files changed, 10 deletions(-) diff --git a/.gitignore b/.gitignore index e13cbf84b2..958c60bb5f 100644 --- a/.gitignore +++ b/.gitignore @@ -408,7 +408,6 @@ tools/ocaml/libs/xentoollog/xentoollog.ml tools/ocaml/libs/xentoollog/xentoollog.mli tools/ocaml/libs/xs/paths.ml tools/ocaml/libs/xc/xenctrl_abi_check.h -tools/ocaml/xenstored/_paths.h tools/ocaml/xenstored/oxenstored tools/ocaml/xenstored/oxenstored.conf tools/ocaml/xenstored/paths.ml diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 89ec3ec76a..0b5711b507 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -30,8 +30,6 @@ systemd_OBJS = systemd systemd_C_OBJS = systemd_stubs OCAML_LIBRARY += systemd -$(foreach obj,$(systemd_C_OBJS),$(obj).o): _paths.h - LIBS_systemd += $(LDFLAGS-y) OBJS = paths \ @@ -100,8 +98,3 @@ genpath-target = $(call buildmakevars2module,paths.ml) $(eval $(genpath-target)) GENERATED_FILES += paths.ml - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -GENERATE_FILES += _paths.h diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index 31a1a5d384..f4c875075a 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -27,8 +27,6 @@ #include -#include "_paths.h" - CAMLprim value ocaml_sd_notify_ready(value ignore) { CAMLparam1(ignore); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:34:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:34:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249093.429539 (Exim 4.92) (envelope-from ) id 1myZqp-00007T-Ii; Sat, 18 Dec 2021 13:34:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249093.429539; Sat, 18 Dec 2021 13:34:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqp-00007I-Fe; Sat, 18 Dec 2021 13:34:15 +0000 Received: by outflank-mailman (input) for mailman id 249093; Sat, 18 Dec 2021 13:34:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqn-00006x-Hl for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqn-0007Cb-H2 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZqn-0008D3-G3 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tVS7svonoZuarncuyoqk3XojOTdBs0YatGVgf98yWEE=; b=uLmS1cCZakCxOFAhp4NCl2xMp6 43HwfLuxgfHALN8hga9wXEJHC0r7DJELwIxfbFY8SeK9aWcyjluEJ0nu0gJ3XVohWFm7YWwtv7/1Z YrWcPzOLhbRUrqouTK1vHQsqf2gsHUGFbRUdiuIXm+fsgxE+WsFLY+qtvdSSJ1wgB5Ls=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xl: Remove unnecessary -I. from CFLAGS Message-Id: Date: Sat, 18 Dec 2021 13:34:13 +0000 commit e7fe314870442fb85f8ecfc0e0bc605dddcd75b1 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:00 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/xl: Remove unnecessary -I. from CFLAGS GCC will search the directory where the source file is for quote-includes. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/xl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 656b21c7da..2e129f00e1 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -7,7 +7,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. -fPIC +CFLAGS += -fPIC CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:34:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:34:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249094.429543 (Exim 4.92) (envelope-from ) id 1myZqy-0000Ai-LX; Sat, 18 Dec 2021 13:34:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249094.429543; Sat, 18 Dec 2021 13:34:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqy-0000Aa-ID; Sat, 18 Dec 2021 13:34:24 +0000 Received: by outflank-mailman (input) for mailman id 249094; Sat, 18 Dec 2021 13:34:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqx-0000AN-Mb for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZqx-0007DA-Lm for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZqx-0008E2-Ks for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yNHIcjWTtGzQZ9G8xfStGk2tK7RSgpmMFKXmSwpS2/E=; b=09wGdNnwkSOVPnUeAmi/WJ4Lky XFBLc8H8BaFPGogPXwhuUCsvG/Ao3gWgkpMpGAKjyXUjpvxLrznem/UsgUckfpGAV8u12RjZO/J7C 5i+/vxemLHqm/8aVe9ShlI9OaAmH6glSET+tnColmeLSXshtFMUzzJc+QWmgQk6Qo5as=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Use config.h from autoconf instead of "buildmakevars2header" Message-Id: Date: Sat, 18 Dec 2021 13:34:23 +0000 commit 021cd1c4b4dfd23a5feb92fecc8db8a7228c80a5 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:01 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools: Use config.h from autoconf instead of "buildmakevars2header" This avoid the need to generate the _paths.h header when the information is from autoconf anyway. They are no more users of the "buildmakevars2header" macro, so it can be removed from "Config.mk". Also removed the extra "-f" flag where "$(RM)" is used (xl/Makefile). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- .gitignore | 6 ----- Config.mk | 9 -------- configure | 45 ++++++++++++++++++++++++++++++++++++ docs/configure | 45 ++++++++++++++++++++++++++++++++++++ m4/paths.m4 | 9 ++++++++ tools/config.h.in | 27 ++++++++++++++++++++++ tools/configure | 45 ++++++++++++++++++++++++++++++++++++ tools/console/Makefile | 12 ++-------- tools/console/client/main.c | 1 - tools/console/daemon/main.c | 1 - tools/helpers/Makefile | 8 ++----- tools/helpers/init-xenstore-domain.c | 1 - tools/libs/guest/Makefile | 5 ---- tools/libs/guest/xg_dom_core.c | 1 - tools/libs/guest/xg_suspend.c | 1 - tools/libs/libs.mk | 1 - tools/libs/light/Makefile | 8 ++----- tools/libs/light/libxl_dom.c | 2 -- tools/libs/light/libxl_internal.h | 1 - tools/libs/light/libxl_utils.c | 1 - tools/libs/stat/Makefile | 7 +----- tools/libs/stat/xenstat_qmp.c | 1 - tools/xl/Makefile | 7 +----- tools/xl/xl.h | 1 - 24 files changed, 179 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 958c60bb5f..3f9d55ba87 100644 --- a/.gitignore +++ b/.gitignore @@ -123,7 +123,6 @@ tools/libs/foreignmemory/headers.chk tools/libs/foreignmemory/xenforeignmemory.pc tools/libs/devicemodel/headers.chk tools/libs/devicemodel/xendevicemodel.pc -tools/libs/guest/_*.[ch] tools/libs/guest/libxenguest.map tools/libs/guest/xenguest.pc tools/libs/guest/xc_bitops.h @@ -146,7 +145,6 @@ tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* tools/libs/light/xenlight.pc -tools/libs/stat/_paths.h tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map tools/libs/stat/xenstat.pc @@ -163,8 +161,6 @@ tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc tools/console/xenconsole tools/console/xenconsoled -tools/console/client/_paths.h -tools/console/daemon/_paths.h tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 @@ -207,7 +203,6 @@ tools/fuzz/x86_instruction_emulator/afl-harness-cov tools/fuzz/x86_instruction_emulator/wrappers.c tools/fuzz/x86_instruction_emulator/x86_emulate tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] -tools/helpers/_paths.h tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh @@ -421,7 +416,6 @@ tools/firmware/etherboot/ipxe.tar.gz tools/firmware/etherboot/ipxe/ tools/python/xen/lowlevel/xl/_pyxl_types.c tools/python/xen/lowlevel/xl/_pyxl_types.h -tools/xl/_paths.h tools/xl/xl docs/txt/misc/*.txt diff --git a/Config.mk b/Config.mk index 6587c7d626..1c1998a5a8 100644 --- a/Config.mk +++ b/Config.mk @@ -167,15 +167,6 @@ define buildmakevars2file-closure $(call move-if-changed,$(1).tmp,$(1)) endef -buildmakevars2header = $(eval $(call buildmakevars2header-closure,$(1))) -define buildmakevars2header-closure - $(1): .phony - rm -f $(1).tmp; \ - $(foreach var, $(BUILD_MAKE_VARS), \ - echo "#define $(var) \"$($(var))\"" >>$(1).tmp;) \ - $(call move-if-changed,$(1).tmp,$(1)) -endef - CFLAGS += -fno-strict-aliasing CFLAGS += -std=gnu99 diff --git a/configure b/configure index 502273b263..bb7f27ddad 100755 --- a/configure +++ b/configure @@ -1946,6 +1946,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1998,6 +2003,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -2038,6 +2048,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -2045,12 +2060,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -2060,6 +2090,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -2073,12 +2108,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/docs/configure b/docs/configure index f93d086e9a..d4fced9858 100755 --- a/docs/configure +++ b/docs/configure @@ -1849,6 +1849,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1901,6 +1906,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -1941,6 +1951,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -1948,12 +1963,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -1963,6 +1993,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -1976,12 +2011,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/m4/paths.m4 b/m4/paths.m4 index 7be314a3e2..826faada45 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -39,6 +39,7 @@ AC_SUBST(CONFIG_DIR) XEN_CONFIG_DIR=$CONFIG_DIR/xen AC_SUBST(XEN_CONFIG_DIR) +AC_DEFINE_UNQUOTED([XEN_CONFIG_DIR], ["$XEN_CONFIG_DIR"], [Xen's config dir]) AC_ARG_WITH([initddir], AS_HELP_STRING([--with-initddir=DIR], @@ -83,6 +84,7 @@ AC_ARG_WITH([xen-scriptdir], [xen_scriptdir_path=$XEN_CONFIG_DIR/scripts]) XEN_SCRIPT_DIR=$xen_scriptdir_path AC_SUBST(XEN_SCRIPT_DIR) +AC_DEFINE_UNQUOTED([XEN_SCRIPT_DIR], ["$XEN_SCRIPT_DIR"], [Xen's script dir]) AC_ARG_WITH([xen-dumpdir], AS_HELP_STRING([--with-xen-dumpdir=DIR], @@ -117,18 +119,22 @@ AC_SUBST(LIBEXEC) dnl These variables will be substituted in various .in files LIBEXEC_BIN=${LIBEXEC}/bin AC_SUBST(LIBEXEC_BIN) +AC_DEFINE_UNQUOTED([LIBEXEC_BIN], ["$LIBEXEC_BIN"], [Xen's libexec path]) LIBEXEC_LIB=${LIBEXEC}/lib AC_SUBST(LIBEXEC_LIB) LIBEXEC_INC=${LIBEXEC}/include AC_SUBST(LIBEXEC_INC) XENFIRMWAREDIR=${LIBEXEC}/boot AC_SUBST(XENFIRMWAREDIR) +AC_DEFINE_UNQUOTED([XENFIRMWAREDIR], ["$XENFIRMWAREDIR"], [Xen's firmware dir]) XEN_RUN_DIR=$rundir_path/xen AC_SUBST(XEN_RUN_DIR) +AC_DEFINE_UNQUOTED([XEN_RUN_DIR], ["$XEN_RUN_DIR"], [Xen's runstate path]) XEN_LOG_DIR=$localstatedir/log/xen AC_SUBST(XEN_LOG_DIR) +AC_DEFINE_UNQUOTED([XEN_LOG_DIR], ["$XEN_LOG_DIR"], [Xen's log dir]) XEN_LIB_STORED=$localstatedir/lib/xenstored AC_SUBST(XEN_LIB_STORED) @@ -138,6 +144,7 @@ AC_SUBST(XEN_RUN_STORED) XEN_LIB_DIR=$localstatedir/lib/xen AC_SUBST(XEN_LIB_DIR) +AC_DEFINE_UNQUOTED([XEN_LIB_DIR], ["$XEN_LIB_DIR"], [Xen's lib dir]) SHAREDIR=$prefix/share AC_SUBST(SHAREDIR) @@ -151,12 +158,14 @@ case "$host_os" in *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR) +AC_DEFINE_UNQUOTED([XEN_LOCK_DIR], ["$XEN_LOCK_DIR"], [Xen's lock dir]) XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging AC_SUBST(XEN_PAGING_DIR) XEN_DUMP_DIR=$xen_dumpdir_path AC_SUBST(XEN_DUMP_DIR) +AC_DEFINE_UNQUOTED([XEN_DUMP_DIR], ["$XEN_DUMP_DIR"], [Xen's dump directory]) DEBUG_DIR=$debugdir_path AC_SUBST(DEBUG_DIR) diff --git a/tools/config.h.in b/tools/config.h.in index 52e01b2c84..9563d3acb6 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -96,6 +96,9 @@ /* IPXE path */ #undef IPXE_PATH +/* Xen's libexec path */ +#undef LIBEXEC_BIN + /* OVMF path */ #undef OVMF_PATH @@ -129,6 +132,30 @@ /* QMP proxy path */ #undef STUBDOM_QMP_PROXY_PATH +/* Xen's firmware dir */ +#undef XENFIRMWAREDIR + +/* Xen's config dir */ +#undef XEN_CONFIG_DIR + +/* Xen's dump directory */ +#undef XEN_DUMP_DIR + +/* Xen's lib dir */ +#undef XEN_LIB_DIR + +/* Xen's lock dir */ +#undef XEN_LOCK_DIR + +/* Xen's log dir */ +#undef XEN_LOG_DIR + +/* Xen's runstate path */ +#undef XEN_RUN_DIR + +/* Xen's script dir */ +#undef XEN_SCRIPT_DIR + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 8e4a59c2cb..829753b5dd 100755 --- a/tools/configure +++ b/tools/configure @@ -3926,6 +3926,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -3978,6 +3983,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -4018,6 +4028,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -4025,12 +4040,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -4040,6 +4070,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -4053,12 +4088,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/tools/console/Makefile b/tools/console/Makefile index 3f4cddab03..207c04c9cd 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -22,27 +22,19 @@ all: $(BIN) clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM) $(RM) client/*.o daemon/*.o - $(RM) client/_paths.h - $(RM) daemon/_paths.h .PHONY: distclean distclean: clean -daemon/main.o: daemon/_paths.h +daemon/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) -client/main.o: client/_paths.h +client/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) -genpath-target = $(call buildmakevars2header,client/_paths.h) -$(eval $(genpath-target)) - -genpath-target = $(call buildmakevars2header,daemon/_paths.h) -$(eval $(genpath-target)) - .PHONY: install install: $(BIN) $(INSTALL_DIR) $(DESTDIR)/$(sbindir) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 80157be421..ada6728caa 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -41,7 +41,6 @@ #include #include "xenctrl.h" -#include "_paths.h" #define ESCAPE_CHARACTER 0x1d diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 30124a1c19..aac7233a48 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -31,7 +31,6 @@ #include "utils.h" #include "io.h" -#include "_paths.h" int log_reload = 0; int log_guest = 0; diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 1bcc97ea8a..7f6c422440 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -24,6 +24,7 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenlight) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h .PHONY: all all: $(PROGS) @@ -31,8 +32,6 @@ all: $(PROGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) -$(INIT_XENSTORE_DOMAIN_OBJS): _paths.h - init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) @@ -47,9 +46,6 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o $(PROGS) $(DEPS_RM) _paths.h + $(RM) -f *.o $(PROGS) $(DEPS_RM) distclean: clean - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 9457d0251b..b4f3c65a8a 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -16,7 +16,6 @@ #include #include "init-dom-json.h" -#include "_paths.h" #define LAPIC_BASE_ADDRESS 0xfee00000UL #define MB(x) ((uint64_t)x << 20) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index c6d882e239..8f5f3acd21 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -106,11 +106,6 @@ include $(XEN_ROOT)/tools/libs/libs.mk libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) .PHONY: cleanlocal diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 2e4c1330ea..c17cf9f712 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -33,7 +33,6 @@ #define XG_NEED_UNALIGNED #include "xg_private.h" -#include "_paths.h" /* ------------------------------------------------------------------------ */ /* debugging */ diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 128353029c..0ce6364963 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,7 +19,6 @@ #include #include "xc_private.h" -#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index b21e0bf083..2fdec06c69 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -135,7 +135,6 @@ clean: rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) - rm -f _paths.h .PHONY: distclean distclean: clean diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index bfd58226ce..fb5a9ca87e 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -153,7 +153,7 @@ LIBXL_TEST_OBJS += $(foreach t, $(LIBXL_TESTS_INSIDE),libxl_test_$t.opic) TEST_PROG_OBJS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t.o) test_common.o TEST_PROGS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t) -AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _paths.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h +AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h AUTOSRCS = _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c CLIENTS = testidl libxl-save-helper @@ -191,9 +191,6 @@ build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ touch $@ @@ -216,9 +213,8 @@ _libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ $(XEN_INCLUDE)/libxl.h: $(XEN_INCLUDE)/_libxl_types.h $(XEN_INCLUDE)/_libxl_list.h $(XEN_INCLUDE)/libxl_json.h: $(XEN_INCLUDE)/_libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h _paths.h +libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h libxl_internal_json.h: _libxl_types_internal_json.h -xl.h: _paths.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): $(XEN_INCLUDE)/libxl.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index 03841243ab..2abaab439c 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -24,8 +24,6 @@ #include #include -#include "_paths.h" - //#define DEBUG 1 libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 0b4671318c..37d5c27756 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -73,7 +73,6 @@ #endif #include "libxl.h" -#include "_paths.h" #include "_libxl_save_msgs_callout.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) diff --git a/tools/libs/light/libxl_utils.c b/tools/libs/light/libxl_utils.c index 4699c4a0a3..b91c2cafa2 100644 --- a/tools/libs/light/libxl_utils.c +++ b/tools/libs/light/libxl_utils.c @@ -18,7 +18,6 @@ #include #include "libxl_internal.h" -#include "_paths.h" #ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 911a2de8ec..01417b5334 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -30,8 +30,6 @@ APPEND_LDFLAGS += $(LDLIBS-y) include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): _paths.h - PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py PYSRC=bindings/swig/python/_xenstat.c @@ -121,10 +119,7 @@ clean: cleanlocal .PHONY: cleanlocal cleanlocal: - rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) _paths.h + rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) rm -f libxenstat.map -include $(DEPS_INCLUDE) - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/libs/stat/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c index 2205a04131..9909b9727e 100644 --- a/tools/libs/stat/xenstat_qmp.c +++ b/tools/libs/stat/xenstat_qmp.c @@ -23,7 +23,6 @@ #include #include "xenstat_priv.h" -#include "_paths.h" #ifdef HAVE_YAJL_YAJL_VERSION_H # include diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 2e129f00e1..b7f439121a 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -29,11 +29,6 @@ $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(XL_OBJS): _paths.h - .PHONY: all all: xl @@ -54,7 +49,7 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o xl _paths.h $(DEPS_RM) + $(RM) *.o xl $(DEPS_RM) distclean: clean diff --git a/tools/xl/xl.h b/tools/xl/xl.h index cf12c79a9b..c5c4bedbdd 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -17,7 +17,6 @@ #include -#include "_paths.h" #include struct cmd_spec { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:34:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:34:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249095.429547 (Exim 4.92) (envelope-from ) id 1myZr8-0000DD-Mx; Sat, 18 Dec 2021 13:34:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249095.429547; Sat, 18 Dec 2021 13:34:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZr8-0000D5-Jq; Sat, 18 Dec 2021 13:34:34 +0000 Received: by outflank-mailman (input) for mailman id 249095; Sat, 18 Dec 2021 13:34:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZr7-0000Cs-Ph for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZr7-0007DG-P5 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZr7-0008F7-OD for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=snYPb5+OjwZnWqGfdzE0VSXhsWgWdWqYpG5PCtCx2tc=; b=inUv/sQbAzJyMdP8XlUsEA5tnH ma/HX1qbHQMJBlYkiFNHGpwGLY8Cc7lxizyE8EonRVUDIq54ovC7Y7v1tPCMmRe4vpvDO5TWC1bxh tTBv0B7IHAw8+NYYFbLm21qNlvG6/pg8gQYj0aXoyG64rmoB7d1/IUQtGZOwOZkEPWxA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/Rules.mk: introduce FORCE target Message-Id: Date: Sat, 18 Dec 2021 13:34:33 +0000 commit aff380118b413d45b40680af8fa8980ecd4d69c0 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:03 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/Rules.mk: introduce FORCE target And replace the one defined in libs.mk. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/Rules.mk | 3 +++ tools/libs/libs.mk | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 4e9b4ee17f..0d3febfbb6 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -210,3 +210,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ } > $@ + +.PHONY: FORCE +FORCE: diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 2fdec06c69..36ffe01402 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -138,6 +138,3 @@ clean: .PHONY: distclean distclean: clean - -.PHONY: FORCE -FORCE: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:34:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:34:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249096.429553 (Exim 4.92) (envelope-from ) id 1myZrI-0000HH-Qr; Sat, 18 Dec 2021 13:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249096.429553; Sat, 18 Dec 2021 13:34:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrI-0000H9-Mj; Sat, 18 Dec 2021 13:34:44 +0000 Received: by outflank-mailman (input) for mailman id 249096; Sat, 18 Dec 2021 13:34:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrH-0000H0-T1 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrH-0007DQ-SI for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZrH-0008G5-RV for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=216fpiHr8C5zEgWytRf/12yVhKu5mJ917P9F2bx1Mjo=; b=EfQ6lXNM4PxjxR/nH+r/PYhLIZ wEgtXj+M6UYo0W8aYRRvi3rulZ2OUHAYhDMZkiNHSq6E3nX685tfYSRgPWuXFRx6DYs6/PCIXw7du q2joYJ0zibxM3oTJXvAaZ2wYEHIvehoi/hbqMzuEVpjbwomAyC1YJyRkL8cH2UyLEXpg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/include/xen-foreign: avoid to rely on default .SUFFIXES Message-Id: Date: Sat, 18 Dec 2021 13:34:43 +0000 commit dca4416a78435c0e63c726c0b683e48f909cde88 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:04 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/include/xen-foreign: avoid to rely on default .SUFFIXES When a rule isn't a pattern rule, and thus don't have a %, the value of the automatic variable stem $* depends on .SUFFIXES. GNU make manual explain that it is better to avoid this "bizarre" behavior which exist for compatibility. Use $(basename ) instead. So we can one day avoid make's build-in rules and variables. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/include/xen-foreign/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index e395011fdd..6ce51daf5e 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -25,28 +25,28 @@ check-headers: checker rm tmp.size arm32.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) arm64.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:34:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:34:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249097.429555 (Exim 4.92) (envelope-from ) id 1myZrS-0000KE-RM; Sat, 18 Dec 2021 13:34:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249097.429555; Sat, 18 Dec 2021 13:34:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrS-0000K6-OI; Sat, 18 Dec 2021 13:34:54 +0000 Received: by outflank-mailman (input) for mailman id 249097; Sat, 18 Dec 2021 13:34:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrR-0000Jy-WE for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrR-0007Da-VU for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZrR-0008HB-Ub for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:34:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZnMHt3IQMSvCV0/b4ePspWrrWYnG2/RjKDyQ1kxw1ts=; b=th4foQxOslG7tQSCscXhXvboyd 0X91NL016Svb0DFWwMLDVDhAms9XXwC/6w5uSmPvMHpZf6RPtDI9vQJYMy0K1XsYmHxScXHyxeEp2 7UwSiGMyR6qiihdknZjPOalfT/jCPKG8E3u9oulNtpyd995GROlaYTWvrHspLHqg1nQ0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/debugger: Allow make to recurse into debugger/ Message-Id: Date: Sat, 18 Dec 2021 13:34:53 +0000 commit 2400a9a365c5619dbf557afccdd45d2a2e4e3ade Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:06 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:12 2021 +0000 tools/debugger: Allow make to recurse into debugger/ Avoid the need for explicite rules to recurse into debugger/* dirs by adding a Makefile in debugger/. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/Makefile | 27 +-------------------------- tools/debugger/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 8936b754c8..79b4c7e3de 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,8 +32,7 @@ SUBDIRS-$(CONFIG_GOLANG) += golang SUBDIRS-y += xl SUBDIRS-y += helpers SUBDIRS-$(CONFIG_X86) += xenpaging -SUBDIRS-$(CONFIG_X86) += debugger/gdbsx -SUBDIRS-$(CONFIG_X86) += debugger/kdd +SUBDIRS-$(CONFIG_X86) += debugger SUBDIRS-$(CONFIG_TESTS) += tests SUBDIRS-y += python @@ -272,30 +271,6 @@ subdir-clean-qemu-xen-dir: subdir-uninstall-qemu-xen-dir: ; -subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx clean - -subdir-install-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx install - -subdir-all-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx all - -subdir-uninstall-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx uninstall - -subdir-clean-debugger/kdd subdir-distclean-debugger/kdd: .phony - $(MAKE) -C debugger/kdd clean - -subdir-install-debugger/kdd: .phony - $(MAKE) -C debugger/kdd install - -subdir-uninstall-debugger/kdd: .phony - $(MAKE) -C debugger/kdd uninstall - -subdir-all-debugger/kdd: .phony - $(MAKE) -C debugger/kdd all - subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update diff --git a/tools/debugger/Makefile b/tools/debugger/Makefile new file mode 100644 index 0000000000..51efd3680b --- /dev/null +++ b/tools/debugger/Makefile @@ -0,0 +1,8 @@ +XEN_ROOT=$(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +SUBDIRS-y := gdbsx +SUBDIRS-y += kdd + +.PHONY: all clean install distclean uninstall +all clean install distclean uninstall: %: subdirs-% -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:35:05 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:35:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249101.429570 (Exim 4.92) (envelope-from ) id 1myZrd-0000ds-5o; Sat, 18 Dec 2021 13:35:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249101.429570; Sat, 18 Dec 2021 13:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrd-0000dk-2o; Sat, 18 Dec 2021 13:35:05 +0000 Received: by outflank-mailman (input) for mailman id 249101; Sat, 18 Dec 2021 13:35:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrc-0000dI-2t for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrc-0007Dw-2E for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZrc-0008IV-1M for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JLxtldvEhJ7VBAvcppIEt9ThC3j/uRmHasTHJ27QZCE=; b=gOpmmpkHMvH22PkLJqjVFosH0q 3SefeP9rf+e3H4jjG+xvJHXYJ3rZfqS6BcCMPqDL8GpjxxlIBt3uIep+fWSGYYI4Z+V1tByA9HLOq i6oDgY9ewfOMDJWLFggs7d/J017wTAQE1amd7+5UllJTtGzhiWVAOZ37KXkCayWOKWgk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/misc: rework Makefile Message-Id: Date: Sat, 18 Dec 2021 13:35:04 +0000 commit 41da0c21eea3ac5cb67d5b0ed4f52fbadab51f19 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:15 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/misc: rework Makefile Add missing "xen-detect" rule. It only works without it because we still have make's built-ins rules and variables, but fix this to not have to rely on them. Rename $(TARGETS_BUILD) to $(TARGETS). Remove the unused "build" target. Also, they are no more "build-only" targets, remove the extra code. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/misc/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 8b9558b93f..0e02401227 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -50,16 +50,13 @@ TARGETS_COPY += xencov_split TARGETS_COPY += xenpvnetboot # Everything which needs to be built -TARGETS_BUILD := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) +TARGETS := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) -# ... including build-only targets -TARGETS_BUILD += $(TARGETS_BUILD-y) - -.PHONY: all build -all build: $(TARGETS_BUILD) +.PHONY: all +all: $(TARGETS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -75,7 +72,7 @@ uninstall: .PHONY: clean clean: - $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean @@ -86,6 +83,9 @@ xen-access: xen-access.o xen-cpuid: xen-cpuid.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) +xen-detect: xen-detect.o + $(CC) $(LDFLAGS) -o $@ $< $(APPEND_LDFLAGS) + xen-hvmctx: xen-hvmctx.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:35:15 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:35:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249102.429574 (Exim 4.92) (envelope-from ) id 1myZrn-0000jt-7u; Sat, 18 Dec 2021 13:35:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249102.429574; Sat, 18 Dec 2021 13:35:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrn-0000jl-4N; Sat, 18 Dec 2021 13:35:15 +0000 Received: by outflank-mailman (input) for mailman id 249102; Sat, 18 Dec 2021 13:35:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrm-0000jE-6B for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrm-0007E9-5U for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZrm-0008Ja-4a for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FJI1mrwYEKDN/F+Fj+LtslQ06BWxjdvXzKFGaA3+hGM=; b=W8Nc/WjlNe0WWxyDrnxf6C/uB8 K8pE1Q6z7ZMYUN+Z5ypEHVkWFznCIE2U3oPpNdeNZgu86S7u/1sVGg7elfqV0Gy3jVHS6hvxgP/GC htHnxBrdV6fRlVv6gq5bBnGvMPy9fCDE+OfCHF58ovSaxcK61EBM/QuF2JQ09CA3LqCM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/vchan: Collect targets in TARGETS Message-Id: Date: Sat, 18 Dec 2021 13:35:14 +0000 commit e10ef07578465cb37f43ce42e3c3cbac6f80ac3c Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:16 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/vchan: Collect targets in TARGETS And use the new TARGETS to clean them. Now "clean" will remove "vchan-socket-proxy". $(RM) already have the "-f" flags, so remove the second one. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/vchan/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/vchan/Makefile b/tools/vchan/Makefile index a731e0e073..c886c22e12 100644 --- a/tools/vchan/Makefile +++ b/tools/vchan/Makefile @@ -11,8 +11,10 @@ NODE2_OBJS = node-select.o $(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxenvchan) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) vchan-socket-proxy.o: CFLAGS += $(CFLAGS_libxenvchan) $(CFLAGS_libxenstore) $(CFLAGS_libxenctrl) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) +TARGETS := vchan-node1 vchan-node2 vchan-socket-proxy + .PHONY: all -all: vchan-node1 vchan-node2 vchan-socket-proxy +all: $(TARGETS) vchan-node1: $(NODE_OBJS) $(CC) $(LDFLAGS) -o $@ $(NODE_OBJS) $(LDLIBS_libxenvchan) $(APPEND_LDFLAGS) @@ -30,7 +32,7 @@ install: all .PHONY: clean clean: - $(RM) -f *.o vchan-node1 vchan-node2 $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:35:25 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:35:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249106.429578 (Exim 4.92) (envelope-from ) id 1myZrx-0000vd-9K; Sat, 18 Dec 2021 13:35:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249106.429578; Sat, 18 Dec 2021 13:35:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrx-0000vV-6F; Sat, 18 Dec 2021 13:35:25 +0000 Received: by outflank-mailman (input) for mailman id 249106; Sat, 18 Dec 2021 13:35:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrw-0000u4-9I for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZrw-0007EW-8h for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZrw-0008LR-7p for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yzC35TNQKFWumSYr3XvuVx0efR4dDWOUPdNWebS1oQM=; b=4tiQOUCYqlRxp5aLm/hYdl+Tji RbrZsKRdLZfzKKPU8KKDqfQXjSVubTY2m837As6tRwnLYEuJpuZD/VVEf+XwXzD5bNpt7wB3K9yiy 62WiLdrnQTrlCHhpzV/ERjFH8TwzpMX/rA+1uxurweKv3LdjjJM5bHpicI/v/dXim2fo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xcutils: rework Makefile Message-Id: Date: Sat, 18 Dec 2021 13:35:24 +0000 commit 0ac694803c0327ab31eda0c26a646c6227f2a394 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:17 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/xcutils: rework Makefile Use TARGETS to collect targets to build Remove "build" target. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper [Clean up $(RM)] Signed-off-by: Andrew Cooper --- tools/xcutils/Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 82d42624c8..e40a2c4bfa 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,7 +11,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -PROGRAMS = readnotes lsevtchn +TARGETS := readnotes lsevtchn CFLAGS += -Werror @@ -19,10 +19,7 @@ CFLAGS_readnotes.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libx CFLAGS_lsevtchn.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) .PHONY: all -all: build - -.PHONY: build -build: $(PROGRAMS) +all: $(TARGETS) readnotes: readnotes.o $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) @@ -31,18 +28,17 @@ lsevtchn: lsevtchn.o $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXECDIR)/, $(PROGRAMS)) + $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/, $(TARGETS)) .PHONY: clean clean: - $(RM) *.o $(PROGRAMS) - $(RM) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:35:35 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:35:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249107.429582 (Exim 4.92) (envelope-from ) id 1myZs7-0000zE-Aq; Sat, 18 Dec 2021 13:35:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249107.429582; Sat, 18 Dec 2021 13:35:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZs7-0000z6-7p; Sat, 18 Dec 2021 13:35:35 +0000 Received: by outflank-mailman (input) for mailman id 249107; Sat, 18 Dec 2021 13:35:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZs6-0000yv-CR for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZs6-0007Eg-Bk for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZs6-0008Mv-B0 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TjwOf9hYcmts8MCffysEdfODL0FGgoJju+5PmYOGADY=; b=bNroZrDSr+h8+FJLZF7JMTtm3w XswnhmIKM+ukSZYyBTt7XlgIqrkhDZIGOHkbDmyxJucNc4ksS/rSpa6hac+Ff2iCcoZTFclrf/Skb rjoW5y9eYRrB8UR6GHThEFpYpO+Aor5XchqvCVpZNx5xSh6HYwQh26O0O5irDmMLp4CE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs: Remove both "libs" and "build" target Message-Id: Date: Sat, 18 Dec 2021 13:35:34 +0000 commit 61760209029352e365ad0deeb701eebe6de74776 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:22 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 libs: Remove both "libs" and "build" target "libs" is odd and has been introduced without a reason by c7d3afbb44. Instead, only use "all". Also remove "build" target as "all" is more appropriate and nothing is using "build" in libs/ in the xen.git repo. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 12 +++--------- tools/libs/light/Makefile | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 36ffe01402..847eb4851f 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -56,13 +56,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) .PHONY: all -all: build - -.PHONY: build -build: libs libxen$(LIBNAME).map $(LIBHEADERS) - -.PHONY: libs -libs: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) +all: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIBHEADERS) ifneq ($(NO_HEADERS_CHK),y) headers.chk: @@ -99,14 +93,14 @@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) ifneq ($(nosharedlibs),y) -libs: $(PKG_ABI) +all: $(PKG_ABI) $(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst $(ABI_DUMPER) $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR) endif endif .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index fb5a9ca87e..be32d95d39 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -187,7 +187,7 @@ testidl.c: libxl_types.idl gentest.py $(XEN_INCLUDE)/libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new mv testidl.c.new testidl.c -build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) +all: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:35:45 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:35:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249109.429586 (Exim 4.92) (envelope-from ) id 1myZsH-00014j-CO; Sat, 18 Dec 2021 13:35:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249109.429586; Sat, 18 Dec 2021 13:35:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsH-00014b-9P; Sat, 18 Dec 2021 13:35:45 +0000 Received: by outflank-mailman (input) for mailman id 249109; Sat, 18 Dec 2021 13:35:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsG-00014M-Fh for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsG-0007Eq-F4 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZsG-0008Nz-EA for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gQvzc/rDrO49GfLv5P/D95FsmX14d6KMxmK2LGmXtIE=; b=zywn/+giKkuQKtoiFvS7phlAvO X9dWjEYCJy+UBacIv+9WHodQ48d7d5oWSUue9NbPZbBLdKp0bOaUbge/XSu0mN34Buv+lwThZ6wtJ KXdmItSvkxulrE6z754Gukkli+p+6uKQLmX0+BSIX6+hHvKL3fnXD5/jh+L7JrZtIWZk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libs/toolcore: don't install xentoolcore_internal.h anymore Message-Id: Date: Sat, 18 Dec 2021 13:35:44 +0000 commit e2ddc82be487bbd9b2de362bcfbafd366d86717d Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:32 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 libs/toolcore: don't install xentoolcore_internal.h anymore With "xentoolcore_internal.h" been in LIBHEADER, it was installed. But its dependency "_xentoolcore_list.h" wasn't installed so the header couldn't be used anyway. This patch also mean that the rule "headers.chk" doesn't check it anymore as well. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/toolcore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 3550786491..ed4ae00694 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -5,7 +5,7 @@ MAJOR = 1 MINOR = 0 AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h -LIBHEADER := xentoolcore.h xentoolcore_internal.h +LIBHEADER := xentoolcore.h SRCS-y += handlereg.c -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:35:55 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:35:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249110.429590 (Exim 4.92) (envelope-from ) id 1myZsR-00017v-EW; Sat, 18 Dec 2021 13:35:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249110.429590; Sat, 18 Dec 2021 13:35:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsR-00017n-BC; Sat, 18 Dec 2021 13:35:55 +0000 Received: by outflank-mailman (input) for mailman id 249110; Sat, 18 Dec 2021 13:35:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsQ-00017f-Is for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsQ-0007Ex-IF for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZsQ-0008P2-HR for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:35:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6/uyCiSOLeNxkvlxtzLu9cWLGjMFevKtCLKgpIY8ye0=; b=A7l6bcOvCn8PQatcUQSdrkPcIt UpNJGBnmDvlLdvc+9W5/KlQS6bzH+wXGU5+dKIqoiW3rdxR9O1Dpu3O6C6+0WaeiR120CcMqGpVO2 LAgbt0QTywzbt6uvl7qCTDe2T3pJTBER6WDvRGri5xfp9jQvR8eRQE22DiQaB/HwmiOs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/Rules.mk: Cleanup %.pc rules Message-Id: Date: Sat, 18 Dec 2021 13:35:54 +0000 commit fc93c3ac4f888d506f4b15ad05b900c46416ace0 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:33 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 tools/Rules.mk: Cleanup %.pc rules PKG_CONFIG_VARS isn't set anymore, so is dead logic. For "local" pkg-config file, we only have one headers directory now, "tools/include", so there is no need to specify it twice. So remove $(CFLAGS_xeninclude) from "Cflags:". Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/Rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 0d3febfbb6..47424935ba 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -184,12 +184,11 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "prefix=$(PKG_CONFIG_PREFIX)"; \ echo "includedir=$(PKG_CONFIG_INCDIR)"; \ echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ - $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ echo ""; \ echo "Name: $(PKG_CONFIG_NAME)"; \ echo "Description: $(PKG_CONFIG_DESC)"; \ echo "Version: $(PKG_CONFIG_VERSION)"; \ - echo "Cflags: -I\$${includedir} $(CFLAGS_xeninclude)"; \ + echo "Cflags: -I\$${includedir}"; \ echo "Libs: -L\$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)"; \ echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ @@ -200,7 +199,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "prefix=$(PKG_CONFIG_PREFIX)"; \ echo "includedir=$(PKG_CONFIG_INCDIR)"; \ echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ - $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ echo ""; \ echo "Name: $(PKG_CONFIG_NAME)"; \ echo "Description: $(PKG_CONFIG_DESC)"; \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:36:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:36:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249111.429594 (Exim 4.92) (envelope-from ) id 1myZsc-0001BR-IB; Sat, 18 Dec 2021 13:36:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249111.429594; Sat, 18 Dec 2021 13:36:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsc-0001BJ-Es; Sat, 18 Dec 2021 13:36:06 +0000 Received: by outflank-mailman (input) for mailman id 249111; Sat, 18 Dec 2021 13:36:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsa-0001B2-Ls for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsa-0007FG-LF for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZsa-0008Rj-KU for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=an5ypbU4xJF19S3nkF3Kk/BUbmo4SaxzwfROpxQE3VQ=; b=pS5e3PkRbJnoHvqswnNAfxAiwV Fk0IvKqH9G1d4yvqw4GP8pAO998FUlQjmauk3HSwJRkDYQiDbpNPc/GzPBtyKlY+Wn7mGJefe6o5W fVZgA+qCiMY/E/ojasaZ9QQ6cgt2CYohgM+BwRunykT8/jK6fWPjGqmezRXgm2Y1VEjc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] stubdom: only build libxen*.a from tools/libs/ Message-Id: Date: Sat, 18 Dec 2021 13:36:04 +0000 commit b1e37d8402522e812e82d8776e39fcfceaccf628 Author: Anthony PERARD AuthorDate: Mon Dec 6 17:02:35 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 stubdom: only build libxen*.a from tools/libs/ Avoid generating *.map files or running headers.chk when all we need is the libxen*.a. Also, allow force make to check again if libxen*.a needs rebuilt by adding a '.PHONY' prerequisite. Also, remove DESTDIR= as we don't do installation in this target, so the value of DESTDIR doesn't matter. Signed-off-by: Anthony PERARD Reviewed-by: Samuel Thibault --- stubdom/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index ccfcf5b75f..5fb5dbc341 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -354,8 +354,8 @@ define BUILD_lib .PHONY: libxen$(1) clean-libxen$(1) libxen$(1): libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: $$(LIBDEPS_$(1)) $$(LIBDEP_$(1)) - libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) - CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libs-$$(XEN_TARGET_ARCH)/$(1) + libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) .phony + CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y -C $$(@D) $$(@F) clean-libxen$(1): [ ! -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ] || $$(MAKE) DESTDIR= -C libs-$$(XEN_TARGET_ARCH)/$(1) clean -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:36:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:36:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249112.429598 (Exim 4.92) (envelope-from ) id 1myZsm-0001EI-Jd; Sat, 18 Dec 2021 13:36:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249112.429598; Sat, 18 Dec 2021 13:36:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsm-0001EA-GW; Sat, 18 Dec 2021 13:36:16 +0000 Received: by outflank-mailman (input) for mailman id 249112; Sat, 18 Dec 2021 13:36:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsk-0001Dt-PK for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsk-0007FK-Oh for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZsk-0008Su-Nu for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ukDHKgDl/wZBegi6GwHlOW9mYvGp27oad6lECdsPLGI=; b=KAyw1jd/AsN1bTg7IfDzhheyDC 2UPxqVngAPqEc6E0iTHDdqwwyg6tps4GlefDfgAmvsUSusmvlnTyknSahlM1OfT/9B3oWk/5hTAlZ inBv1q+dIChz4gjBaUbxJNUPMjlLDvM9Gc8nRN8Q1gK1HUTHywpJyP7p7Bxc4ETQT9lY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: Split dom0 handling out of init_domain_cpuid_policy() Message-Id: Date: Sat, 18 Dec 2021 13:36:14 +0000 commit c17072fc164a72583fda8e2b836c71d2e3f8e84d Author: Andrew Cooper AuthorDate: Wed Dec 15 15:36:59 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Split dom0 handling out of init_domain_cpuid_policy() To implement dom0-cpuid= support, the special cases would need extending. However there is already a problem with late hwdom where the special cases override toolstack settings, which is unintended and poor behaviour. Introduce a new init_dom0_cpuid_policy() for the purpose, moving the ITSC and ARCH_CAPS logic. The is_hardware_domain() can be dropped, and for now there is no need to rerun recalculate_cpuid_policy(); this is a relatively expensive operation, and will become more-so over time. Rearrange the logic in create_dom0() to make room for a call to init_dom0_cpuid_policy(). The AMX plans for having variable sized XSAVE states require that modifications to the policy happen before vCPUs are created. Additionally, factor out domid into a variable so we can be slightly more correct in the case of a failure, and also print the error from domain_create(). This will at least help distinguish -EINVAL from -ENOMEM. No practical change in behaviour. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpuid.c | 25 +++++++++++++++---------- xen/arch/x86/include/asm/cpuid.h | 3 +++ xen/arch/x86/setup.c | 15 +++++++++++---- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 151944f657..f63f5efc17 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -727,23 +727,28 @@ int init_domain_cpuid_policy(struct domain *d) if ( !p ) return -ENOMEM; - /* The hardware domain can't migrate. Give it ITSC if available. */ - if ( is_hardware_domain(d) ) - p->extd.itsc = cpu_has_itsc; + d->arch.cpuid = p; + + recalculate_cpuid_policy(d); + + return 0; +} + +void __init init_dom0_cpuid_policy(struct domain *d) +{ + struct cpuid_policy *p = d->arch.cpuid; + + /* dom0 can't migrate. Give it ITSC if available. */ + if ( cpu_has_itsc ) + p->extd.itsc = true; /* * Expose the "hardware speculation behaviour" bits of ARCH_CAPS to dom0, * so dom0 can turn off workarounds as appropriate. Temporary, until the * domain policy logic gains a better understanding of MSRs. */ - if ( is_hardware_domain(d) && cpu_has_arch_caps ) + if ( cpu_has_arch_caps ) p->feat.arch_caps = true; - - d->arch.cpuid = p; - - recalculate_cpuid_policy(d); - - return 0; } void guest_cpuid(const struct vcpu *v, uint32_t leaf, diff --git a/xen/arch/x86/include/asm/cpuid.h b/xen/arch/x86/include/asm/cpuid.h index 46904061d0..9c3637549a 100644 --- a/xen/arch/x86/include/asm/cpuid.h +++ b/xen/arch/x86/include/asm/cpuid.h @@ -59,6 +59,9 @@ bool recheck_cpu_features(unsigned int cpu); /* Allocate and initialise a CPUID policy suitable for the domain. */ int init_domain_cpuid_policy(struct domain *d); +/* Apply dom0-specific tweaks to the CPUID policy. */ +void init_dom0_cpuid_policy(struct domain *d); + /* Clamp the CPUID policy to reality. */ void recalculate_cpuid_policy(struct domain *d); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f40a9fe5d3..e716005145 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -772,6 +772,7 @@ static struct domain *__init create_dom0(const module_t *image, }; struct domain *d; char *cmdline; + domid_t domid; if ( opt_dom0_pvh ) { @@ -786,10 +787,16 @@ static struct domain *__init create_dom0(const module_t *image, if ( iommu_enabled ) dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; - /* Create initial domain 0. */ - d = domain_create(get_initial_domain_id(), &dom0_cfg, !pv_shim); - if ( IS_ERR(d) || (alloc_dom0_vcpu0(d) == NULL) ) - panic("Error creating domain 0\n"); + /* Create initial domain. Not d0 for pvshim. */ + domid = get_initial_domain_id(); + d = domain_create(domid, &dom0_cfg, !pv_shim); + if ( IS_ERR(d) ) + panic("Error creating d%u: %ld\n", domid, PTR_ERR(d)); + + init_dom0_cpuid_policy(d); + + if ( alloc_dom0_vcpu0(d) == NULL ) + panic("Error creating d%uv0\n", domid); /* Grab the DOM0 command line. */ cmdline = image->string ? __va(image->string) : NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:36:26 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:36:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249113.429603 (Exim 4.92) (envelope-from ) id 1myZsw-0001HX-LP; Sat, 18 Dec 2021 13:36:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249113.429603; Sat, 18 Dec 2021 13:36:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsw-0001HN-IE; Sat, 18 Dec 2021 13:36:26 +0000 Received: by outflank-mailman (input) for mailman id 249113; Sat, 18 Dec 2021 13:36:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsu-0001Gu-S8 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZsu-0007Ff-RY for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZsu-0008UD-Qr for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qdVWQ83ML+0XQSWB2Gh4O7+eJnK54ggMhJJFuZNAQ9g=; b=wgZW4ga5ZzMD21XyuF9I72ZLbp NlZhY5gV6nJZgjvv2MsmA1T7JbYs9gcaTMexAsDK2g8VkQZ0kV8UOjdRYHVkOQ45PRF/ok4dAsrHw +pqi+NJbtuZz8WwmaAr/CZnnBw/Ke5uUE7JN0Th3sdNN3fl2+FLjvECZK3chv1trhtZs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: Factor common parsing out of parse_xen_cpuid() Message-Id: Date: Sat, 18 Dec 2021 13:36:24 +0000 commit 94c3df9188d6deed6fe213754492b11b9d409262 Author: Andrew Cooper AuthorDate: Wed Dec 15 16:30:25 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Factor common parsing out of parse_xen_cpuid() dom0-cpuid= is going to want to reuse the common parsing loop, so factor it out into parse_cpuid(). Irritatingly, despite being static const, the features[] array gets duplicated each time parse_cpuid() is inlined. As it is a large (and ever growing with new CPU features) datastructure, move it to being file scope so all inlines use the same single object. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpuid.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index f63f5efc17..e11f5a3c9a 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -26,17 +26,26 @@ static const uint32_t __initconst hvm_hap_def_featuremask[] = INIT_HVM_HAP_DEF_FEATURES; static const uint32_t deep_features[] = INIT_DEEP_FEATURES; -static int __init parse_xen_cpuid(const char *s) +static const struct feature_name { + const char *name; + unsigned int bit; +} feature_names[] __initconstrel = INIT_FEATURE_NAMES; + +/* + * Parse a list of cpuid feature names -> bool, calling the callback for any + * matches found. + * + * always_inline, because this is init code only and we really don't want a + * function pointer call in the middle of the loop. + */ +static int __init always_inline parse_cpuid( + const char *s, void (*callback)(unsigned int feat, bool val)) { const char *ss; int val, rc = 0; do { - static const struct feature { - const char *name; - unsigned int bit; - } features[] __initconstrel = INIT_FEATURE_NAMES; - const struct feature *lhs, *rhs, *mid = NULL /* GCC... */; + const struct feature_name *lhs, *rhs, *mid = NULL /* GCC... */; const char *feat; ss = strchr(s, ','); @@ -49,8 +58,8 @@ static int __init parse_xen_cpuid(const char *s) feat += 3; /* (Re)initalise lhs and rhs for binary search. */ - lhs = features; - rhs = features + ARRAY_SIZE(features); + lhs = feature_names; + rhs = feature_names + ARRAY_SIZE(feature_names); while ( lhs < rhs ) { @@ -72,11 +81,7 @@ static int __init parse_xen_cpuid(const char *s) if ( (val = parse_boolean(mid->name, s, ss)) >= 0 ) { - if ( !val ) - setup_clear_cpu_cap(mid->bit); - else if ( mid->bit == X86_FEATURE_RDRAND && - (cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_RDRAND)) ) - setup_force_cpu_cap(X86_FEATURE_RDRAND); + callback(mid->bit, val); mid = NULL; } @@ -95,6 +100,20 @@ static int __init parse_xen_cpuid(const char *s) return rc; } + +static void __init _parse_xen_cpuid(unsigned int feat, bool val) +{ + if ( !val ) + setup_clear_cpu_cap(feat); + else if ( feat == X86_FEATURE_RDRAND && + (cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_RDRAND)) ) + setup_force_cpu_cap(X86_FEATURE_RDRAND); +} + +static int __init parse_xen_cpuid(const char *s) +{ + return parse_cpuid(s, _parse_xen_cpuid); +} custom_param("cpuid", parse_xen_cpuid); #define EMPTY_LEAF ((struct cpuid_leaf){}) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:36:36 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:36:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249114.429606 (Exim 4.92) (envelope-from ) id 1myZt6-0001KZ-Mu; Sat, 18 Dec 2021 13:36:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249114.429606; Sat, 18 Dec 2021 13:36:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZt6-0001KR-Jj; Sat, 18 Dec 2021 13:36:36 +0000 Received: by outflank-mailman (input) for mailman id 249114; Sat, 18 Dec 2021 13:36:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZt4-0001K7-VG for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZt4-0007Fj-UW for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZt4-0008VQ-Tm for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Z/WpG2jxbHUmS5tOZtK114IeYzWCiE8n0oFzPeR7MTU=; b=epZFNAoN+A76NRz4oR5mPquZT8 HIqyjvlSUEGwmyJhK/Kn2XsFxGKGEOpmG3q/QF0FL0/aNqz/j+EBVanOhBndV3AQ/jSsBDnw5YLBM 1IU162dFGTpUTbN6JRm0hIm+T4fIFtUgHNciIf1jW887m9lmXEBwrnpunL60OuIRQyFg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: Introduce dom0-cpuid command line option Message-Id: Date: Sat, 18 Dec 2021 13:36:34 +0000 commit 5bd2b82df28cb7390f5ffb00fac635d0b9e36674 Author: Andrew Cooper AuthorDate: Tue Dec 14 16:53:36 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Introduce dom0-cpuid command line option Specifically, this lets the user opt in to non-default features. Collect all dom0 settings together in dom0_{en,dis}able_feat[], and apply it to dom0's policy when other tweaks are being made. As recalculate_cpuid_policy() is an expensive action, and dom0-cpuid= is likely to only be used by the x86 maintainers for development purposes, forgo the recalculation in the general case. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 16 ++++++++++++++++ xen/arch/x86/cpuid.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index f7797ea233..6b3da6ddc1 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -801,6 +801,22 @@ Controls for how dom0 is constructed on x86 systems. If using this option is necessary to fix an issue, please report a bug. +### dom0-cpuid + = List of comma separated booleans + + Applicability: x86 + +This option allows for fine tuning of the facilities dom0 will use, after +accounting for hardware capabilities and Xen settings as enumerated via CPUID. + +Options are accepted in positive and negative form, to enable or disable +specific features. All selections via this mechanism are subject to normal +CPU Policy safety and dependency logic. + +This option is intended for developers to opt dom0 into non-default features, +and is not intended for use in production circumstances. If using this option +is necessary to fix an issue, please report a bug. + ### dom0-iommu = List of [ passthrough=, strict=, map-inclusive=, map-reserved=, none ] diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index e11f5a3c9a..b5af48324a 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -116,6 +116,24 @@ static int __init parse_xen_cpuid(const char *s) } custom_param("cpuid", parse_xen_cpuid); +static bool __initdata dom0_cpuid_cmdline; +static uint32_t __initdata dom0_enable_feat[FSCAPINTS]; +static uint32_t __initdata dom0_disable_feat[FSCAPINTS]; + +static void __init _parse_dom0_cpuid(unsigned int feat, bool val) +{ + __set_bit (feat, val ? dom0_enable_feat : dom0_disable_feat); + __clear_bit(feat, val ? dom0_disable_feat : dom0_enable_feat ); +} + +static int __init parse_dom0_cpuid(const char *s) +{ + dom0_cpuid_cmdline = true; + + return parse_cpuid(s, _parse_dom0_cpuid); +} +custom_param("dom0-cpuid", parse_dom0_cpuid); + #define EMPTY_LEAF ((struct cpuid_leaf){}) static void zero_leaves(struct cpuid_leaf *l, unsigned int first, unsigned int last) @@ -768,6 +786,25 @@ void __init init_dom0_cpuid_policy(struct domain *d) */ if ( cpu_has_arch_caps ) p->feat.arch_caps = true; + + /* Apply dom0-cpuid= command line settings, if provided. */ + if ( dom0_cpuid_cmdline ) + { + uint32_t fs[FSCAPINTS]; + unsigned int i; + + cpuid_policy_to_featureset(p, fs); + + for ( i = 0; i < ARRAY_SIZE(fs); ++i ) + { + fs[i] |= dom0_enable_feat [i]; + fs[i] &= ~dom0_disable_feat[i]; + } + + cpuid_featureset_to_policy(fs, p); + + recalculate_cpuid_policy(d); + } } void guest_cpuid(const struct vcpu *v, uint32_t leaf, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:36:46 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:36:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249115.429610 (Exim 4.92) (envelope-from ) id 1myZtG-0001Nv-OI; Sat, 18 Dec 2021 13:36:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249115.429610; Sat, 18 Dec 2021 13:36:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtG-0001Nn-LR; Sat, 18 Dec 2021 13:36:46 +0000 Received: by outflank-mailman (input) for mailman id 249115; Sat, 18 Dec 2021 13:36:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtF-0001NT-22 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtF-0007Fq-1P for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZtF-00004r-0Z for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zpmPgDJKrSeO9lg7nMuj2cf2Gw7+ugq/dCzVmVNm+bs=; b=VhY2wYfCn6etmjGaVHI0tsfta5 Q7XeGdehBXXQZA4/xwilS5nNsaCLHoNtoWGxAkcvbillTP3u83tSCQt1hJBqeGPmuK2AD8QN5ECpg 8RTHj8OUf3g11JTd2LsPeLcrz+VJearwf/sv57jNh518NtkrnJaOayTxSPm2oyFUt0cc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpuid: Advertise SERIALIZE by default to guests Message-Id: Date: Sat, 18 Dec 2021 13:36:45 +0000 commit 4feacc95265a3d786753ed1532c77eb382630f78 Author: Andrew Cooper AuthorDate: Tue Dec 14 20:04:17 2021 +0000 Commit: Andrew Cooper CommitDate: Thu Dec 16 20:27:13 2021 +0000 x86/cpuid: Advertise SERIALIZE by default to guests I've played with SERIALIZE, TSXLDTRK, MOVDIRI and MOVDIR64 on real hardware, and they all seem fine, including emulation support. SERIALIZE exists specifically to have a userspace usable serialising operation without other side effects. (The only other two choices are CPUID which is a VMExit under virt and clobbers 4 registers, and IRET-to-self which very slow and consumes content from the stack.) TSXLDTRK is a niche TSX feature, and TSX itself is niche outside of demos of speculative sidechannels. Leave the feature opt-in until a usecase is found, in an effort to preempt the multiple person years of effort it has taken to mop up TSX issues impacting every processor line. MOVDIRI and MOVDIR64 are harder to judge. They're architectural building blocks towards ENQCMD{,S} without obvious usecases on their own. They're of no use to domains without PCI devices, so leave them opt-in for now. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/include/public/arch-x86/cpufeatureset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 647ee9e5e2..0b39937556 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -278,7 +278,7 @@ XEN_CPUFEATURE(SRBDS_CTRL, 9*32+ 9) /* MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ XEN_CPUFEATURE(RTM_ALWAYS_ABORT, 9*32+11) /*! June 2021 TSX defeaturing in microcode. */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ -XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*a SERIALIZE insn */ +XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*A SERIALIZE insn */ XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:36:56 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:36:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249116.429614 (Exim 4.92) (envelope-from ) id 1myZtQ-0001SL-Px; Sat, 18 Dec 2021 13:36:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249116.429614; Sat, 18 Dec 2021 13:36:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtQ-0001SD-Mx; Sat, 18 Dec 2021 13:36:56 +0000 Received: by outflank-mailman (input) for mailman id 249116; Sat, 18 Dec 2021 13:36:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtP-0001S0-59 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtP-0007Fx-4T for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZtP-00005z-3f for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:36:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=t9b7wwEIiu2jXmHfGFS6c3BLmmM2AYYKFde1Y4r7gBg=; b=3WxJbWc1TKIE8h8XimLN9oyZKW h9ZcoXB7dqHUy6iD+yjYx3bPKuT/oXoqVX8kXLwUNuKJxOlErrHW7ICA7HWCHk1pROXym12lkT5GO ooW/dBVE5D1KXpcqqjVpv2tvRD/1ug4daCRp1fmZCZYAQFlHUs1Q8RQhgQMK5fHjlNuc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: increase memory banks number define value Message-Id: Date: Sat, 18 Dec 2021 13:36:55 +0000 commit f1f38e26c3669f5e4583c3756f213c167d19651a Author: Luca Fancellu AuthorDate: Thu Dec 16 14:43:19 2021 -0800 Commit: Stefano Stabellini CommitDate: Thu Dec 16 14:43:19 2021 -0800 xen/arm: increase memory banks number define value Currently the maximum number of memory banks (NR_MEM_BANKS define) is fixed to 128, but on some new platforms that have a large amount of memory, this value is not enough and prevents Xen from booting. Increase the value to 256. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/setup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/setup.h index 88d9673db8..7a1e1d6798 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -8,7 +8,7 @@ #define MIN_FDT_ALIGN 8 #define MAX_FDT_SIZE SZ_2M -#define NR_MEM_BANKS 128 +#define NR_MEM_BANKS 256 #define MAX_MODULES 32 /* Current maximum useful modules */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:37:06 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:37:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249118.429617 (Exim 4.92) (envelope-from ) id 1myZta-0001Vj-RX; Sat, 18 Dec 2021 13:37:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249118.429617; Sat, 18 Dec 2021 13:37:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZta-0001Vb-OP; Sat, 18 Dec 2021 13:37:06 +0000 Received: by outflank-mailman (input) for mailman id 249118; Sat, 18 Dec 2021 13:37:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtZ-0001VH-8E for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtZ-0007GE-7Z for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZtZ-000078-6n for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zeRbOMT1BvlPfCUawp4bFAz3WlmEGr80hQRtIwakmRM=; b=nv6j7QNmYiq0vguDaxisUxLcNN PaLei+Gwpxzk0xxTYnTXThNlzf6KIvVkU4UpFBrgItpdSN+VhyNSczk4iV6idkVkVz9XHH5sLZ05A 9ZC+tPN+QABassMeqjTfqdcLk9TKdu+MlJ+4y1NqdSo5MqAfQhilnLdKcESgSXZLE8jc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/efi: Handle Xen bootargs from both xen.cfg and DT Message-Id: Date: Sat, 18 Dec 2021 13:37:05 +0000 commit f3999bc2e099c571e4583bff8f494b834b2f5f76 Author: Luca Fancellu AuthorDate: Mon Dec 13 11:48:54 2021 +0000 Commit: Stefano Stabellini CommitDate: Thu Dec 16 14:43:34 2021 -0800 arm/efi: Handle Xen bootargs from both xen.cfg and DT Currently the Xen UEFI stub can accept Xen boot arguments from the Xen configuration file using the "options=" keyword, but also directly from the device tree specifying xen,xen-bootargs property. When the configuration file is used, device tree boot arguments are ignored and overwritten even if the keyword "options=" is not used. This patch handle this case, so if the Xen configuration file is not specifying boot arguments, the device tree boot arguments will be used, if they are present. Signed-off-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- docs/misc/efi.pandoc | 4 ++++ xen/arch/arm/efi/efi-boot.h | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/docs/misc/efi.pandoc b/docs/misc/efi.pandoc index abafb34527..71fdc316b6 100644 --- a/docs/misc/efi.pandoc +++ b/docs/misc/efi.pandoc @@ -249,6 +249,10 @@ UEFI stub for module loading. When adding DomU modules to device tree, also add the property xen,uefi-cfg-load under chosen for Xen to load the Xen config file. Otherwise, Xen will skip the config file and rely on device tree alone. +When using the Xen configuration file in conjunction with the device tree, you +can specify the Xen boot arguments in the configuration file with the "options=" +keyword or in the device tree with the "xen,xen-bootargs" property, but be +aware that the Xen configuration file value has a precedence over the DT value. Example 1 of how to boot a true dom0less configuration: diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 4fb345f225..ae8627134e 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -503,11 +503,26 @@ static void __init efi_arch_handle_cmdline(CHAR16 *image_name, if ( cfgfile_options ) { + PrintMessage(L"Using bootargs from Xen configuration file."); prop_len += snprintf(buf + prop_len, EFI_PAGE_SIZE - prop_len, " %s", cfgfile_options); if ( prop_len >= EFI_PAGE_SIZE ) blexit(L"FDT string overflow"); } + else + { + /* Get xen,xen-bootargs in /chosen if it is specified */ + const char *dt_bootargs_prop = fdt_getprop(fdt, chosen, + "xen,xen-bootargs", NULL); + if ( dt_bootargs_prop ) + { + PrintMessage(L"Using bootargs from device tree."); + prop_len += snprintf(buf + prop_len, EFI_PAGE_SIZE - prop_len, + " %s", dt_bootargs_prop); + if ( prop_len >= EFI_PAGE_SIZE ) + blexit(L"FDT string overflow"); + } + } if ( cmdline_options ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:37:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:37:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249119.429622 (Exim 4.92) (envelope-from ) id 1myZtk-0001ZL-UZ; Sat, 18 Dec 2021 13:37:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249119.429622; Sat, 18 Dec 2021 13:37:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtk-0001ZC-RZ; Sat, 18 Dec 2021 13:37:16 +0000 Received: by outflank-mailman (input) for mailman id 249119; Sat, 18 Dec 2021 13:37:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtj-0001Z1-KW for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtj-0007GI-Ju for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZtj-00008j-H9 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=mNwi09uzUDxHiPVcO8BtJznRCWnIIWX21j2RgphAI9A=; b=Jh0Ltsx296ZFJtWhXcBYmFPwzy 89nFRcNLo6FUXyNvIl4wMSvj597rG6EXn5dx1eU73bHU5T5xfodjStBUi4UqzxZflCmeLtPpXJj8h jAna87BsBUla8F2hEscd87iWRNIl/HuJ7zjebwlLliusVIMLKmsXGjBviyMY5unarz5M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] revert "hvmloader: PA range 0xfc000000-0xffffffff should be UC" Message-Id: Date: Sat, 18 Dec 2021 13:37:15 +0000 commit ea187c0b7a73c26258c0e91e4f3656989804555f Author: Jan Beulich AuthorDate: Fri Dec 17 08:56:15 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 17 08:56:15 2021 +0100 revert "hvmloader: PA range 0xfc000000-0xffffffff should be UC" This reverts commit c22bd567ce22f6ad9bd93318ad0d7fd1c2eadb0d. While its description is correct from an abstract or real hardware pov, the range is special inside HVM guests. The range being UC in particular gets in the way of OVMF, which places itself at [FFE00000,FFFFFFFF]. While this is benign to epte_get_entry_emt() as long as the IOMMU isn't enabled for a guest, it becomes a very noticable problem otherwise: It takes about half a minute for OVMF to decompress itself into its designated address range. And even beyond OVMF there's no reason to have e.g. the ACPI memory range marked UC. Fixes: c22bd567ce22 ("hvmloader: PA range 0xfc000000-0xffffffff should be UC") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- tools/firmware/hvmloader/cacheattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/cacheattr.c b/tools/firmware/hvmloader/cacheattr.c index 1ac6656c70..1c67819748 100644 --- a/tools/firmware/hvmloader/cacheattr.c +++ b/tools/firmware/hvmloader/cacheattr.c @@ -98,12 +98,12 @@ void cacheattr_init(void) { uint64_t base = pci_mem_start, size; - for ( i = 0; !(base >> 32) && (i < nr_var_ranges); i++ ) + for ( i = 0; (base != pci_mem_end) && (i < nr_var_ranges); i++ ) { size = PAGE_SIZE; while ( !(base & size) ) size <<= 1; - while ( ((base + size) < base) || ((base + size - 1) >> 32) ) + while ( ((base + size) < base) || ((base + size) > pci_mem_end) ) size >>= 1; wrmsr(MSR_MTRRphysBase(i), base); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:37:27 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:37:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249120.429626 (Exim 4.92) (envelope-from ) id 1myZtu-0001cY-W6; Sat, 18 Dec 2021 13:37:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249120.429626; Sat, 18 Dec 2021 13:37:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtu-0001cQ-T0; Sat, 18 Dec 2021 13:37:26 +0000 Received: by outflank-mailman (input) for mailman id 249120; Sat, 18 Dec 2021 13:37:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtt-0001cC-Qj for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZtt-0007Gf-Q8 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZtt-0000A6-PO for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pprIP0rwMuCxyLYWaGJjIHCf8Ymt34obXv1cXJTfD3U=; b=b191d4UTlIRQvcICkBzG3U6pb/ fviOnGw9sCqEXfZiUDrEeZikgBbQOuYDg0bckN7Zlw/FHQ+pPOZsUlYk77+ciEh1BuqCy19HiDsNQ ggQBaTaTT1Uqpt4wl2T5GJamaIrwCsIO39Uxex66IWGBQE6Agj47+gkJaQ660Q0kqzLM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] hvmloader: tidy pci_mem_{start,end} Message-Id: Date: Sat, 18 Dec 2021 13:37:25 +0000 commit 1c4589280ae4e9ba34266e674459fffd6f0282dc Author: Jan Beulich AuthorDate: Fri Dec 17 08:56:34 2021 +0100 Commit: Jan Beulich CommitDate: Fri Dec 17 08:56:34 2021 +0100 hvmloader: tidy pci_mem_{start,end} For one at least pci_mem_start has to be precisely 32 bits wide, so use uint32_t for both. Otherwise expressions like "pci_mem_start <<= 1" won't have the intended effect (in their context). Further since its introduction pci_mem_end was never written to. Mark it const to make this explicit. Finally drop PCI_MEM_END: It is used just once and needlessly disconnected from the other constant (RESERVED_MEMBASE) it needs to match. Use RESERVED_MEMBASE as initializer of pci_mem_end instead. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/firmware/hvmloader/config.h | 6 ++---- tools/firmware/hvmloader/pci.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 844120bc87..c82adf6dc5 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -55,12 +55,10 @@ extern uint8_t ioapic_version; #define PCI_ISA_DEVFN 0x08 /* dev 1, fn 0 */ #define PCI_ISA_IRQ_MASK 0x0c20U /* ISA IRQs 5,10,11 are PCI connected */ -/* MMIO hole: Hardcoded defaults, which can be dynamically expanded. */ -#define PCI_MEM_END 0xfc000000 - #define ACPI_TIS_HDR_ADDRESS 0xFED40F00UL -extern unsigned long pci_mem_start, pci_mem_end; +extern uint32_t pci_mem_start; +extern const uint32_t pci_mem_end; extern uint64_t pci_hi_mem_start, pci_hi_mem_end; extern bool acpi_enabled; diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 72f92d4450..257a6feb61 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -29,8 +29,8 @@ #include #include -unsigned long pci_mem_start = HVM_BELOW_4G_MMIO_START; -unsigned long pci_mem_end = PCI_MEM_END; +uint32_t pci_mem_start = HVM_BELOW_4G_MMIO_START; +const uint32_t pci_mem_end = RESERVED_MEMBASE; uint64_t pci_hi_mem_start = 0, pci_hi_mem_end = 0; enum virtual_vga virtual_vga = VGA_none; @@ -329,7 +329,7 @@ void pci_setup(void) else { pci_mem_start = max_ram_below_4g; - printf("pci_mem_start=0x%lx (was 0x%x) for mmio_hole_size=%lu\n", + printf("pci_mem_start=0x%x (was 0x%x) for mmio_hole_size=0x%lx\n", pci_mem_start, HVM_BELOW_4G_MMIO_START, (long)mmio_hole_size); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:37:38 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:37:38 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249121.429630 (Exim 4.92) (envelope-from ) id 1myZu6-0001fJ-1E; Sat, 18 Dec 2021 13:37:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249121.429630; Sat, 18 Dec 2021 13:37:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZu5-0001fB-UY; Sat, 18 Dec 2021 13:37:37 +0000 Received: by outflank-mailman (input) for mailman id 249121; Sat, 18 Dec 2021 13:37:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZu3-0001f0-Tm for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZu3-0007Ih-T7 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZu3-0000B8-SO for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=BfgAqCiV6YuGTu1npQZp9nLzKzLJNt4ECfzsDyH9Adc=; b=IJDYX4zF5OD9Fpv7QTZ0pbQ6GV H1HPCtLxB+sUlwzEK8bDiIag++6WxXpFeg9xFn4D+NwMqhw3fpQKinKc6PWW4vUJJtTuP7XYOZmR5 BkxHBKwF5jgBf7wqmGMes5Cr63oFJ5iLaqTKX2jgPxyCpJInxfT7Pej/yZOtfdB4ppGg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: drop support for running under SunOS Message-Id: Date: Sat, 18 Dec 2021 13:37:35 +0000 commit c81fc9f313c031f1201181cfb40e3c3ee599e04f Author: Juergen Gross AuthorDate: Fri Dec 17 08:50:59 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 11:48:52 2021 +0000 tools/xenstore: drop support for running under SunOS Since several years now xenstored is no longer capable to run under SunOS, as the needed libxengnttab interfaces are not available there. Several attempts to let the SunOS maintainers address this situation didn't change anything in this regard. For those reasons drop SunOS support in xenstored by removing the SunOS specific code. Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Reviewed-by: Julien Grall --- tools/xenstore/Makefile | 15 +--- tools/xenstore/xenstored_core.c | 7 -- tools/xenstore/xenstored_core.h | 4 - tools/xenstore/xenstored_minios.c | 4 - tools/xenstore/xenstored_posix.c | 6 -- tools/xenstore/xenstored_probes.d | 28 ------- tools/xenstore/xenstored_solaris.c | 168 ------------------------------------- 7 files changed, 1 insertion(+), 231 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 292b478fa1..c86278fdb1 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -27,7 +27,6 @@ XENSTORED_OBJS += xenstored_transaction.o xenstored_control.o XENSTORED_OBJS += xs_lib.o talloc.o utils.o tdb.o hashtable.o XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_posix.o -XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o xenstored_posix.o xenstored_probes.o XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_posix.o XENSTORED_OBJS_$(CONFIG_FreeBSD) = xenstored_posix.o XENSTORED_OBJS_$(CONFIG_MiniOS) = xenstored_minios.o @@ -50,18 +49,6 @@ all: $(ALL_TARGETS) .PHONY: clients clients: xenstore $(CLIENTS) xenstore-control -ifeq ($(CONFIG_SunOS),y) -xenstored_probes.h: xenstored_probes.d - dtrace -C -h -s xenstored_probes.d - -xenstored_solaris.o: xenstored_probes.h - -xenstored_probes.o: xenstored_solaris.o - dtrace -C -G -s xenstored_probes.d xenstored_solaris.o - -CFLAGS += -DHAVE_DTRACE=1 -endif - ifeq ($(CONFIG_SYSTEMD),y) $(XENSTORED_OBJS): CFLAGS += $(SYSTEMD_CFLAGS) xenstored: LDFLAGS += $(SYSTEMD_LIBS) @@ -89,7 +76,7 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o .PHONY: clean clean: - rm -f *.a *.o xenstored_probes.h + rm -f *.a *.o rm -f xenstored rm -f xs_tdb_dump xenstore-control init-xenstore-domain rm -f xenstore $(CLIENTS) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 91d093a12e..c386ae6129 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -146,10 +146,6 @@ static void trace_io(const struct connection *conn, time_t now; struct tm *tm; -#ifdef HAVE_DTRACE - dtrace_io(conn, data, out); -#endif - if (tracefd < 0) return; @@ -2337,9 +2333,6 @@ int main(int argc, char *argv[]) /* Get ready to listen to the tools. */ initialize_fds(&sock_pollfd_idx, &timeout); - /* Tell the kernel we're up and running. */ - xenbus_notify_running(); - #if defined(XEN_SYSTEMD_ENABLED) if (!live_update) { sd_notify(1, "READY=1"); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 07d861d924..190d2447cd 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -225,7 +225,6 @@ int delay_request(struct connection *conn, struct buffered_data *in, void trace_create(const void *data, const char *type); void trace_destroy(const void *data, const char *type); void trace(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -void dtrace_io(const struct connection *conn, const struct buffered_data *data, int out); void reopen_log(void); void close_log(void); @@ -250,9 +249,6 @@ static inline int xenbus_master_domid(void) { return dom0_domid; } /* Return the event channel used by xenbus. */ evtchn_port_t xenbus_evtchn(void); -/* Tell the kernel xenstored is running. */ -void xenbus_notify_running(void); - /* Write out the pidfile */ void write_pidfile(const char *pidfile); diff --git a/tools/xenstore/xenstored_minios.c b/tools/xenstore/xenstored_minios.c index c94493e52a..aa384e50c8 100644 --- a/tools/xenstore/xenstored_minios.c +++ b/tools/xenstore/xenstored_minios.c @@ -38,10 +38,6 @@ void init_pipe(int reopen_log_pipe[2]) reopen_log_pipe[1] = -1; } -void xenbus_notify_running(void) -{ -} - evtchn_port_t xenbus_evtchn(void) { return dom0_event; diff --git a/tools/xenstore/xenstored_posix.c b/tools/xenstore/xenstored_posix.c index 48c37ffe3e..b20504d1b6 100644 --- a/tools/xenstore/xenstored_posix.c +++ b/tools/xenstore/xenstored_posix.c @@ -111,7 +111,6 @@ void unmap_xenbus(void *interface) munmap(interface, getpagesize()); } -#ifndef __sun__ evtchn_port_t xenbus_evtchn(void) { int fd; @@ -158,8 +157,3 @@ void *xenbus_map(void) return addr; } - -void xenbus_notify_running(void) -{ -} -#endif /* !__sun__ */ diff --git a/tools/xenstore/xenstored_probes.d b/tools/xenstore/xenstored_probes.d deleted file mode 100644 index f72d38f935..0000000000 --- a/tools/xenstore/xenstored_probes.d +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * 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, version 2 of the License. - */ - -#include - -provider xenstore { - /* tx id, dom id, pid, type, msg */ - probe msg(uint32_t, unsigned int, pid_t, int, const char *); - /* tx id, dom id, pid, type, reply */ - probe reply(uint32_t, unsigned int, pid_t, int, const char *); - /* tx id, dom id, pid, reply */ - probe error(uint32_t, unsigned int, pid_t, const char *); - /* dom id, pid, watch details */ - probe watch_event(unsigned int, pid_t, const char *); -}; - -#pragma D attributes Evolving/Evolving/Common provider xenstore provider -#pragma D attributes Private/Private/Unknown provider xenstore module -#pragma D attributes Private/Private/Unknown provider xenstore function -#pragma D attributes Evolving/Evolving/Common provider xenstore name -#pragma D attributes Evolving/Evolving/Common provider xenstore args - diff --git a/tools/xenstore/xenstored_solaris.c b/tools/xenstore/xenstored_solaris.c deleted file mode 100644 index 06052d124a..0000000000 --- a/tools/xenstore/xenstored_solaris.c +++ /dev/null @@ -1,168 +0,0 @@ -/****************************************************************************** - * - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * Copyright (C) 2005 Rusty Russell IBM Corporation - * - * 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, version 2 of the - * License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "talloc.h" -#include "xenstored_core.h" -#include "xenstored_probes.h" - -evtchn_port_t xenbus_evtchn(void) -{ - int fd; - evtchn_port_t port; - - fd = open("/dev/xen/xenbus", O_RDONLY); - if (fd == -1) - return -1; - - port = ioctl(fd, IOCTL_XENBUS_XENSTORE_EVTCHN); - - close(fd); - return port; -} - -void *xenbus_map(void) -{ - int fd; - void *addr; - - fd = open("/dev/xen/xenbus", O_RDWR); - if (fd == -1) - return NULL; - - addr = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, - MAP_SHARED, fd, 0); - - if (addr == MAP_FAILED) - addr = NULL; - - close(fd); - - return addr; -} - -void xenbus_notify_running(void) -{ - int fd; - - fd = open("/dev/xen/xenbus", O_RDONLY); - - (void) ioctl(fd, IOCTL_XENBUS_NOTIFY_UP); - - close(fd); -} - -static pid_t cred(const struct connection *conn) -{ - ucred_t *ucred = NULL; - pid_t pid; - - if (conn->domain) - return (0); - - if (getpeerucred(conn->fd, &ucred) == -1) - return (0); - - pid = ucred_getpid(ucred); - - ucred_free(ucred); - return (pid); -} - -/* - * The strings are often a number of nil-separated strings. We'll just - * replace the separators with spaces - not quite right, but good - * enough. - */ -static char * -mangle(const struct connection *conn, const struct buffered_data *in) -{ - char *str; - int i; - - if (in->hdr.msg.len == 0) - return (talloc_strdup(conn, "")); - - if ((str = talloc_zero_size(conn, in->hdr.msg.len + 1)) == NULL) - return (NULL); - - memcpy(str, in->buffer, in->hdr.msg.len); - - /* - * The protocol is absurdly inconsistent in whether the length - * includes the terminating nil or not; replace all nils that - * aren't the last one. - */ - for (i = 0; i < (in->hdr.msg.len - 1); i++) { - if (str[i] == '\0') - str[i] = ' '; - } - - return (str); -} - -void -dtrace_io(const struct connection *conn, const struct buffered_data *in, - int io_out) -{ - if (!io_out) { - if (XENSTORE_MSG_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_MSG(in->hdr.msg.tx_id, conn->id, cred(conn), - in->hdr.msg.type, mangled); - } - - goto out; - } - - switch (in->hdr.msg.type) { - case XS_ERROR: - if (XENSTORE_ERROR_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_ERROR(in->hdr.msg.tx_id, conn->id, - cred(conn), mangled); - } - break; - - case XS_WATCH_EVENT: - if (XENSTORE_WATCH_EVENT_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_WATCH_EVENT(conn->id, cred(conn), mangled); - } - break; - - default: - if (XENSTORE_REPLY_ENABLED()) { - char *mangled = mangle(conn, in); - XENSTORE_REPLY(in->hdr.msg.tx_id, conn->id, cred(conn), - in->hdr.msg.type, mangled); - } - break; - } - -out: - /* - * 6589130 dtrace -G fails for certain tail-calls on x86 - */ - asm("nop"); -} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:37:48 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:37:48 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249122.429634 (Exim 4.92) (envelope-from ) id 1myZuG-0001ht-3M; Sat, 18 Dec 2021 13:37:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249122.429634; Sat, 18 Dec 2021 13:37:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuG-0001hl-00; Sat, 18 Dec 2021 13:37:48 +0000 Received: by outflank-mailman (input) for mailman id 249122; Sat, 18 Dec 2021 13:37:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuE-0001hb-0L for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuD-0007Il-Vy for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZuD-0000CR-VD for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D24yRDynS3HmFjin6UUceiiVV6g0mY/mIucQWU0x+Xs=; b=YmA2I6v2W+Wa4Bdw/eZChVuO51 1aKpHSoB1OoGicy4bFRGzQXgw0p1yU2KV0lls8/MlooafFCcLztqCdWhJYAAPVsKAM73uiKfppSxU FGK5mYvwAlyj69KD3MEq+dkicH6pyiedVuUk3xP+7bq0oHy0HdA2S9wqxzw/mqHmw8XY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: Zero the top 32 bits of gp registers on entry... Message-Id: Date: Sat, 18 Dec 2021 13:37:45 +0000 commit 32365f3476ac4655f2f26111cd7879912808cd77 Author: Michal Orzel AuthorDate: Fri Dec 17 08:21:59 2021 +0100 Commit: Julien Grall CommitDate: Fri Dec 17 13:23:03 2021 +0000 xen/arm64: Zero the top 32 bits of gp registers on entry... to hypervisor when switching from AArch32 state. According to section D1.20.2 of Arm Arm(DDI 0487A.j): "If the general-purpose register was accessible from AArch32 state the upper 32 bits either become zero, or hold the value that the same architectural register held before any AArch32 execution. The choice between these two options is IMPLEMENTATION DEFINED" Currently Xen does not ensure that the top 32 bits are zeroed and this needs to be fixed. The reason why is that there are places in Xen where we assume that top 32bits are zero for AArch32 guests. If they are not, this can lead to misinterpretation of Xen regarding what the guest requested. For example hypercalls returning an error encoded in a signed long like do_sched_op, do_hmv_op, do_memory_op would return -ENOSYS if the command passed as the first argument was clobbered. Create a macro clobber_gp_top_halves to clobber top 32 bits of gp registers when hyp == 0 (guest mode) and compat == 1 (AArch32 mode). Add a compile time check to ensure that save_x0_x1 == 1 if compat == 1. Signed-off-by: Michal Orzel [julieng: Tweak the comment in clobber_gp_top_halves] Acked-by: Julien Grall --- xen/arch/arm/arm64/entry.S | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index fc3811ad0a..8c48087256 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -102,6 +102,30 @@ .endif .endm + +/* + * Clobber top 32 bits of gp registers when switching from AArch32 + */ + .macro clobber_gp_top_halves, compat, save_x0_x1 + + .if \compat == 1 /* AArch32 mode */ + + /* + * At the moment, no-one is using save_x0_x1 == 0 with compat == 1. + * So the code is not handling it to simplify the implementation. + */ + .if \save_x0_x1 == 0 + .error "save_x0_x1 is 0 but compat is 1" + .endif + + .irp n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 + mov w\n, w\n + .endr + + .endif + + .endm + /* * Save state on entry to hypervisor, restore on exit * @@ -111,6 +135,11 @@ */ .macro entry, hyp, compat, save_x0_x1=1 sub sp, sp, #(UREGS_SPSR_el1 - UREGS_LR) /* CPSR, PC, SP, LR */ + + .if \hyp == 0 /* Guest mode */ + clobber_gp_top_halves compat=\compat, save_x0_x1=\save_x0_x1 + .endif + push x28, x29 push x26, x27 push x24, x25 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:37:58 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:37:58 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249123.429639 (Exim 4.92) (envelope-from ) id 1myZuQ-0001l4-5K; Sat, 18 Dec 2021 13:37:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249123.429639; Sat, 18 Dec 2021 13:37:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuQ-0001kw-1U; Sat, 18 Dec 2021 13:37:58 +0000 Received: by outflank-mailman (input) for mailman id 249123; Sat, 18 Dec 2021 13:37:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuO-0001km-3Q for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuO-0007Ip-2o for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZuO-0000DP-22 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:37:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=auccBmn4aL4UcyfNuQMafOSZmRVNtAeabu35O6xpB1U=; b=uCgf7dhvTSl+VDsuojdcl17F+v owPGQ6Hu8YvKgZE0ucRcm6ft7IZoySYX/AyYAYAyJ6dh57zWkG2pbG/i/JaDLdxy1o/eIm54hwQH+ pAfhQb23e/ynaUIQ/PvnEpXHWkj87bO3Y+klDXmilvfXREZ+ZBcXP49jP2aHne7VEY24=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/domain: Remove function pointers from domain pause helpers Message-Id: Date: Sat, 18 Dec 2021 13:37:56 +0000 commit 52c06465fc7286cb06743adf15f10b0759ed8f4e Author: Andrew Cooper AuthorDate: Thu Oct 28 04:07:02 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 17:03:54 2021 +0000 xen/domain: Remove function pointers from domain pause helpers Function pointer calls are expensive (especially with Spectre v2 protections), and all these do are select between the sync and nosync helpers. Pass a boolean instead, and use direct calls everywhere. Pause/unpause operations on behalf of dom0 are not fastpaths, so avoid exposing the __domain_pause_by_systemcontroller() internal. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/common/domain.c | 30 +++++++++++++++++++++--------- xen/include/xen/sched.h | 15 +++++---------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 093bb4403f..2048ebad86 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1226,15 +1226,18 @@ int vcpu_unpause_by_systemcontroller(struct vcpu *v) return 0; } -static void do_domain_pause(struct domain *d, - void (*sleep_fn)(struct vcpu *v)) +static void _domain_pause(struct domain *d, bool sync) { struct vcpu *v; atomic_inc(&d->pause_count); - for_each_vcpu( d, v ) - sleep_fn(v); + if ( sync ) + for_each_vcpu ( d, v ) + vcpu_sleep_sync(v); + else + for_each_vcpu ( d, v ) + vcpu_sleep_nosync(v); arch_domain_pause(d); } @@ -1242,12 +1245,12 @@ static void do_domain_pause(struct domain *d, void domain_pause(struct domain *d) { ASSERT(d != current->domain); - do_domain_pause(d, vcpu_sleep_sync); + _domain_pause(d, true /* sync */); } void domain_pause_nosync(struct domain *d) { - do_domain_pause(d, vcpu_sleep_nosync); + _domain_pause(d, false /* nosync */); } void domain_unpause(struct domain *d) @@ -1261,8 +1264,7 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -int __domain_pause_by_systemcontroller(struct domain *d, - void (*pause_fn)(struct domain *d)) +static int _domain_pause_by_systemcontroller(struct domain *d, bool sync) { int old, new, prev = d->controller_pause_count; @@ -1281,11 +1283,21 @@ int __domain_pause_by_systemcontroller(struct domain *d, prev = cmpxchg(&d->controller_pause_count, old, new); } while ( prev != old ); - pause_fn(d); + _domain_pause(d, sync); return 0; } +int domain_pause_by_systemcontroller(struct domain *d) +{ + return _domain_pause_by_systemcontroller(d, true /* sync */); +} + +int domain_pause_by_systemcontroller_nosync(struct domain *d) +{ + return _domain_pause_by_systemcontroller(d, false /* nosync */); +} + int domain_unpause_by_systemcontroller(struct domain *d) { int old, new, prev = d->controller_pause_count; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 28146ee404..37f78cc4c4 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -920,26 +920,21 @@ static inline bool vcpu_cpu_dirty(const struct vcpu *v) void vcpu_block(void); void vcpu_unblock(struct vcpu *v); + void vcpu_pause(struct vcpu *v); void vcpu_pause_nosync(struct vcpu *v); void vcpu_unpause(struct vcpu *v); + int vcpu_pause_by_systemcontroller(struct vcpu *v); int vcpu_unpause_by_systemcontroller(struct vcpu *v); void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void domain_unpause(struct domain *d); + +int domain_pause_by_systemcontroller(struct domain *d); +int domain_pause_by_systemcontroller_nosync(struct domain *d); int domain_unpause_by_systemcontroller(struct domain *d); -int __domain_pause_by_systemcontroller(struct domain *d, - void (*pause_fn)(struct domain *d)); -static inline int domain_pause_by_systemcontroller(struct domain *d) -{ - return __domain_pause_by_systemcontroller(d, domain_pause); -} -static inline int domain_pause_by_systemcontroller_nosync(struct domain *d) -{ - return __domain_pause_by_systemcontroller(d, domain_pause_nosync); -} /* domain_pause() but safe against trying to pause current. */ int __must_check domain_pause_except_self(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:38:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:38:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249124.429641 (Exim 4.92) (envelope-from ) id 1myZuZ-0001o3-7w; Sat, 18 Dec 2021 13:38:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249124.429641; Sat, 18 Dec 2021 13:38:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuZ-0001nv-4v; Sat, 18 Dec 2021 13:38:07 +0000 Received: by outflank-mailman (input) for mailman id 249124; Sat, 18 Dec 2021 13:38:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuY-0001nk-9I for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:38:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuY-0007JF-67 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:38:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZuY-0000Ed-5K for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:38:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zQyF6/0ULZAS6ycCpzkkenoICg037hfNnl0xMU6dIgc=; b=dR7ZLwNkDh/ZIbnLIskMkqEsJ/ NexrNz96HyXt2WlH1Ridz5CCvtti15KwE3DqxnYQ1gNH8b9B7lskncpDzNsxiibDWOvHoRtEx7mYu WNUkwrD5BRKs95TPPZ6OA8hKOPha0Z8ct9THgBsCgRTybEHoFUJLnIgZfKB7VULIo9eM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Drop exception_table[] and use if/else dispatching Message-Id: Date: Sat, 18 Dec 2021 13:38:06 +0000 commit 327db3837a223dd0772348192126302852de5762 Author: Andrew Cooper AuthorDate: Thu Oct 7 14:04:03 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 17:03:54 2021 +0000 x86/traps: Drop exception_table[] and use if/else dispatching There is also a lot of redundancy in the table. 8 vectors head to do_trap(), 3 are handled in the IST logic, and that only leaves 7 others not heading to the do_reserved_trap() catch-all. This also removes the fragility that any accidental NULL entry in the table becomes a ticking timebomb. Function pointers are expensive under retpoline, and different vectors have wildly different frequences. Drop the indirect call, and use an if/else chain instead, which is a code layout technique used by profile-guided optimsiation. Using Xen's own perfcounter infrastructure, we see the following frequences of vectors measured from boot until I can SSH into dom0 and collect the stats: vec | CFL-R | Milan | Notes ----+---------+---------+ NMI | 345 | 3768 | Watchdog. Milan has many more CPUs. ----+---------+---------+ #PF | 1233234 | 2006441 | #GP | 90054 | 96193 | #UD | 848 | 851 | #NM | 0 | 132 | Per-vendor lazy vs eager FPU policy. #DB | 67 | 67 | No clue, but it's something in userspace. Bloat-o-meter (after some manual insertion of ELF metadata) reports: add/remove: 0/1 grow/shrink: 2/0 up/down: 102/-256 (-154) Function old new delta handle_exception_saved 148 226 +78 handle_ist_exception 453 477 +24 exception_table 256 - -256 showing that the if/else chains are less than half the size that exception_table[] was in the first place. As part of this change, make two other minor changes. do_reserved_trap() is renamed to do_unhandled_trap() because it is the catchall, and already covers things that aren't reserved any more (#VE/#VC/#HV/#SX). Furthermore, don't forward #TS to guests. #TS is specifically for errors relating to the Task State Segment, which is a Xen-owned structure, not a guest-owned structure. Even in the 32bit days, we never let guests register their own Task State Segments. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/include/asm/processor.h | 3 -- xen/arch/x86/traps.c | 34 ++---------------- xen/arch/x86/x86_64/entry.S | 67 ++++++++++++++++++++++++++++++++---- 3 files changed, 62 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/include/asm/processor.h b/xen/arch/x86/include/asm/processor.h index 400b4fac5e..e2e1eaf5bd 100644 --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -505,9 +505,6 @@ extern void mtrr_bp_init(void); void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp); -/* Dispatch table for exceptions */ -extern void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs); - #define DECLARE_TRAP_HANDLER(_name) \ void _name(void); \ void do_ ## _name(struct cpu_user_regs *regs) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index df7ffc448b..581d8be2aa 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -135,36 +135,6 @@ const unsigned int nmi_cpu; #define stack_words_per_line 4 #define ESP_BEFORE_EXCEPTION(regs) ((unsigned long *)regs->rsp) -static void do_trap(struct cpu_user_regs *regs); -static void do_reserved_trap(struct cpu_user_regs *regs); - -void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs) = { - [TRAP_divide_error] = do_trap, - [TRAP_debug] = do_debug, - [TRAP_nmi] = (void *)do_nmi, - [TRAP_int3] = do_int3, - [TRAP_overflow] = do_trap, - [TRAP_bounds] = do_trap, - [TRAP_invalid_op] = do_invalid_op, - [TRAP_no_device] = do_device_not_available, - [TRAP_double_fault] = do_reserved_trap, - [TRAP_copro_seg] = do_reserved_trap, - [TRAP_invalid_tss] = do_trap, - [TRAP_no_segment] = do_trap, - [TRAP_stack_error] = do_trap, - [TRAP_gp_fault] = do_general_protection, - [TRAP_page_fault] = do_page_fault, - [TRAP_spurious_int] = do_reserved_trap, - [TRAP_copro_error] = do_trap, - [TRAP_alignment_check] = do_trap, - [TRAP_machine_check] = (void *)do_machine_check, - [TRAP_simd_error] = do_trap, - [TRAP_virtualisation] = do_reserved_trap, - [X86_EXC_CP] = do_entry_CP, - [X86_EXC_CP + 1 ... - (ARRAY_SIZE(exception_table) - 1)] = do_reserved_trap, -}; - void show_code(const struct cpu_user_regs *regs) { unsigned char insns_before[8] = {}, insns_after[16] = {}; @@ -889,7 +859,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } -static void do_reserved_trap(struct cpu_user_regs *regs) +void do_unhandled_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; @@ -981,7 +951,7 @@ static bool extable_fixup(struct cpu_user_regs *regs, bool print) return true; } -static void do_trap(struct cpu_user_regs *regs) +void do_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 3caa565476..3eaf0e67b2 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -773,14 +773,48 @@ handle_exception_saved: sti 1: movq %rsp,%rdi movzbl UREGS_entry_vector(%rsp),%eax - leaq exception_table(%rip),%rdx #ifdef CONFIG_PERF_COUNTERS lea per_cpu__perfcounters(%rip), %rcx add STACK_CPUINFO_FIELD(per_cpu_offset)(%r14), %rcx incl ASM_PERFC_exceptions * 4(%rcx, %rax, 4) #endif - mov (%rdx, %rax, 8), %rdx - INDIRECT_CALL %rdx + + /* + * Dispatch to appropriate C handlers. + * + * The logic is implemented as an if/else chain. DISPATCH() calls + * need be in frequency order for best performance. + */ +#define DISPATCH(vec, handler) \ + cmp $vec, %al; \ + jne .L_ ## vec ## _done; \ + call handler; \ + jmp .L_exn_dispatch_done; \ +.L_ ## vec ## _done: + + DISPATCH(X86_EXC_PF, do_page_fault) + DISPATCH(X86_EXC_GP, do_general_protection) + DISPATCH(X86_EXC_UD, do_invalid_op) + DISPATCH(X86_EXC_NM, do_device_not_available) + DISPATCH(X86_EXC_BP, do_int3) + + /* Logically "if ( (1 << vec) & MASK ) { do_trap(); }" */ + mov $(1 << X86_EXC_DE) | (1 << X86_EXC_OF) | (1 << X86_EXC_BR) |\ + (1 << X86_EXC_NP) | (1 << X86_EXC_SS) | (1 << X86_EXC_MF) |\ + (1 << X86_EXC_AC) | (1 << X86_EXC_XM), %edx + bt %eax, %edx + jnc .L_do_trap_done + call do_trap + jmp .L_exn_dispatch_done +.L_do_trap_done: + + DISPATCH(X86_EXC_CP, do_entry_CP) +#undef DISPATCH + + call do_unhandled_trap + BUG /* do_unhandled_trap() shouldn't return. */ + +.L_exn_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %r13b, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) #ifdef CONFIG_PV @@ -1012,9 +1046,28 @@ handle_ist_exception: incl ASM_PERFC_exceptions * 4(%rcx, %rax, 4) #endif - leaq exception_table(%rip),%rdx - mov (%rdx, %rax, 8), %rdx - INDIRECT_CALL %rdx + /* + * Dispatch to appropriate C handlers. + * + * The logic is implemented as an if/else chain. DISPATCH() calls + * need be in frequency order for best performance. + */ +#define DISPATCH(vec, handler) \ + cmp $vec, %al; \ + jne .L_ ## vec ## _done; \ + call handler; \ + jmp .L_ist_dispatch_done; \ +.L_ ## vec ## _done: + + DISPATCH(X86_EXC_NMI, do_nmi) + DISPATCH(X86_EXC_DB, do_debug) + DISPATCH(X86_EXC_MC, do_machine_check) +#undef DISPATCH + + call do_unhandled_trap + BUG /* do_unhandled_trap() shouldn't return. */ + +.L_ist_dispatch_done: mov %r15, STACK_CPUINFO_FIELD(xen_cr3)(%r14) mov %bl, STACK_CPUINFO_FIELD(use_pv_cr3)(%r14) cmpb $TRAP_nmi,UREGS_entry_vector(%rsp) @@ -1088,7 +1141,7 @@ autogen_stubs: /* Automatically generated stubs. */ entrypoint 1b - /* Reserved exceptions, heading towards do_reserved_trap(). */ + /* Reserved exceptions, heading towards do_unhandled_trap(). */ .elseif vec == X86_EXC_CSO || vec == X86_EXC_SPV || \ vec == X86_EXC_VE || (vec > X86_EXC_CP && vec < TRAP_nr) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Dec 18 13:38:19 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 18 Dec 2021 13:38:19 +0000 Received: from list by lists.xenproject.org with outflank-mailman.249125.429646 (Exim 4.92) (envelope-from ) id 1myZuj-0001rJ-9c; Sat, 18 Dec 2021 13:38:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 249125.429646; Sat, 18 Dec 2021 13:38:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZuj-0001rB-6S; Sat, 18 Dec 2021 13:38:17 +0000 Received: by outflank-mailman (input) for mailman id 249125; Sat, 18 Dec 2021 13:38:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZui-0001qy-9k for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:38:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1myZui-0007Kv-95 for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:38:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1myZui-0000Fh-8P for xen-changelog@lists.xenproject.org; Sat, 18 Dec 2021 13:38:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CWkTERcd12p1fp5YYYY5is0W5KN+I2Rr6rOdngt1r7w=; b=jUw3fUXkFH1eA5gL9VJB8klAe8 gXXrDFiYC4f3oZZkWabyES8+AqLuJBj8J3xyYbuozQkG6TgDlbCfPE01bBscrmobfy1CMIJ4n2fCW zVKvGOSSYO2wszfT6wajRuIAML/PYvgIeJ59gOGKqoYPGh79to7LaX+1XOHRnmBaYo2M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/traps: Clean up diagnostics Message-Id: Date: Sat, 18 Dec 2021 13:38:16 +0000 commit 8e3edefb880caeeaaf80123d5599139e8c2c9ecf Author: Andrew Cooper AuthorDate: Fri Oct 8 13:40:17 2021 +0100 Commit: Andrew Cooper CommitDate: Fri Dec 17 17:03:54 2021 +0000 x86/traps: Clean up diagnostics do{_unhandled,}_trap() should use fatal_trap() rather than opencoding part of it. This lets the remote stack trace logic work in more fatal error conditions. With do_trap() converted, there is only one single user of trapstr() remaining. Tweak the formatting in pv_inject_event(), and remove trapstr() entirely. Rename vec_name() to vector_name() now that it is exported. Take the opportunity of vector_name() being exported to improve the diagnostics in stub_selftest(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/extable.c | 8 +++++--- xen/arch/x86/include/asm/traps.h | 2 +- xen/arch/x86/pv/traps.c | 6 +++--- xen/arch/x86/traps.c | 29 +++++------------------------ 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c index 109ab7da98..78d6727225 100644 --- a/xen/arch/x86/extable.c +++ b/xen/arch/x86/extable.c @@ -124,6 +124,8 @@ search_exception_table(const struct cpu_user_regs *regs) } #ifndef NDEBUG +#include + static int __init stub_selftest(void) { static const struct { @@ -172,10 +174,10 @@ static int __init stub_selftest(void) if ( res.raw != tests[i].res.raw ) { printk("Selftest %u failed: Opc %*ph " - "expected %u[%04x], got %u[%04x]\n", + "expected %s[%04x], got %s[%04x]\n", i, (int)ARRAY_SIZE(tests[i].opc), tests[i].opc, - tests[i].res.fields.trapnr, tests[i].res.fields.ec, - res.fields.trapnr, res.fields.ec); + vector_name(tests[i].res.fields.trapnr), tests[i].res.fields.ec, + vector_name(res.fields.trapnr), res.fields.ec); fail = true; } diff --git a/xen/arch/x86/include/asm/traps.h b/xen/arch/x86/include/asm/traps.h index ec23d3a70b..b0dd2d2461 100644 --- a/xen/arch/x86/include/asm/traps.h +++ b/xen/arch/x86/include/asm/traps.h @@ -19,7 +19,7 @@ #ifndef ASM_TRAP_H #define ASM_TRAP_H -const char *trapstr(unsigned int trapnr); +const char *vector_name(unsigned int vec); #endif /* ASM_TRAP_H */ diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 1e05a9f1cd..170e103098 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -89,9 +89,9 @@ void pv_inject_event(const struct x86_event *event) if ( unlikely(null_trap_bounce(curr, tb)) ) { - gprintk(XENLOG_WARNING, - "Unhandled %s fault/trap [#%d, ec=%04x]\n", - trapstr(vector), vector, error_code); + gprintk(XENLOG_ERR, + "Unhandled: vec %u, %s[%04x]\n", + vector, vector_name(vector), error_code); if ( vector == TRAP_page_fault ) show_page_walk(event->cr2); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 581d8be2aa..485bd66971 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -767,21 +767,7 @@ static int nmi_show_execution_state(const struct cpu_user_regs *regs, int cpu) return 1; } -const char *trapstr(unsigned int trapnr) -{ - static const char * const strings[] = { - "divide error", "debug", "nmi", "bkpt", "overflow", "bounds", - "invalid opcode", "device not available", "double fault", - "coprocessor segment", "invalid tss", "segment not found", - "stack error", "general protection fault", "page fault", - "spurious interrupt", "coprocessor error", "alignment check", - "machine check", "simd error", "virtualisation exception" - }; - - return trapnr < ARRAY_SIZE(strings) ? strings[trapnr] : "???"; -} - -static const char *vec_name(unsigned int vec) +const char *vector_name(unsigned int vec) { static const char names[][4] = { #define P(x) [X86_EXC_ ## x] = "#" #x @@ -855,7 +841,7 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) } panic("FATAL TRAP: vec %u, %s[%04x]%s\n", - trapnr, vec_name(trapnr), regs->error_code, + trapnr, vector_name(trapnr), regs->error_code, (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } @@ -866,9 +852,7 @@ void do_unhandled_trap(struct cpu_user_regs *regs) if ( debugger_trap_fatal(trapnr, regs) ) return; - show_execution_state(regs); - panic("FATAL RESERVED TRAP: vec %u, %s[%04x]\n", - trapnr, vec_name(trapnr), regs->error_code); + fatal_trap(regs, false); } static void fixup_exception_return(struct cpu_user_regs *regs, @@ -942,7 +926,7 @@ static bool extable_fixup(struct cpu_user_regs *regs, bool print) */ if ( IS_ENABLED(CONFIG_DEBUG) && print ) printk(XENLOG_GUEST XENLOG_WARNING "Fixup %s[%04x]: %p [%ps] -> %p\n", - vec_name(regs->entry_vector), regs->error_code, + vector_name(regs->entry_vector), regs->error_code, _p(regs->rip), _p(regs->rip), _p(fixup)); fixup_exception_return(regs, fixup); @@ -978,10 +962,7 @@ void do_trap(struct cpu_user_regs *regs) if ( debugger_trap_fatal(trapnr, regs) ) return; - show_execution_state(regs); - panic("FATAL TRAP: vector = %d (%s)\n" - "[error_code=%04x]\n", - trapnr, trapstr(trapnr), regs->error_code); + fatal_trap(regs, false); } int guest_rdmsr_xen(const struct vcpu *v, uint32_t idx, uint64_t *val) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 09:44:11 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 09:44:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250261.431072 (Exim 4.92) (envelope-from ) id 1mzbgk-00037O-4B; Tue, 21 Dec 2021 09:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250261.431072; Tue, 21 Dec 2021 09:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzbgk-00037G-17; Tue, 21 Dec 2021 09:44:06 +0000 Received: by outflank-mailman (input) for mailman id 250261; Tue, 21 Dec 2021 09:44:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzbgi-00037A-W2 for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 09:44:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzbgi-0005gF-Nv for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 09:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzbgi-0002Z1-Mg for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 09:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xWqo8Nw6GFmzBmcioFPBPdi1sXUZ/AJrnT1z8L4cA/s=; b=jXJIn5WDCxWXwNnQKuA5W1bs/N L8nTdGhRsgDD1VfoyM8/++bc8fnCEgIK1Miu+n6f9/6BpFBd50rpeU6RtF9WvPL3RDzgzAFoweoUw 7vj7gdigG9dkkplhV2FBT2KFVxxamRf360IW5S/x1ZhZUgHSUtiwhYYdV7HwNcE59X9E=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] x86/perfc: conditionalize HVM and shadow counters Message-Id: Date: Tue, 21 Dec 2021 09:44:04 +0000 commit fa2f4c39c48f975ae1b87247fa2f71673e2838ca Author: Jan Beulich AuthorDate: Tue Dec 21 10:38:18 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 21 10:38:18 2021 +0100 x86/perfc: conditionalize HVM and shadow counters There's no point including them when the respective functionality isn't enabled in the build. Note that this covers only larger groups; more fine grained exclusion may want to be done later on. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/perfc_defn.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/include/asm/perfc_defn.h b/xen/arch/x86/include/asm/perfc_defn.h index 1a9ea3f89e..a98df515d9 100644 --- a/xen/arch/x86/include/asm/perfc_defn.h +++ b/xen/arch/x86/include/asm/perfc_defn.h @@ -4,6 +4,8 @@ PERFCOUNTER_ARRAY(exceptions, "exceptions", 32) +#ifdef CONFIG_HVM + #define VMX_PERF_EXIT_REASON_SIZE 56 #define VMX_PERF_VECTOR_SIZE 0x20 PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SIZE) @@ -13,6 +15,8 @@ PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SIZE) #define SVM_PERF_EXIT_REASON_SIZE (1+141) PERFCOUNTER_ARRAY(svmexits, "SVMexits", SVM_PERF_EXIT_REASON_SIZE) +#endif /* CONFIG_HVM */ + PERFCOUNTER(seg_fixups, "segmentation fixups") PERFCOUNTER(apic_timer, "apic timer interrupts") @@ -37,6 +41,8 @@ PERFCOUNTER(exception_fixed, "pre-exception fixed") PERFCOUNTER(guest_walk, "guest pagetable walks") /* Shadow counters */ +#ifdef CONFIG_SHADOW_PAGING + PERFCOUNTER(shadow_alloc, "calls to shadow_alloc") PERFCOUNTER(shadow_alloc_tlbflush, "shadow_alloc flushed TLBs") @@ -112,6 +118,8 @@ PERFCOUNTER(shadow_unsync, "shadow OOS unsyncs") PERFCOUNTER(shadow_unsync_evict, "shadow OOS evictions") PERFCOUNTER(shadow_resync, "shadow OOS resyncs") +#endif /* CONFIG_SHADOW_PAGING */ + PERFCOUNTER(realmode_emulations, "realmode instructions emulated") PERFCOUNTER(realmode_exits, "vmexits from realmode") -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 09:44:16 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 09:44:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250262.431076 (Exim 4.92) (envelope-from ) id 1mzbgu-00039F-5c; Tue, 21 Dec 2021 09:44:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250262.431076; Tue, 21 Dec 2021 09:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzbgu-000397-2e; Tue, 21 Dec 2021 09:44:16 +0000 Received: by outflank-mailman (input) for mailman id 250262; Tue, 21 Dec 2021 09:44:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzbgs-00038v-SW for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 09:44:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzbgs-0005gJ-Rn for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 09:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzbgs-0002aO-QQ for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 09:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4m03Xl5klPRr83XxTlW2Ow/XEscS1PqbXP+sWz6eUx4=; b=1LsgqeFed6LAT2Iq+opFJ7uVG+ iSAkdSSeGRGXEePnLeKc1g/8nZNVtOm332RAxn7xGzJ4d4LJBCnkLSxgz1XpBByHvAWPWwkqkgkCi 5neFLqkPM88UlZl/Smi6bDVEd4882618rqRmkaILG4r5QNJG+0jhZhXWOvKI7IfJIUuQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen staging] mm: introduce INVALID_{G,M}FN_RAW Message-Id: Date: Tue, 21 Dec 2021 09:44:14 +0000 commit f1e268b9fd13647e1f69c8ce0ae7be401d319fc8 Author: Jan Beulich AuthorDate: Tue Dec 21 10:42:02 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 21 10:42:02 2021 +0100 mm: introduce INVALID_{G,M}FN_RAW This allows properly tying together INVALID_{G,M}FN and INVALID_{G,M}FN_INITIALIZER as well as using the actual values in compile time constant expressions (or even preprocessor directives). Since INVALID_PFN is unused, and with x86'es paging_mark_pfn_dirty() being the only user of pfn_t it also doesn't seem likely that new uses would appear, remove that one at this same occasion. Signed-off-by: Jan Beulich Reviewed-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall --- xen/include/xen/mm-frame.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/include/xen/mm-frame.h b/xen/include/xen/mm-frame.h index f3b1dac3d6..0105ed0130 100644 --- a/xen/include/xen/mm-frame.h +++ b/xen/include/xen/mm-frame.h @@ -6,12 +6,13 @@ TYPE_SAFE(unsigned long, mfn); #define PRI_mfn "05lx" -#define INVALID_MFN _mfn(~0UL) +#define INVALID_MFN_RAW (~0UL) +#define INVALID_MFN _mfn(INVALID_MFN_RAW) /* * To be used for global variable initialization. This workaround a bug * in GCC < 5.0. */ -#define INVALID_MFN_INITIALIZER { ~0UL } +#define INVALID_MFN_INITIALIZER { INVALID_MFN_RAW } #ifndef mfn_t #define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ @@ -44,12 +45,13 @@ static inline bool_t mfn_eq(mfn_t x, mfn_t y) TYPE_SAFE(unsigned long, gfn); #define PRI_gfn "05lx" -#define INVALID_GFN _gfn(~0UL) +#define INVALID_GFN_RAW (~0UL) +#define INVALID_GFN _gfn(INVALID_GFN_RAW) /* * To be used for global variable initialization. This workaround a bug * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64856 */ -#define INVALID_GFN_INITIALIZER { ~0UL } +#define INVALID_GFN_INITIALIZER { INVALID_GFN_RAW } #ifndef gfn_t #define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ @@ -82,7 +84,6 @@ static inline bool_t gfn_eq(gfn_t x, gfn_t y) TYPE_SAFE(unsigned long, pfn); #define PRI_pfn "05lx" -#define INVALID_PFN (~0UL) #ifndef pfn_t #define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:00:07 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:00:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250301.431126 (Exim 4.92) (envelope-from ) id 1mzcsF-0004pq-3Y; Tue, 21 Dec 2021 11:00:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250301.431126; Tue, 21 Dec 2021 11:00:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsF-0004pO-0N; Tue, 21 Dec 2021 11:00:03 +0000 Received: by outflank-mailman (input) for mailman id 250301; Tue, 21 Dec 2021 11:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsE-0004ji-G3 for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsE-000723-Ca for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzcsE-0008Rc-BA for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f+KWa95PjFksFXX30M9amSOMM+vO/4xzR/dUEFtiUpE=; b=LHHj0xm5AGYu319TUZP00x4hgM ssT4PmJtSnLW/Z87zbyr1tDbIDF6RQ1DmaWjT4lcmWMD7ATRgSbMW+Jvl6llO4E1Vylp0sAcHr84f NZ5LoQjvnu0bCr48Ipc2oIQOfuxosZmoLaDs3IL/gCcQSuWcVPUhbUHBDyv21HbrljhQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: split e820 map handling into new source file Message-Id: Date: Tue, 21 Dec 2021 11:00:02 +0000 commit bcdc9f77805812d0fcf594a90a2306a850deb705 Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:27 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: split e820 map handling into new source file Introduce e820.c containing all the E820 memory map handling. No functional change. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- Makefile | 1 + arch/arm/mm.c | 8 ---- arch/x86/mm.c | 70 +-------------------------------- e820.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/e820.h | 6 +++ 5 files changed, 128 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index 4b76b55..06b60fc 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ src-$(CONFIG_TPMFRONT) += tpmfront.c src-$(CONFIG_TPM_TIS) += tpm_tis.c src-$(CONFIG_TPMBACK) += tpmback.c src-y += daytime.c +src-y += e820.c src-y += events.c src-$(CONFIG_FBFRONT) += fbfront.c src-y += gntmap.c diff --git a/arch/arm/mm.c b/arch/arm/mm.c index f806c9f..9068166 100644 --- a/arch/arm/mm.c +++ b/arch/arm/mm.c @@ -7,14 +7,6 @@ #include uint32_t physical_address_offset; -struct e820entry e820_map[1] = { - { - .addr = 0, - .size = ULONG_MAX - 1, - .type = E820_RAM - } -}; -unsigned e820_entries = 1; unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) { diff --git a/arch/x86/mm.c b/arch/x86/mm.c index 8ba14a5..8df93da 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -64,15 +64,6 @@ extern char stack[]; extern void page_walk(unsigned long va); #ifdef CONFIG_PARAVIRT -struct e820entry e820_map[1] = { - { - .addr = 0, - .size = ULONG_MAX - 1, - .type = E820_RAM - } -}; -unsigned e820_entries = 1; - void arch_mm_preinit(void *p) { start_info_t *si = p; @@ -112,25 +103,11 @@ desc_ptr idt_ptr = .base = (unsigned long)&idt, }; -struct e820entry e820_map[E820_MAX]; -unsigned e820_entries; - -static char *e820_types[E820_TYPES] = { - [E820_RAM] = "RAM", - [E820_RESERVED] = "Reserved", - [E820_ACPI] = "ACPI", - [E820_NVS] = "NVS", - [E820_UNUSABLE] = "Unusable", - [E820_PMEM] = "PMEM" -}; - void arch_mm_preinit(void *p) { long ret; domid_t domid = DOMID_SELF; - struct xen_memory_map memmap; - int i; - unsigned long pfn, max = 0; + unsigned long max; pt_base = page_table_base; first_free_pfn = PFN_UP(to_phys(&_end)); @@ -142,53 +119,10 @@ void arch_mm_preinit(void *p) } last_free_pfn = ret; - memmap.nr_entries = E820_MAX; - set_xen_guest_handle(memmap.buffer, e820_map); - ret = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); - if ( ret < 0 ) - { - xprintk("could not get memory map\n"); - do_exit(); - } - e820_entries = memmap.nr_entries; - - for ( i = 0; i < e820_entries; i++ ) - { - if ( e820_map[i].type != E820_RAM ) - continue; - pfn = (e820_map[i].addr + e820_map[i].size) >> PAGE_SHIFT; - if ( pfn > max ) - max = pfn; - } - + max = e820_get_maxpfn(); if ( max < last_free_pfn ) last_free_pfn = max; } - -void arch_print_memmap(void) -{ - int i; - unsigned long from, to; - char *type; - char buf[12]; - - printk("Memory map:\n"); - for ( i = 0; i < e820_entries; i++ ) - { - if ( e820_map[i].type >= E820_TYPES || !e820_types[e820_map[i].type] ) - { - snprintf(buf, sizeof(buf), "%8x", e820_map[i].type); - type = buf; - } - else - { - type = e820_types[e820_map[i].type]; - } - from = e820_map[i].addr; - to = from + e820_map[i].size - 1; - printk("%012lx-%012lx: %s\n", from, to, type); - } -} #endif /* diff --git a/e820.c b/e820.c new file mode 100644 index 0000000..2165280 --- /dev/null +++ b/e820.c @@ -0,0 +1,119 @@ +/* -*- Mode:C; c-basic-offset:4; tab-width:4 -*- + * + * (C) 2021 - Juergen Gross, SUSE Software Solutions Germany GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef CONFIG_E820_TRIVIAL +struct e820entry e820_map[1] = { + { + .addr = 0, + .size = ULONG_MAX - 1, + .type = E820_RAM + } +}; + +unsigned e820_entries = 1; + +static void e820_get_memmap(void) +{ +} + +#else +struct e820entry e820_map[E820_MAX]; +unsigned e820_entries; + +static char *e820_types[E820_TYPES] = { + [E820_RAM] = "RAM", + [E820_RESERVED] = "Reserved", + [E820_ACPI] = "ACPI", + [E820_NVS] = "NVS", + [E820_UNUSABLE] = "Unusable", + [E820_PMEM] = "PMEM" +}; + +static void e820_get_memmap(void) +{ + long ret; + struct xen_memory_map memmap; + + memmap.nr_entries = E820_MAX; + set_xen_guest_handle(memmap.buffer, e820_map); + ret = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); + if ( ret < 0 ) + { + xprintk("could not get memory map\n"); + do_exit(); + } + e820_entries = memmap.nr_entries; +} + +void arch_print_memmap(void) +{ + int i; + unsigned long from, to; + char *type; + char buf[12]; + + printk("Memory map:\n"); + for ( i = 0; i < e820_entries; i++ ) + { + if ( e820_map[i].type >= E820_TYPES || !e820_types[e820_map[i].type] ) + { + snprintf(buf, sizeof(buf), "%8x", e820_map[i].type); + type = buf; + } + else + { + type = e820_types[e820_map[i].type]; + } + from = e820_map[i].addr; + to = from + e820_map[i].size - 1; + printk("%012lx-%012lx: %s\n", from, to, type); + } +} +#endif + +unsigned long e820_get_maxpfn(void) +{ + int i; + unsigned long pfn, max = 0; + + e820_get_memmap(); + + for ( i = 0; i < e820_entries; i++ ) + { + if ( e820_map[i].type != E820_RAM ) + continue; + pfn = (e820_map[i].addr + e820_map[i].size) >> PAGE_SHIFT; + if ( pfn > max ) + max = pfn; + } + + return max; +} diff --git a/include/e820.h b/include/e820.h index 920551c..af2129f 100644 --- a/include/e820.h +++ b/include/e820.h @@ -24,6 +24,10 @@ #ifndef __E820_HEADER #define __E820_HEADER +#if defined(__arm__) || defined(__aarch64__) || defined(CONFIG_PARAVIRT) +#define CONFIG_E820_TRIVIAL +#endif + /* PC BIOS standard E820 types and structure. */ #define E820_RAM 1 #define E820_RESERVED 2 @@ -45,4 +49,6 @@ struct __packed e820entry { extern struct e820entry e820_map[]; extern unsigned e820_entries; +unsigned long e820_get_maxpfn(void); + #endif /*__E820_HEADER*/ -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:00:13 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250302.431131 (Exim 4.92) (envelope-from ) id 1mzcsP-0005MG-56; Tue, 21 Dec 2021 11:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250302.431131; Tue, 21 Dec 2021 11:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsP-0005M8-1w; Tue, 21 Dec 2021 11:00:13 +0000 Received: by outflank-mailman (input) for mailman id 250302; Tue, 21 Dec 2021 11:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsO-0005M0-Hg for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsO-00072T-Gx for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzcsO-0008Sz-Ev for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oAtgVCjUkofCFaW5ThgoM4SQPLqoqx8BSLnWY22kylA=; b=DvrNqMxxjgC2WbnYZ4yOTaPNRf bGm6fGchHdKS4bkNmAr8U6/pjMDt+iZRph84R4ldhnwwEZKr4NqN9pDu6YWFfBkopHkH2s2IAjszL MADpJqzuG4LjKRhCB2430mSl+pbTe79u5qMOH/xT/ephiQWdP3bn1VgiKr7lIbwCOg4A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: sort and sanitize e820 memory map Message-Id: Date: Tue, 21 Dec 2021 11:00:12 +0000 commit 8886c987d36960df8918517efcb014b453e168b1 Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:28 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: sort and sanitize e820 memory map Do some processing of the E820 memory map obtained from the hypervisor: - align the entries to page boundaries - sort the entries by their start address - merge adjacent entries of same type This is relevant for PVH mode only. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- e820.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/e820.c b/e820.c index 2165280..70286cb 100644 --- a/e820.c +++ b/e820.c @@ -57,6 +57,190 @@ static char *e820_types[E820_TYPES] = { [E820_PMEM] = "PMEM" }; +/* + * E820 type based bitmask for deciding how to round entries to page + * boundaries: A set bit means the type relates to a resource managed by + * Mini-OS (e.g. RAM), so rounding needs to be done to only include pages + * completely of the related type (narrowing). All other types need to be + * rounded to include all pages with parts of that type (widening). + */ +#define E820_NARROW ((1U << E820_RAM) | (1U << E820_NVS) | (1 << E820_PMEM)) + +/* Private type used to mark a range temporarily as reserved (lowest prio). */ +#define E820_TMP_RESERVED 0 + +static void e820_remove_entry(int idx) +{ + int i; + + e820_entries--; + for ( i = idx; i < e820_entries; i++ ) + e820_map[i] = e820_map[i + 1]; +} + +static void e820_insert_entry_at(int idx, unsigned long addr, + unsigned long size, unsigned int type) +{ + int i; + + if ( e820_entries == E820_MAX ) + { + xprintk("E820 memory map overflow\n"); + do_exit(); + } + + e820_entries++; + for ( i = e820_entries - 1; i > idx; i-- ) + e820_map[i] = e820_map[i - 1]; + + e820_map[idx].addr = addr; + e820_map[idx].size = size; + e820_map[idx].type = type; +} + +static void e820_insert_entry(unsigned long addr, unsigned long size, + unsigned int type) +{ + int i; + + for ( i = 0; i < e820_entries && addr > e820_map[i].addr; i++ ); + + e820_insert_entry_at(i, addr, size, type); +} + +static void e820_swap_entries(int idx1, int idx2) +{ + struct e820entry entry; + + entry = e820_map[idx1]; + e820_map[idx1] = e820_map[idx2]; + e820_map[idx2] = entry; +} + +/* + * Do a memory map sanitizing sweep: + * - sort the entries by start address + * - remove overlaps of entries (higher type value wins) + * - merge adjacent entries of same type + */ +static void e820_process_entries(void) +{ + int i, j; + unsigned long end, start; + unsigned int type; + + /* Sort entries. */ + for ( i = 1; i < e820_entries; i++ ) + for ( j = i; j > 0 && e820_map[j - 1].addr > e820_map[j].addr; j-- ) + e820_swap_entries(j - 1, j); + + /* Handle overlapping entries (higher type values win). */ + for ( i = 1; i < e820_entries; i++ ) + { + if ( e820_map[i - 1].addr + e820_map[i - 1].size <= e820_map[i].addr ) + continue; + if ( e820_map[i - 1].addr < e820_map[i].addr ) + { + e820_insert_entry_at(i - 1, e820_map[i - 1].addr, + e820_map[i].addr - e820_map[i - 1].addr, + e820_map[i - 1].type); + e820_map[i].addr += e820_map[i - 1].size; + e820_map[i].size -= e820_map[i - 1].size; + i++; + } + if ( e820_map[i - 1].type < e820_map[i].type ) + e820_swap_entries(i - 1, i); + if ( e820_map[i - 1].size >= e820_map[i].size ) + { + e820_remove_entry(i); + i--; + } + else + { + start = e820_map[i].addr + e820_map[i - 1].size; + end = e820_map[i].addr + e820_map[i].size; + type = e820_map[i].type; + e820_remove_entry(i); + e820_insert_entry(start, end - start, type); + } + } + + /* Merge adjacent entries. */ + for ( i = 0; i < e820_entries - 1; i++ ) + { + if ( e820_map[i].type == e820_map[i + 1].type && + e820_map[i].addr + e820_map[i].size >= e820_map[i + 1].addr ) + { + if ( e820_map[i].addr + e820_map[i].size < + e820_map[i + 1].addr + e820_map[i + 1].size ) + { + e820_map[i].size = e820_map[i + 1].addr - e820_map[i].addr + + e820_map[i + 1].size; + } + e820_remove_entry(i + 1); + i--; + } + } +} + +/* + * Transform memory map into a well sorted map without any overlaps. + * - sort map entries by start address + * - handle overlaps + * - merge adjacent entries of same type (possibly removing boundary in the + * middle of a page) + * - trim entries to page boundaries (depending on type either expanding + * the entry or narrowing it down) + * - repeat first 3 sanitizing steps + * - make remaining temporarily reserved entries permanently reserved + */ +static void e820_sanitize(void) +{ + int i; + unsigned long end, start; + + /* Sanitize memory map in current form. */ + e820_process_entries(); + + /* Adjust map entries to page boundaries. */ + for ( i = 0; i < e820_entries; i++ ) + { + start = e820_map[i].addr; + end = start + e820_map[i].size; + if ( (1U << e820_map[i].type) & E820_NARROW ) + { + if ( start & (PAGE_SIZE - 1) ) + { + start = round_pgup(start); + e820_insert_entry_at(i, start - PAGE_SIZE, PAGE_SIZE, + E820_TMP_RESERVED); + i++; + } + if ( end & (PAGE_SIZE - 1) ) + { + end = round_pgdown(end); + e820_insert_entry_at(i + 1, end, PAGE_SIZE, E820_TMP_RESERVED); + i++; + } + } + else + { + start = round_pgdown(start); + end = round_pgup(end); + } + e820_map[i].addr = start; + e820_map[i].size = end - start; + } + + /* Sanitize memory map (again). */ + e820_process_entries(); + + /* Make remaining temporarily reserved entries permanently reserved. */ + for ( i = 0; i < e820_entries; i++ ) + if ( e820_map[i].type == E820_TMP_RESERVED ) + e820_map[i].type = E820_RESERVED; +} + static void e820_get_memmap(void) { long ret; @@ -71,6 +255,8 @@ static void e820_get_memmap(void) do_exit(); } e820_entries = memmap.nr_entries; + + e820_sanitize(); } void arch_print_memmap(void) -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:00:23 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250303.431135 (Exim 4.92) (envelope-from ) id 1mzcsZ-0005P9-6h; Tue, 21 Dec 2021 11:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250303.431135; Tue, 21 Dec 2021 11:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsZ-0005P1-3e; Tue, 21 Dec 2021 11:00:23 +0000 Received: by outflank-mailman (input) for mailman id 250303; Tue, 21 Dec 2021 11:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsY-0005Ou-LA for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsY-00072n-KN for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzcsY-0008Te-JF for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lIrSxCAYDJOqeFJIZ3k8wf6bfLoIoi0nbUikw+hci0g=; b=wF2EXDD+BhVsPaeCBiERwdA4I3 OMyGRpln7HRRbEVGtpq2zFMszOG1/42lLEs4M3NgFqgo0KYU9OwPl3Lp7GwrN5aEaxQ7JVs7zN1FA /HgxEvrqqCIgFp6wKMmm1iMby4VD+2aqIWs/PWv9n/aKVfurEE4k+mhhG3CjdioqcpUU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: don't assume contiguous RAM when initializing in PVH mode Message-Id: Date: Tue, 21 Dec 2021 11:00:22 +0000 commit e754e3fae198480789fe6d949087e6580f4f614b Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:29 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: don't assume contiguous RAM when initializing in PVH mode Sizing the available memory should respect memory holes, so look at the memory map when setting the boundary for the memory allocator. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- arch/x86/mm.c | 6 +----- e820.c | 14 ++++++++------ include/e820.h | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/x86/mm.c b/arch/x86/mm.c index 8df93da..3bf6170 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -107,7 +107,6 @@ void arch_mm_preinit(void *p) { long ret; domid_t domid = DOMID_SELF; - unsigned long max; pt_base = page_table_base; first_free_pfn = PFN_UP(to_phys(&_end)); @@ -117,11 +116,8 @@ void arch_mm_preinit(void *p) xprintk("could not get memory size\n"); do_exit(); } - last_free_pfn = ret; - max = e820_get_maxpfn(); - if ( max < last_free_pfn ) - last_free_pfn = max; + last_free_pfn = e820_get_maxpfn(ret); } #endif diff --git a/e820.c b/e820.c index 70286cb..4c726d1 100644 --- a/e820.c +++ b/e820.c @@ -285,10 +285,10 @@ void arch_print_memmap(void) } #endif -unsigned long e820_get_maxpfn(void) +unsigned long e820_get_maxpfn(unsigned long pages) { int i; - unsigned long pfn, max = 0; + unsigned long pfns = 0, start = 0; e820_get_memmap(); @@ -296,10 +296,12 @@ unsigned long e820_get_maxpfn(void) { if ( e820_map[i].type != E820_RAM ) continue; - pfn = (e820_map[i].addr + e820_map[i].size) >> PAGE_SHIFT; - if ( pfn > max ) - max = pfn; + pfns = e820_map[i].size >> PAGE_SHIFT; + start = e820_map[i].addr >> PAGE_SHIFT; + if ( pages <= pfns ) + return start + pages; + pages -= pfns; } - return max; + return start + pfns; } diff --git a/include/e820.h b/include/e820.h index af2129f..6a57f05 100644 --- a/include/e820.h +++ b/include/e820.h @@ -49,6 +49,6 @@ struct __packed e820entry { extern struct e820entry e820_map[]; extern unsigned e820_entries; -unsigned long e820_get_maxpfn(void); +unsigned long e820_get_maxpfn(unsigned long pages); #endif /*__E820_HEADER*/ -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:00:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:00:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250304.431139 (Exim 4.92) (envelope-from ) id 1mzcsk-0005SW-9W; Tue, 21 Dec 2021 11:00:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250304.431139; Tue, 21 Dec 2021 11:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsk-0005SO-6b; Tue, 21 Dec 2021 11:00:34 +0000 Received: by outflank-mailman (input) for mailman id 250304; Tue, 21 Dec 2021 11:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsi-0005S9-Og for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsi-000733-Nv for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzcsi-0008Uc-Mm for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NEXJkZbfGY1Zg/HFlKjJW2xq69rVgJfSgCFitYv6fqY=; b=Vg2fx/xnwygaMXoIbMIS1r1dQR CnAXZxTy3wj0G6YTLBC4bbf9f5qOiwFyxqZMT2kk/XgY+12+gqCvzmsBb6+nfqSUmNuXL3KUPqtlc w+HJlLe9cHtkqcPa1sMa1r5MFkSVRwbockzvPF8lcvyS7S1+VNHO+kYYCgN240keO1ac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: respect memory map when ballooning up Message-Id: Date: Tue, 21 Dec 2021 11:00:32 +0000 commit 4fbd7b94482f1b254e6b05625fe5f2758a9fe84f Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:30 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: respect memory map when ballooning up Today Mini-OS won't look at the memory map when ballooning up. This can result in problems for PVH domains with more than 4 GB of RAM, as ballooning will happily run into the ACPI area. Fix that by adding only pages being marked as RAM in the memory map and by distinguishing between the current number of RAM pages and the first unallocated page. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- arch/arm/mm.c | 3 +++ arch/x86/balloon.c | 4 ++-- arch/x86/mm.c | 2 ++ balloon.c | 33 ++++++++++++++++++++++++--------- e820.c | 21 ++++++++++++++++++++- include/balloon.h | 5 +++-- include/e820.h | 1 + mm.c | 7 ++----- 8 files changed, 57 insertions(+), 19 deletions(-) diff --git a/arch/arm/mm.c b/arch/arm/mm.c index 9068166..11962f8 100644 --- a/arch/arm/mm.c +++ b/arch/arm/mm.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -70,6 +71,8 @@ void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) } device_tree = new_device_tree; *max_pfn_p = to_phys(new_device_tree) >> PAGE_SHIFT; + + balloon_set_nr_pages(*max_pfn_p, *max_pfn_p); } void arch_init_demand_mapping_area(void) diff --git a/arch/x86/balloon.c b/arch/x86/balloon.c index 10b440c..fe79644 100644 --- a/arch/x86/balloon.c +++ b/arch/x86/balloon.c @@ -61,10 +61,10 @@ void arch_remap_p2m(unsigned long max_pfn) p2m_invalidate(l2_list, L2_P2M_IDX(max_pfn - 1) + 1); p2m_invalidate(l1_list, L1_P2M_IDX(max_pfn - 1) + 1); - if ( p2m_pages(nr_max_pages) <= p2m_pages(max_pfn) ) + if ( p2m_pages(nr_max_pfn) <= p2m_pages(max_pfn) ) return; - new_p2m = alloc_virt_kernel(p2m_pages(nr_max_pages)); + new_p2m = alloc_virt_kernel(p2m_pages(nr_max_pfn)); for ( pfn = 0; pfn < max_pfn; pfn += P2M_ENTRIES ) { map_frame_rw(new_p2m + PAGE_SIZE * (pfn / P2M_ENTRIES), diff --git a/arch/x86/mm.c b/arch/x86/mm.c index 3bf6170..c30d8bc 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -72,6 +72,7 @@ void arch_mm_preinit(void *p) pt_base = (pgentry_t *)si->pt_base; first_free_pfn = PFN_UP(to_phys(pt_base)) + si->nr_pt_frames; last_free_pfn = si->nr_pages; + balloon_set_nr_pages(last_free_pfn, last_free_pfn); } #else #include @@ -118,6 +119,7 @@ void arch_mm_preinit(void *p) } last_free_pfn = e820_get_maxpfn(ret); + balloon_set_nr_pages(ret, last_free_pfn); } #endif diff --git a/balloon.c b/balloon.c index 5676d3b..9dc77c5 100644 --- a/balloon.c +++ b/balloon.c @@ -23,14 +23,24 @@ #include #include +#include #include #include #include #include #include -unsigned long nr_max_pages; -unsigned long nr_mem_pages; +unsigned long nr_max_pfn; + +static unsigned long nr_max_pages; +static unsigned long nr_mem_pfn; +static unsigned long nr_mem_pages; + +void balloon_set_nr_pages(unsigned long pages, unsigned long pfn) +{ + nr_mem_pages = pages; + nr_mem_pfn = pfn; +} void get_max_pages(void) { @@ -46,16 +56,18 @@ void get_max_pages(void) nr_max_pages = ret; printk("Maximum memory size: %ld pages\n", nr_max_pages); + + nr_max_pfn = e820_get_maxpfn(nr_max_pages); } void mm_alloc_bitmap_remap(void) { unsigned long i, new_bitmap; - if ( mm_alloc_bitmap_size >= ((nr_max_pages + 1) >> 3) ) + if ( mm_alloc_bitmap_size >= ((nr_max_pfn + 1) >> 3) ) return; - new_bitmap = alloc_virt_kernel(PFN_UP((nr_max_pages + 1) >> 3)); + new_bitmap = alloc_virt_kernel(PFN_UP((nr_max_pfn + 1) >> 3)); for ( i = 0; i < mm_alloc_bitmap_size; i += PAGE_SIZE ) { map_frame_rw(new_bitmap + i, @@ -70,7 +82,7 @@ static unsigned long balloon_frames[N_BALLOON_FRAMES]; int balloon_up(unsigned long n_pages) { - unsigned long page, pfn; + unsigned long page, pfn, start_pfn; int rc; struct xen_memory_reservation reservation = { .domid = DOMID_SELF @@ -81,8 +93,11 @@ int balloon_up(unsigned long n_pages) if ( n_pages > N_BALLOON_FRAMES ) n_pages = N_BALLOON_FRAMES; + start_pfn = e820_get_maxpfn(nr_mem_pages + 1) - 1; + n_pages = e820_get_max_contig_pages(start_pfn, n_pages); + /* Resize alloc_bitmap if necessary. */ - while ( mm_alloc_bitmap_size * 8 < nr_mem_pages + n_pages ) + while ( mm_alloc_bitmap_size * 8 < start_pfn + n_pages ) { page = alloc_page(); if ( !page ) @@ -99,14 +114,14 @@ int balloon_up(unsigned long n_pages) mm_alloc_bitmap_size += PAGE_SIZE; } - rc = arch_expand_p2m(nr_mem_pages + n_pages); + rc = arch_expand_p2m(start_pfn + n_pages); if ( rc ) return rc; /* Get new memory from hypervisor. */ for ( pfn = 0; pfn < n_pages; pfn++ ) { - balloon_frames[pfn] = nr_mem_pages + pfn; + balloon_frames[pfn] = start_pfn + pfn; } set_xen_guest_handle(reservation.extent_start, balloon_frames); reservation.nr_extents = n_pages; @@ -116,7 +131,7 @@ int balloon_up(unsigned long n_pages) for ( pfn = 0; pfn < rc; pfn++ ) { - arch_pfn_add(nr_mem_pages + pfn, balloon_frames[pfn]); + arch_pfn_add(start_pfn + pfn, balloon_frames[pfn]); free_page(pfn_to_virt(nr_mem_pages + pfn)); } diff --git a/e820.c b/e820.c index 4c726d1..d60eb83 100644 --- a/e820.c +++ b/e820.c @@ -290,7 +290,8 @@ unsigned long e820_get_maxpfn(unsigned long pages) int i; unsigned long pfns = 0, start = 0; - e820_get_memmap(); + if ( !e820_entries ) + e820_get_memmap(); for ( i = 0; i < e820_entries; i++ ) { @@ -305,3 +306,21 @@ unsigned long e820_get_maxpfn(unsigned long pages) return start + pfns; } + +unsigned long e820_get_max_contig_pages(unsigned long pfn, unsigned long pages) +{ + int i; + unsigned long end; + + for ( i = 0; i < e820_entries && e820_map[i].addr <= (pfn << PAGE_SHIFT); + i++ ) + { + end = (e820_map[i].addr + e820_map[i].size) >> PAGE_SHIFT; + if ( e820_map[i].type != E820_RAM || end <= pfn ) + continue; + + return ((end - pfn) > pages) ? pages : end - pfn; + } + + return 0; +} diff --git a/include/balloon.h b/include/balloon.h index 6cfec4f..8f7c8bd 100644 --- a/include/balloon.h +++ b/include/balloon.h @@ -32,11 +32,11 @@ */ #define BALLOON_EMERGENCY_PAGES 64 -extern unsigned long nr_max_pages; -extern unsigned long nr_mem_pages; +extern unsigned long nr_max_pfn; void get_max_pages(void); int balloon_up(unsigned long n_pages); +void balloon_set_nr_pages(unsigned long pages, unsigned long pfn); void mm_alloc_bitmap_remap(void); void arch_pfn_add(unsigned long pfn, unsigned long mfn); @@ -50,6 +50,7 @@ static inline int chk_free_pages(unsigned long needed) { return needed <= nr_free_pages; } +static inline balloon_set_nr_pages(unsigned long pages, unsigned long pfn) { } #endif /* CONFIG_BALLOON */ #endif /* _BALLOON_H_ */ diff --git a/include/e820.h b/include/e820.h index 6a57f05..8d4d371 100644 --- a/include/e820.h +++ b/include/e820.h @@ -50,5 +50,6 @@ extern struct e820entry e820_map[]; extern unsigned e820_entries; unsigned long e820_get_maxpfn(unsigned long pages); +unsigned long e820_get_max_contig_pages(unsigned long pfn, unsigned long pages); #endif /*__E820_HEADER*/ diff --git a/mm.c b/mm.c index 932ceeb..6493bdd 100644 --- a/mm.c +++ b/mm.c @@ -396,8 +396,9 @@ void init_mm(void) printk("MM: Init\n"); - get_max_pages(); arch_init_mm(&start_pfn, &max_pfn); + get_max_pages(); + /* * now we can initialise the page allocator */ @@ -407,10 +408,6 @@ void init_mm(void) arch_init_p2m(max_pfn); arch_init_demand_mapping_area(); - -#ifdef CONFIG_BALLOON - nr_mem_pages = max_pfn; -#endif } void fini_mm(void) -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:00:44 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250305.431143 (Exim 4.92) (envelope-from ) id 1mzcsu-0005VK-BG; Tue, 21 Dec 2021 11:00:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250305.431143; Tue, 21 Dec 2021 11:00:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcsu-0005VB-84; Tue, 21 Dec 2021 11:00:44 +0000 Received: by outflank-mailman (input) for mailman id 250305; Tue, 21 Dec 2021 11:00:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcss-0005Ux-Rx for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcss-00073D-RG for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzcss-0008VD-QG for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oClCiNouf32tgMlpKXhXmt5hwzfFNlsrBFzmntu+yBk=; b=2827C1kRsshP/OO1NqZQjKH74E OtIpn5LvltCgtE4bzBjNkjqUUDVcAytj6+crpQA5Wqlo1foi5CoyBnM8Szwh0p9y6ZRvQ9P5yr/Lp uVcmZ2vXzD36tym6lwb+M5D0kVXQQdNc3JREml1qcoUpoDTCixOOL78pXbpLrSKL+HAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: don't repeat definition available via header file Message-Id: Date: Tue, 21 Dec 2021 11:00:42 +0000 commit 7749b0814a194b1853390b4994737e584b0a3ca1 Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:31 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: don't repeat definition available via header file arch/x86/setup.c is repeating the definition of __pte() instead using the appropriate header. Fix that. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- arch/x86/setup.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 1ec68d3..b27bbed 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -29,6 +29,7 @@ #include #include /* for printk, memcpy */ #include +#include #include #include #include @@ -61,13 +62,6 @@ char stack[2*STACK_SIZE]; extern char shared_info[PAGE_SIZE]; -#if defined(__x86_64__) -#define __pte(x) ((pte_t) { (x) } ) -#else -#define __pte(x) ({ unsigned long long _x = (x); \ - ((pte_t) {(unsigned long)(_x), (unsigned long)(_x>>32)}); }) -#endif - static inline void fpu_init(void) { asm volatile("fninit"); } -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:00:54 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:00:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250306.431147 (Exim 4.92) (envelope-from ) id 1mzct4-0005Y8-Cl; Tue, 21 Dec 2021 11:00:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250306.431147; Tue, 21 Dec 2021 11:00:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzct4-0005Y0-9s; Tue, 21 Dec 2021 11:00:54 +0000 Received: by outflank-mailman (input) for mailman id 250306; Tue, 21 Dec 2021 11:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzct2-0005Xi-Uv for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzct2-00073O-UD for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzct2-0008Vt-TQ for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HAPGoYcd+eUaHibaqsM66dsK6pY4t5A17HbzBC2no+k=; b=ne72pT/8fjHO5BlaQJa36xlNwj TKXrBs4D13G57Ot35ah0NvhmI1Ya8W8zmLbjD+dTNgEdkCX+SdcJKP+rwAELLp+RC2kSHtUN3MoqC 8oLdAkuMvdSbC9A9epTQI4UwnLf+Cy4iUGKPVesyDVIQNjlzYSko37fwobgnBus3ZroU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: add memory map service functions Message-Id: Date: Tue, 21 Dec 2021 11:00:52 +0000 commit a7d27a7332baa5c6a6056084ecc3f3b14f312769 Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:32 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: add memory map service functions Add two functions for adding reserved areas to the memory map and for removing them again. Those will be needed for proper grant table/mapping support in PVH mode. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- e820.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/e820.h | 4 ++++ 2 files changed, 54 insertions(+) diff --git a/e820.c b/e820.c index d60eb83..991ed38 100644 --- a/e820.c +++ b/e820.c @@ -283,6 +283,56 @@ void arch_print_memmap(void) printk("%012lx-%012lx: %s\n", from, to, type); } } + +unsigned long e820_get_reserved_pfns(int pages) +{ + int i; + unsigned long last = 0, needed = (long)pages << PAGE_SHIFT; + + for ( i = 0; i < e820_entries && e820_map[i].addr < last + needed; i++ ) + last = e820_map[i].addr + e820_map[i].size; + + if ( i == 0 || e820_map[i - 1].type != E820_RESERVED ) + e820_insert_entry_at(i, last, needed, E820_RESERVED); + else + e820_map[i - 1].size += needed; + + return last >> PAGE_SHIFT; +} + +void e820_put_reserved_pfns(unsigned long start_pfn, int pages) +{ + int i; + unsigned long addr = start_pfn << PAGE_SHIFT; + unsigned long size = (long)pages << PAGE_SHIFT; + + for ( i = 0; + i < e820_entries && addr >= e820_map[i].addr + e820_map[i].size; + i++ ); + + BUG_ON(i == e820_entries || e820_map[i].type != E820_RESERVED || + addr + size > e820_map[i].addr + e820_map[i].size); + + if ( addr == e820_map[i].addr ) + { + e820_map[i].addr += size; + e820_map[i].size -= size; + if ( e820_map[i].size == 0 ) + e820_remove_entry(i); + return; + } + + if ( addr + size == e820_map[i].addr + e820_map[i].size ) + { + e820_map[i].size -= size; + return; + } + + e820_insert_entry_at(i + 1, addr + size, + e820_map[i].addr + e820_map[i].size - addr - size, + E820_RESERVED); + e820_map[i].size = addr - e820_map[i].addr; +} #endif unsigned long e820_get_maxpfn(unsigned long pages) diff --git a/include/e820.h b/include/e820.h index 8d4d371..aaf2f2c 100644 --- a/include/e820.h +++ b/include/e820.h @@ -51,5 +51,9 @@ extern unsigned e820_entries; unsigned long e820_get_maxpfn(unsigned long pages); unsigned long e820_get_max_contig_pages(unsigned long pfn, unsigned long pages); +#ifndef CONFIG_E820_TRIVIAL +unsigned long e820_get_reserved_pfns(int pages); +void e820_put_reserved_pfns(unsigned long start_pfn, int pages); +#endif #endif /*__E820_HEADER*/ -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:01:04 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250307.431151 (Exim 4.92) (envelope-from ) id 1mzctE-0005bS-E5; Tue, 21 Dec 2021 11:01:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250307.431151; Tue, 21 Dec 2021 11:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctE-0005bK-BH; Tue, 21 Dec 2021 11:01:04 +0000 Received: by outflank-mailman (input) for mailman id 250307; Tue, 21 Dec 2021 11:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctD-0005ar-1q for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctD-00073l-1B for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzctD-00006l-09 for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=/eiBwVkdaB6nLzKBtYBQlNR2v4zZDvaWcF5Fcpr678A=; b=O2wB3yUx+eMRU2SpoZyaYdVmoV tXm29T3H8hHFDRZtKgluSVwIWIN6JZFJrFgoKdyAjDO8xdaShIiKNhjPJY9zisrbmgrTWSTgyJSiJ xoE/NNqDcOw4re2hAQ3JqAW4UYI1aaoEqZU3A4ZovR8eMw6Zo6ZldCsikTarSk1RnEPA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: move x86 specific gnttab coding into arch/x86/gnttab.c Message-Id: Date: Tue, 21 Dec 2021 11:01:03 +0000 commit 253165838e1e0874141d99ef20fb3f7d88dd1bc6 Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:33 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: move x86 specific gnttab coding into arch/x86/gnttab.c Having grant table code in arch/x86/mm.c seems wrong. Move it to the new file arch/x86/gnttab.c, especially as the amount of code is expected to grow further. While doing that replace type casts to pte_t with the more appropriate __pte() macro. No functional change. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- arch/x86/gnttab.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/mm.c | 47 --------------------------------- 2 files changed, 78 insertions(+), 47 deletions(-) diff --git a/arch/x86/gnttab.c b/arch/x86/gnttab.c new file mode 100644 index 0000000..56e59d7 --- /dev/null +++ b/arch/x86/gnttab.c @@ -0,0 +1,78 @@ +/* -*- Mode:C; c-basic-offset:4; tab-width:4 -*- + * + * (C) 2021 - Juergen Gross, SUSE Software Solutions Germany GmbH + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include + +grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames) +{ + struct gnttab_setup_table setup; + unsigned long frames[nr_grant_frames]; + + setup.dom = DOMID_SELF; + setup.nr_frames = nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + return map_frames(frames, nr_grant_frames); +} + +void arch_suspend_gnttab(grant_entry_v1_t *gnttab_table, int nr_grant_frames) +{ +#ifdef CONFIG_PARAVIRT + int i; + + for ( i = 0; i < nr_grant_frames; i++ ) + { + HYPERVISOR_update_va_mapping((unsigned long)gnttab_table + PAGE_SIZE * i, + __pte(0x0 << PAGE_SHIFT), UVMF_INVLPG); + } +#endif + return; +} + +void arch_resume_gnttab(grant_entry_v1_t *gnttab_table, int nr_grant_frames) +{ + struct gnttab_setup_table setup; + unsigned long frames[nr_grant_frames]; +#ifdef CONFIG_PARAVIRT + int i; +#endif + + setup.dom = DOMID_SELF; + setup.nr_frames = nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + +#ifdef CONFIG_PARAVIRT + for ( i = 0; i < nr_grant_frames; i++ ) + { + HYPERVISOR_update_va_mapping((unsigned long)gnttab_table + PAGE_SIZE * i, + __pte((frames[i] << PAGE_SHIFT) | L1_PROT), UVMF_INVLPG); + } +#endif +} diff --git a/arch/x86/mm.c b/arch/x86/mm.c index c30d8bc..220c0b4 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -837,53 +837,6 @@ void arch_init_mm(unsigned long* start_pfn_p, unsigned long* max_pfn_p) #endif } -grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames) -{ - struct gnttab_setup_table setup; - unsigned long frames[nr_grant_frames]; - - setup.dom = DOMID_SELF; - setup.nr_frames = nr_grant_frames; - set_xen_guest_handle(setup.frame_list, frames); - - HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); - return map_frames(frames, nr_grant_frames); -} - -void arch_suspend_gnttab(grant_entry_v1_t *gnttab_table, int nr_grant_frames) -{ -#ifdef CONFIG_PARAVIRT - int i; - - for (i = 0; i < nr_grant_frames; i++) { - HYPERVISOR_update_va_mapping((unsigned long)(((char *)gnttab_table) + PAGE_SIZE * i), - (pte_t){0x0< Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250309.431154 (Exim 4.92) (envelope-from ) id 1mzctO-0005e1-FY; Tue, 21 Dec 2021 11:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250309.431154; Tue, 21 Dec 2021 11:01:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctO-0005dt-Ck; Tue, 21 Dec 2021 11:01:14 +0000 Received: by outflank-mailman (input) for mailman id 250309; Tue, 21 Dec 2021 11:01:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctN-0005de-5G for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctN-00074D-4U for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzctN-00007P-3K for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=gu4SNKPmUrBUZSYfJZyKKqQo3m31t3l1TckxzZXqhYw=; b=SnEukCE/Y/c0WqRVCl1dnVBTAM Nw45HypzNYZ6qELz0J4hHBR6V0WJmAB5UwXVd7dx0BaLJGgQFBUaOfcEl48wM+icYtlJPsGai04Xn Em61/QjCFinl9FUsCW4kVSntXJTIXUk19h8kGbg/jRyEhmrBlu/Qc85oaUbiXw6UfsrI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: add proper pvh grant table handling Message-Id: Date: Tue, 21 Dec 2021 11:01:13 +0000 commit 65bfe41de2018f3ace1b9a7193e785b45bffb38e Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:34 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: add proper pvh grant table handling Grant table initialization for PVH requires some additional actions compared to PV mode. Add those. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- arch/x86/gnttab.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/x86/gnttab.c b/arch/x86/gnttab.c index 56e59d7..281c207 100644 --- a/arch/x86/gnttab.c +++ b/arch/x86/gnttab.c @@ -22,11 +22,15 @@ */ #include +#include +#include #include #include #include #include +#include +#ifdef CONFIG_PARAVIRT grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames) { struct gnttab_setup_table setup; @@ -39,6 +43,33 @@ grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames) HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); return map_frames(frames, nr_grant_frames); } +#else +grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames) +{ + int i, rc; + struct xen_add_to_physmap xatp; + unsigned long pfn; + unsigned long frames[nr_grant_frames]; + + pfn = e820_get_reserved_pfns(nr_grant_frames); + for ( i = 0; i < nr_grant_frames; i++ ) + { + xatp.domid = DOMID_SELF; + xatp.idx = i; + xatp.space = XENMAPSPACE_grant_table; + xatp.gpfn = pfn + i; + rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); + if ( rc ) + { + xprintk("could not init grant table\n"); + do_exit(); + } + frames[i] = pfn + i; + } + + return map_frames(frames, nr_grant_frames); +} +#endif void arch_suspend_gnttab(grant_entry_v1_t *gnttab_table, int nr_grant_frames) { -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:01:24 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250310.431158 (Exim 4.92) (envelope-from ) id 1mzctY-0005hf-IH; Tue, 21 Dec 2021 11:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250310.431158; Tue, 21 Dec 2021 11:01:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctY-0005hQ-FP; Tue, 21 Dec 2021 11:01:24 +0000 Received: by outflank-mailman (input) for mailman id 250310; Tue, 21 Dec 2021 11:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctX-0005h9-87 for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzctX-00074P-7S for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzctX-00008D-6a for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=VlyPIFteOoHbobKXr7PdCqpaM/B4mLArwTtrdoOh/oI=; b=O6Z4uyUp5TiNybSm58ltAwdYc4 lEREJfTSXX425OD2SXPK/kNQDUrg5f5FmlZnE4TDlTCKX8VoaN9o8e3oX10TTLJxeDnNEPPtj9Ghb GsCVjy2dfkTUu5vlXEp29Idc5l7xtOkQQPW5hlAm60MfihW54Yhnyzt0CX2cc64/9xtg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: prepare grantmap entry interface for use by PVH mode Message-Id: Date: Tue, 21 Dec 2021 11:01:23 +0000 commit a210aa07781ea90bdc58bcd6cd05f79a4c021ca4 Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:35 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: prepare grantmap entry interface for use by PVH mode Instead of passing the pointer of a grantmap entry to the _gntmap_[un]map_grant_ref() sub-functions use the map pointer and the entry index instead. This will be needed for PVH mode usage. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- gntmap.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/gntmap.c b/gntmap.c index f6ab3ad..7ae8fe6 100644 --- a/gntmap.c +++ b/gntmap.c @@ -55,36 +55,34 @@ struct gntmap_entry { }; static inline int -gntmap_entry_used(struct gntmap_entry *entry) +gntmap_entry_used(struct gntmap *map, int idx) { - return entry->host_addr != 0; + return map->entries[idx].host_addr != 0; } -static struct gntmap_entry* -gntmap_find_free_entry(struct gntmap *map) +static int gntmap_find_free_entry(struct gntmap *map) { int i; for (i = 0; i < map->nentries; i++) { - if (!gntmap_entry_used(&map->entries[i])) - return &map->entries[i]; + if (!gntmap_entry_used(map, i)) + return i; } DEBUG("(map=%p): all %d entries full", map, map->nentries); - return NULL; + return -1; } -static struct gntmap_entry* -gntmap_find_entry(struct gntmap *map, unsigned long addr) +static int gntmap_find_entry(struct gntmap *map, unsigned long addr) { int i; for (i = 0; i < map->nentries; i++) { if (map->entries[i].host_addr == addr) - return &map->entries[i]; + return i; } - return NULL; + return -1; } int @@ -105,12 +103,13 @@ gntmap_set_max_grants(struct gntmap *map, int count) } static int -_gntmap_map_grant_ref(struct gntmap_entry *entry, +_gntmap_map_grant_ref(struct gntmap *map, int idx, unsigned long host_addr, uint32_t domid, uint32_t ref, int writable) { + struct gntmap_entry *entry = map->entries + idx; struct gnttab_map_grant_ref op; int rc; @@ -135,8 +134,9 @@ _gntmap_map_grant_ref(struct gntmap_entry *entry, } static int -_gntmap_unmap_grant_ref(struct gntmap_entry *entry) +_gntmap_unmap_grant_ref(struct gntmap *map, int idx) { + struct gntmap_entry *entry = map->entries + idx; struct gnttab_unmap_grant_ref op; int rc; @@ -160,19 +160,19 @@ int gntmap_munmap(struct gntmap *map, unsigned long start_address, int count) { int i, rc; - struct gntmap_entry *ent; + int idx; DEBUG("(map=%p, start_address=%lx, count=%d)", map, start_address, count); for (i = 0; i < count; i++) { - ent = gntmap_find_entry(map, start_address + PAGE_SIZE * i); - if (ent == NULL) { + idx = gntmap_find_entry(map, start_address + PAGE_SIZE * i); + if (idx < 0) { printk("gntmap: tried to munmap unknown page\n"); return -EINVAL; } - rc = _gntmap_unmap_grant_ref(ent); + rc = _gntmap_unmap_grant_ref(map, idx); if (rc != 0) return rc; } @@ -189,7 +189,7 @@ gntmap_map_grant_refs(struct gntmap *map, int writable) { unsigned long addr; - struct gntmap_entry *ent; + int idx; int i; DEBUG("(map=%p, count=%" PRIu32 ", " @@ -206,9 +206,9 @@ gntmap_map_grant_refs(struct gntmap *map, return NULL; for (i = 0; i < count; i++) { - ent = gntmap_find_free_entry(map); - if (ent == NULL || - _gntmap_map_grant_ref(ent, + idx = gntmap_find_free_entry(map); + if (idx < 0 || + _gntmap_map_grant_ref(map, idx, addr + PAGE_SIZE * i, domids[i * domids_stride], refs[i], @@ -233,15 +233,13 @@ gntmap_init(struct gntmap *map) void gntmap_fini(struct gntmap *map) { - struct gntmap_entry *ent; int i; DEBUG("(map=%p)", map); for (i = 0; i < map->nentries; i++) { - ent = &map->entries[i]; - if (gntmap_entry_used(ent)) - (void) _gntmap_unmap_grant_ref(ent); + if (gntmap_entry_used(map, i)) + (void) _gntmap_unmap_grant_ref(map, i); } xfree(map->entries); -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 11:01:34 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 11:01:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250311.431163 (Exim 4.92) (envelope-from ) id 1mzcti-0005kp-KF; Tue, 21 Dec 2021 11:01:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250311.431163; Tue, 21 Dec 2021 11:01:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcti-0005kh-H2; Tue, 21 Dec 2021 11:01:34 +0000 Received: by outflank-mailman (input) for mailman id 250311; Tue, 21 Dec 2021 11:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcth-0005kT-BC for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzcth-00074Z-AZ for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzcth-000096-9a for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 11:01:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=dLxzLrojbvZjhWDHV0IE0litgxueVHzGPKfVBqHNSUQ=; b=wrM1P6KbO7Zy2ibw7CaqDDvujH yIEySP/i6NJm+WTOBbE+Kmdjl6ICkpIdKPgn8K76Kxwt+40d2VtuiZPsgWYXOSNXg3zHTeI5V4Fr+ Mz0gJyLfnKCWy+E/vQpNT6DZeep6CIRMFzIlWp0dCrtUckCPqvGUHABkTcd3CNnEaLkE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [mini-os master] mini-os: modify grant mappings to work in PVH mode Message-Id: Date: Tue, 21 Dec 2021 11:01:33 +0000 commit ac9b29df9d6e95c6c00d79fdff9f5b1f3da3900d Author: Juergen Gross AuthorDate: Tue Dec 21 09:46:36 2021 +0100 Commit: Andrew Cooper CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: modify grant mappings to work in PVH mode For being able to use the grant mapping interface in PVH mode some changes are required, as the guest needs to specify a physical address in the hypercall interface. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- gntmap.c | 81 ++++++++++++++++++++++++++++++++++++++++---------------- include/gntmap.h | 1 + 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/gntmap.c b/gntmap.c index 7ae8fe6..6fa1dac 100644 --- a/gntmap.c +++ b/gntmap.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -97,11 +98,42 @@ gntmap_set_max_grants(struct gntmap *map, int count) if (map->entries == NULL) return -ENOMEM; +#ifndef CONFIG_PARAVIRT + map->start_pfn = e820_get_reserved_pfns(count); +#endif + memset(map->entries, 0, sizeof(struct gntmap_entry) * count); map->nentries = count; return 0; } +static int +_gntmap_unmap_grant_ref(struct gntmap *map, int idx) +{ + struct gntmap_entry *entry = map->entries + idx; + struct gnttab_unmap_grant_ref op; + int rc; + +#ifdef CONFIG_PARAVIRT + op.host_addr = (uint64_t) entry->host_addr; +#else + op.host_addr = (uint64_t)(map->start_pfn + idx) << PAGE_SHIFT; +#endif + op.dev_bus_addr = 0; + op.handle = entry->handle; + + rc = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); + if (rc != 0 || op.status != GNTST_okay) { + printk("GNTTABOP_unmap_grant_ref failed: " + "returned %d, status %" PRId16 "\n", + rc, op.status); + return rc != 0 ? rc : op.status; + } + + entry->host_addr = 0; + return 0; +} + static int _gntmap_map_grant_ref(struct gntmap *map, int idx, unsigned long host_addr, @@ -112,10 +144,17 @@ _gntmap_map_grant_ref(struct gntmap *map, int idx, struct gntmap_entry *entry = map->entries + idx; struct gnttab_map_grant_ref op; int rc; +#ifndef CONFIG_PARAVIRT + unsigned long pfn = map->start_pfn + idx; +#endif op.ref = (grant_ref_t) ref; op.dom = (domid_t) domid; +#ifdef CONFIG_PARAVIRT op.host_addr = (uint64_t) host_addr; +#else + op.host_addr = (uint64_t)pfn << PAGE_SHIFT; +#endif op.flags = GNTMAP_host_map; if (!writable) op.flags |= GNTMAP_readonly; @@ -128,31 +167,18 @@ _gntmap_map_grant_ref(struct gntmap *map, int idx, return rc != 0 ? rc : op.status; } - entry->host_addr = host_addr; - entry->handle = op.handle; - return 0; -} - -static int -_gntmap_unmap_grant_ref(struct gntmap *map, int idx) -{ - struct gntmap_entry *entry = map->entries + idx; - struct gnttab_unmap_grant_ref op; - int rc; - - op.host_addr = (uint64_t) entry->host_addr; - op.dev_bus_addr = 0; - op.handle = entry->handle; - - rc = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1); - if (rc != 0 || op.status != GNTST_okay) { - printk("GNTTABOP_unmap_grant_ref failed: " - "returned %d, status %" PRId16 "\n", - rc, op.status); - return rc != 0 ? rc : op.status; +#ifndef CONFIG_PARAVIRT + rc = do_map_frames(host_addr, &pfn, 1, 0, 0, DOMID_SELF, NULL, + writable ? L1_PROT : L1_PROT_RO); + if ( rc ) + { + _gntmap_unmap_grant_ref(map, idx); + return rc; } +#endif - entry->host_addr = 0; + entry->host_addr = host_addr; + entry->handle = op.handle; return 0; } @@ -165,6 +191,10 @@ gntmap_munmap(struct gntmap *map, unsigned long start_address, int count) DEBUG("(map=%p, start_address=%lx, count=%d)", map, start_address, count); +#ifndef CONFIG_PARAVIRT + unmap_frames(start_address, count); +#endif + for (i = 0; i < count; i++) { idx = gntmap_find_entry(map, start_address + PAGE_SIZE * i); if (idx < 0) { @@ -242,6 +272,11 @@ gntmap_fini(struct gntmap *map) (void) _gntmap_unmap_grant_ref(map, i); } +#ifndef CONFIG_PARAVIRT + e820_put_reserved_pfns(map->start_pfn, map->nentries); + map->start_pfn = 0; +#endif + xfree(map->entries); map->entries = NULL; map->nentries = 0; diff --git a/include/gntmap.h b/include/gntmap.h index fde53f3..d3d7e88 100644 --- a/include/gntmap.h +++ b/include/gntmap.h @@ -10,6 +10,7 @@ struct gntmap { int nentries; struct gntmap_entry *entries; + unsigned long start_pfn; }; int -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 23:44:09 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 23:44:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250621.431653 (Exim 4.92) (envelope-from ) id 1mzonb-0001sv-D8; Tue, 21 Dec 2021 23:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250621.431653; Tue, 21 Dec 2021 23:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzonb-0001sn-AI; Tue, 21 Dec 2021 23:44:03 +0000 Received: by outflank-mailman (input) for mailman id 250621; Tue, 21 Dec 2021 23:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzona-0001sh-3l for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 23:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzonZ-0003yT-R7 for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 23:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzonZ-0003qD-Pu for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 23:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=McWiLKGuP45LIZKSBfV/5FOOpD3XM4fVGeoD6cGgIMg=; b=032cAgfojVzVkkunQgkMuqJBjl nx3Fuj+mSb6APXBzj4XnUwB1DRrf5Kj1JOtUZ2habRpDwi7QfEw+BkonS4ogPOPo6CAv4KTU1AYnB Vj1tcPRJC319ivVu6ZgF9M1Jn/Pqb4ldPsGVwEQyM4LXY57+wPML2JQI2xdpf3SMc1rg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/perfc: conditionalize HVM and shadow counters Message-Id: Date: Tue, 21 Dec 2021 23:44:01 +0000 commit fa2f4c39c48f975ae1b87247fa2f71673e2838ca Author: Jan Beulich AuthorDate: Tue Dec 21 10:38:18 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 21 10:38:18 2021 +0100 x86/perfc: conditionalize HVM and shadow counters There's no point including them when the respective functionality isn't enabled in the build. Note that this covers only larger groups; more fine grained exclusion may want to be done later on. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/include/asm/perfc_defn.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/include/asm/perfc_defn.h b/xen/arch/x86/include/asm/perfc_defn.h index 1a9ea3f89e..a98df515d9 100644 --- a/xen/arch/x86/include/asm/perfc_defn.h +++ b/xen/arch/x86/include/asm/perfc_defn.h @@ -4,6 +4,8 @@ PERFCOUNTER_ARRAY(exceptions, "exceptions", 32) +#ifdef CONFIG_HVM + #define VMX_PERF_EXIT_REASON_SIZE 56 #define VMX_PERF_VECTOR_SIZE 0x20 PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SIZE) @@ -13,6 +15,8 @@ PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SIZE) #define SVM_PERF_EXIT_REASON_SIZE (1+141) PERFCOUNTER_ARRAY(svmexits, "SVMexits", SVM_PERF_EXIT_REASON_SIZE) +#endif /* CONFIG_HVM */ + PERFCOUNTER(seg_fixups, "segmentation fixups") PERFCOUNTER(apic_timer, "apic timer interrupts") @@ -37,6 +41,8 @@ PERFCOUNTER(exception_fixed, "pre-exception fixed") PERFCOUNTER(guest_walk, "guest pagetable walks") /* Shadow counters */ +#ifdef CONFIG_SHADOW_PAGING + PERFCOUNTER(shadow_alloc, "calls to shadow_alloc") PERFCOUNTER(shadow_alloc_tlbflush, "shadow_alloc flushed TLBs") @@ -112,6 +118,8 @@ PERFCOUNTER(shadow_unsync, "shadow OOS unsyncs") PERFCOUNTER(shadow_unsync_evict, "shadow OOS evictions") PERFCOUNTER(shadow_resync, "shadow OOS resyncs") +#endif /* CONFIG_SHADOW_PAGING */ + PERFCOUNTER(realmode_emulations, "realmode instructions emulated") PERFCOUNTER(realmode_exits, "vmexits from realmode") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Dec 21 23:44:12 2021 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 21 Dec 2021 23:44:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.250622.431659 (Exim 4.92) (envelope-from ) id 1mzonk-0001ua-F0; Tue, 21 Dec 2021 23:44:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 250622.431659; Tue, 21 Dec 2021 23:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzonk-0001uS-Bi; Tue, 21 Dec 2021 23:44:12 +0000 Received: by outflank-mailman (input) for mailman id 250622; Tue, 21 Dec 2021 23:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzonj-0001uG-V8 for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 23:44:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mzonj-0003yX-UM for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 23:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1mzonj-0003r4-TI for xen-changelog@lists.xenproject.org; Tue, 21 Dec 2021 23:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=8yVNvwF9bDY0xIf2ryBd44tMfxVJ9yoxNkzCXHWK3zE=; b=VKcSJPK0PjrCeIHlSjpnz8aDCT 1emOeBXLNJMyrTafjhedeaajOX26xf4PvAzuQ+keRSqOdYR/fqDJdMpBebbrU9MK1lBDtIL7o7VnM ZGNSpgoTKLPgC8RKS64VNmxBs4bkcARzSa5NDcO7TFnrXGkZApaFHVF6keaQJZL4udYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] mm: introduce INVALID_{G,M}FN_RAW Message-Id: Date: Tue, 21 Dec 2021 23:44:11 +0000 commit f1e268b9fd13647e1f69c8ce0ae7be401d319fc8 Author: Jan Beulich AuthorDate: Tue Dec 21 10:42:02 2021 +0100 Commit: Jan Beulich CommitDate: Tue Dec 21 10:42:02 2021 +0100 mm: introduce INVALID_{G,M}FN_RAW This allows properly tying together INVALID_{G,M}FN and INVALID_{G,M}FN_INITIALIZER as well as using the actual values in compile time constant expressions (or even preprocessor directives). Since INVALID_PFN is unused, and with x86'es paging_mark_pfn_dirty() being the only user of pfn_t it also doesn't seem likely that new uses would appear, remove that one at this same occasion. Signed-off-by: Jan Beulich Reviewed-by: Oleksandr Andrushchenko Reviewed-by: Julien Grall --- xen/include/xen/mm-frame.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/include/xen/mm-frame.h b/xen/include/xen/mm-frame.h index f3b1dac3d6..0105ed0130 100644 --- a/xen/include/xen/mm-frame.h +++ b/xen/include/xen/mm-frame.h @@ -6,12 +6,13 @@ TYPE_SAFE(unsigned long, mfn); #define PRI_mfn "05lx" -#define INVALID_MFN _mfn(~0UL) +#define INVALID_MFN_RAW (~0UL) +#define INVALID_MFN _mfn(INVALID_MFN_RAW) /* * To be used for global variable initialization. This workaround a bug * in GCC < 5.0. */ -#define INVALID_MFN_INITIALIZER { ~0UL } +#define INVALID_MFN_INITIALIZER { INVALID_MFN_RAW } #ifndef mfn_t #define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ @@ -44,12 +45,13 @@ static inline bool_t mfn_eq(mfn_t x, mfn_t y) TYPE_SAFE(unsigned long, gfn); #define PRI_gfn "05lx" -#define INVALID_GFN _gfn(~0UL) +#define INVALID_GFN_RAW (~0UL) +#define INVALID_GFN _gfn(INVALID_GFN_RAW) /* * To be used for global variable initialization. This workaround a bug * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64856 */ -#define INVALID_GFN_INITIALIZER { ~0UL } +#define INVALID_GFN_INITIALIZER { INVALID_GFN_RAW } #ifndef gfn_t #define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */ @@ -82,7 +84,6 @@ static inline bool_t gfn_eq(gfn_t x, gfn_t y) TYPE_SAFE(unsigned long, pfn); #define PRI_pfn "05lx" -#define INVALID_PFN (~0UL) #ifndef pfn_t #define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above */ -- generated by git-patchbot for /home/xen/git/xen.git#master