From xen-changelog-bounces@lists.xen.org Mon Aug 04 00:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 00:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rq-00044D-FI; Mon, 04 Aug 2014 00:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5ro-000445-J0 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:08 +0000 Received: from [85.158.137.68:13407] by server-17.bemta-3.messagelabs.com id 2A/A0-27015-B9FCED35; Mon, 04 Aug 2014 00:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1407111065!11552812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32431 invoked from network); 4 Aug 2014 00:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 00:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rj-0003CN-D3 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XE5rj-0005qu-8A for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:03 +0000 Date: Mon, 04 Aug 2014 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen-hvm: Fix xen_hvm_init() to adjust pc memory layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ff1af823b1789710639ba22d7d3698044ab5c6a Author: Don Slutz AuthorDate: Mon Jul 28 09:31:38 2014 -0400 Commit: Stefano Stabellini CommitDate: Mon Jul 28 15:40:06 2014 +0000 xen-hvm: Fix xen_hvm_init() to adjust pc memory layout This is just below_4g_mem_size and above_4g_mem_size which is used later in QEMU. Acked-by: Stefano Stabellini Signed-off-by: Don Slutz Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 3c2a96699e9fc09b5712dacfe200cdaaff0bb55c) --- hw/i386/pc_piix.c | 31 ++++++++++++++++--------------- hw/i386/pc_q35.c | 29 +++++++++++++++-------------- include/hw/xen/xen.h | 3 ++- xen-hvm-stub.c | 3 ++- xen-hvm.c | 24 ++++++++++++++---------- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7930a26..bd52f6e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -96,21 +96,6 @@ static void pc_init1(QEMUMachineInitArgs *args, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { - fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); - exit(1); - } - - icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); - object_property_add_child(qdev_get_machine(), "icc-bridge", - OBJECT(icc_bridge), NULL); - - pc_cpus_init(args->cpu_model, icc_bridge); - - if (kvm_enabled() && kvmclock_enabled) { - kvmclock_create(); - } - /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory). * If it doesn't, we need to split it in chunks below and above 4G. * In any case, try to make sure that guest addresses aligned at @@ -127,6 +112,22 @@ static void pc_init1(QEMUMachineInitArgs *args, below_4g_mem_size = args->ram_size; } + if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size, + &ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); + object_property_add_child(qdev_get_machine(), "icc-bridge", + OBJECT(icc_bridge), NULL); + + pc_cpus_init(args->cpu_model, icc_bridge); + + if (kvm_enabled() && kvmclock_enabled) { + kvmclock_create(); + } + if (pci_enabled) { pci_memory = g_new(MemoryRegion, 1); memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index c844dc2..6e34fe1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -83,20 +83,6 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { - fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); - exit(1); - } - - icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); - object_property_add_child(qdev_get_machine(), "icc-bridge", - OBJECT(icc_bridge), NULL); - - pc_cpus_init(args->cpu_model, icc_bridge); - pc_acpi_init("q35-acpi-dsdt.aml"); - - kvmclock_create(); - /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping * also known as MMCFG). @@ -115,6 +101,21 @@ static void pc_q35_init(QEMUMachineInitArgs *args) below_4g_mem_size = args->ram_size; } + if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size, + &ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); + object_property_add_child(qdev_get_machine(), "icc-bridge", + OBJECT(icc_bridge), NULL); + + pc_cpus_init(args->cpu_model, icc_bridge); + pc_acpi_init("q35-acpi-dsdt.aml"); + + kvmclock_create(); + /* pci enabled */ if (pci_enabled) { pci_memory = g_new(MemoryRegion, 1); diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 9d549fc..0f3942e 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,10 +37,11 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(QEMUMachine *machine); -int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) +int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, + MemoryRegion **ram_memory); void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c index 4eb27b5..2d98696 100644 --- a/xen-hvm-stub.c +++ b/xen-hvm-stub.c @@ -51,7 +51,8 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(MemoryRegion **ram_memory) +int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, + MemoryRegion **ram_memory) { return 0; } diff --git a/xen-hvm.c b/xen-hvm.c index 8c69b34..ad9ee45 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -155,10 +155,11 @@ qemu_irq *xen_interrupt_controller_init(void) /* Memory Ops */ -static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) +static void xen_ram_init(ram_addr_t *below_4g_mem_size, + ram_addr_t *above_4g_mem_size, + ram_addr_t ram_size, MemoryRegion **ram_memory_p) { MemoryRegion *sysmem = get_system_memory(); - ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; ram_addr_t block_len; block_len = ram_size; @@ -173,10 +174,11 @@ static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) vmstate_register_ram_global(&ram_memory); if (ram_size >= HVM_BELOW_4G_RAM_END) { - above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END; - below_4g_mem_size = HVM_BELOW_4G_RAM_END; + *above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END; + *below_4g_mem_size = HVM_BELOW_4G_RAM_END; } else { - below_4g_mem_size = ram_size; + *above_4g_mem_size = 0; + *below_4g_mem_size = ram_size; } memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k", @@ -189,12 +191,13 @@ static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) * the Options ROM, so it is registered here as RAM. */ memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", - &ram_memory, 0xc0000, below_4g_mem_size - 0xc0000); + &ram_memory, 0xc0000, + *below_4g_mem_size - 0xc0000); memory_region_add_subregion(sysmem, 0xc0000, &ram_lo); - if (above_4g_mem_size > 0) { + if (*above_4g_mem_size > 0) { memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory, 0x100000000ULL, - above_4g_mem_size); + *above_4g_mem_size); memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi); } } @@ -958,7 +961,8 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data) xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); } -int xen_hvm_init(MemoryRegion **ram_memory) +int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, + MemoryRegion **ram_memory) { int i, rc; unsigned long ioreq_pfn; @@ -1036,7 +1040,7 @@ int xen_hvm_init(MemoryRegion **ram_memory) /* Init RAM management */ xen_map_cache_init(xen_phys_offset_to_gaddr, state); - xen_ram_init(ram_size, ram_memory); + xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory); qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 00:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 00:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rz-00044h-Kb; Mon, 04 Aug 2014 00:11:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5ry-00044R-Kh for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:18 +0000 Received: from [85.158.137.68:50161] by server-6.bemta-3.messagelabs.com id DB/B1-29521-5AFCED35; Mon, 04 Aug 2014 00:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1407111075!11594127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29661 invoked from network); 4 Aug 2014 00:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 00:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rv-0003CQ-Cw for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XE5rv-0005sG-8Q for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:15 +0000 Date: Mon, 04 Aug 2014 00:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Backport pc & q35: Add new machine opt max-ram-below-4g X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffdacad07002e14a8072ae28086a57452e48d458 Author: Don Slutz AuthorDate: Mon Jul 28 09:31:39 2014 -0400 Commit: Stefano Stabellini CommitDate: Mon Jul 28 15:40:07 2014 +0000 Backport pc & q35: Add new machine opt max-ram-below-4g This is a xen only backport of 2 QEMU 2.1.0 changes: commit c87b1520726f7ae1e698a41f07043d1b539ac88c pc & q35: Add new machine opt max-ram-below-4g commit c4f5cdc53f181f6fe84a0f1bf99914598934a8a6 xen-hvm: Handle machine opt max-ram-below-4g It changes all machine types to have this, not just pc & q35. But only pc & q35 machines do anything with it. I.E. this machine option will be ignored by other types. If you add enough PCI devices then all mmio for them will not fit below 4G which may not be the layout the user wanted. This allows you to increase the below 4G address space that PCI devices can use (aka decrease ram below 4G) and therefore in more cases not have any mmio that is above 4G. For example using "-machine pc,max-ram-below-4g=2G" on the command line will limit the amount of ram that is below 4G to 2G. Note: this machine option cannot be used to increase the amount of ram below 4G. Signed-off-by: Don Slutz --- hw/i386/pc_piix.c | 24 +++++++++++++++++++++++- hw/i386/pc_q35.c | 24 +++++++++++++++++++++++- vl.c | 28 ++++++++++++++++++++++++++++ xen-hvm.c | 35 +++++++++++++++++++++++------------ 4 files changed, 97 insertions(+), 14 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index bd52f6e..d506630 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -48,10 +48,13 @@ #include "exec/address-spaces.h" #include "hw/acpi/acpi.h" #include "cpu.h" +#include "qemu/error-report.h" #ifdef CONFIG_XEN # include #endif +extern uint64_t max_ram_below_4g; + #define MAX_IDE_BUS 2 static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; @@ -95,6 +98,7 @@ static void pc_init1(QEMUMachineInitArgs *args, DeviceState *icc_bridge; FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; + ram_addr_t lowmem; /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory). * If it doesn't, we need to split it in chunks below and above 4G. @@ -104,7 +108,25 @@ static void pc_init1(QEMUMachineInitArgs *args, * breaking migration. */ if (args->ram_size >= 0xe0000000) { - ram_addr_t lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000; + lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000; + } else { + lowmem = 0xe0000000; + } + + /* Handle the machine opt max-ram-below-4g. It is basicly doing + * min(qemu limit, user limit). + */ + if (lowmem > max_ram_below_4g) { + lowmem = max_ram_below_4g; + if (args->ram_size - lowmem > lowmem && + lowmem & ((1ULL << 30) - 1)) { + error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 + ") not a multiple of 1G; possible bad performance.", + max_ram_below_4g); + } + } + + if (args->ram_size >= lowmem) { above_4g_mem_size = args->ram_size - lowmem; below_4g_mem_size = lowmem; } else { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6e34fe1..c529e02 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -44,6 +44,9 @@ #include "hw/ide/ahci.h" #include "hw/usb.h" #include "hw/cpu/icc_bus.h" +#include "qemu/error-report.h" + +extern uint64_t max_ram_below_4g; /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 @@ -82,6 +85,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) PCIDevice *ahci; DeviceState *icc_bridge; PcGuestInfo *guest_info; + ram_addr_t lowmem; /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping @@ -93,7 +97,25 @@ static void pc_q35_init(QEMUMachineInitArgs *args) * breaking migration. */ if (args->ram_size >= 0xb0000000) { - ram_addr_t lowmem = gigabyte_align ? 0x80000000 : 0xb0000000; + lowmem = gigabyte_align ? 0x80000000 : 0xb0000000; + } else { + lowmem = 0xb0000000; + } + + /* Handle the machine opt max-ram-below-4g. It is basicly doing + * min(qemu limit, user limit). + */ + if (lowmem > max_ram_below_4g) { + lowmem = max_ram_below_4g; + if (args->ram_size - lowmem > lowmem && + lowmem & ((1ULL << 30) - 1)) { + error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 + ") not a multiple of 1G; possible bad performance.", + max_ram_below_4g); + } + } + + if (args->ram_size >= lowmem) { above_4g_mem_size = args->ram_size - lowmem; below_4g_mem_size = lowmem; } else { diff --git a/vl.c b/vl.c index 9975e5a..83927c9 100644 --- a/vl.c +++ b/vl.c @@ -212,6 +212,7 @@ static NotifierList machine_init_done_notifiers = static bool tcg_allowed = true; bool xen_allowed; +uint64_t max_ram_below_4g = 1ULL << 32; /* 4G */ uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; static int tcg_tb_size; @@ -382,6 +383,10 @@ static QemuOptsList qemu_machine_opts = { .name = "kvm-type", .type = QEMU_OPT_STRING, .help = "Specifies the KVM virtualization mode (HV, PR)", + },{ + .name = "max-ram-below-4g", + .type = QEMU_OPT_SIZE, + .help = "maximum ram below the 4G boundary (32bit boundary)", }, { /* End of list */ } }, @@ -4182,6 +4187,29 @@ int main(int argc, char **argv, char **envp) kernel_cmdline = qemu_opt_get(machine_opts, "append"); bios_name = qemu_opt_get(machine_opts, "firmware"); + max_ram_below_4g = qemu_opt_get_size(machine_opts, + "max-ram-below-4g", + max_ram_below_4g); + + if (max_ram_below_4g > (1ULL << 32)) { + Error *local_err = NULL; + error_set(&local_err, ERROR_CLASS_GENERIC_ERROR, + "Machine option 'max-ram-below-4g=%"PRIu64 + "' expects size less than or equal to 4G", + max_ram_below_4g); + if (local_err) { + error_report("%s", error_get_pretty(local_err)); + error_free(local_err); + exit(1); + } + } + + if (max_ram_below_4g < (1ULL << 20)) { + error_report("Warning: small max_ram_below_4g(%"PRIu64 + ") less than 1M. BIOS may not work..", + max_ram_below_4g); + } + boot_order = machine->default_boot_order; opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); if (opts) { diff --git a/xen-hvm.c b/xen-hvm.c index ad9ee45..a573a20 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -26,6 +26,8 @@ #include #include +extern uint64_t max_ram_below_4g; + //#define DEBUG_XEN_HVM #ifdef DEBUG_XEN_HVM @@ -161,25 +163,34 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size, { MemoryRegion *sysmem = get_system_memory(); ram_addr_t block_len; + uint64_t user_lowmem = max_ram_below_4g; - block_len = ram_size; - if (ram_size >= HVM_BELOW_4G_RAM_END) { - /* Xen does not allocate the memory continuously, and keep a hole at - * HVM_BELOW_4G_MMIO_START of HVM_BELOW_4G_MMIO_LENGTH - */ - block_len += HVM_BELOW_4G_MMIO_LENGTH; + /* Handle the machine opt max-ram-below-4g. It is basically doing + * min(xen limit, user limit). + */ + if (HVM_BELOW_4G_RAM_END <= user_lowmem) { + user_lowmem = HVM_BELOW_4G_RAM_END; } - memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); - *ram_memory_p = &ram_memory; - vmstate_register_ram_global(&ram_memory); - if (ram_size >= HVM_BELOW_4G_RAM_END) { - *above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END; - *below_4g_mem_size = HVM_BELOW_4G_RAM_END; + if (ram_size >= user_lowmem) { + *above_4g_mem_size = ram_size - user_lowmem; + *below_4g_mem_size = user_lowmem; } else { *above_4g_mem_size = 0; *below_4g_mem_size = ram_size; } + if (!*above_4g_mem_size) { + block_len = ram_size; + } else { + /* + * Xen does not allocate the memory continuously, it keeps a + * hole of the size computed above or passed in. + */ + block_len = (1ULL << 32) + *above_4g_mem_size; + } + memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); + *ram_memory_p = &ram_memory; + vmstate_register_ram_global(&ram_memory); memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k", &ram_memory, 0, 0xa0000); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 00:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 00:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rz-00044h-Kb; Mon, 04 Aug 2014 00:11:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5ry-00044R-Kh for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:18 +0000 Received: from [85.158.137.68:50161] by server-6.bemta-3.messagelabs.com id DB/B1-29521-5AFCED35; Mon, 04 Aug 2014 00:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1407111075!11594127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29661 invoked from network); 4 Aug 2014 00:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 00:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rv-0003CQ-Cw for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XE5rv-0005sG-8Q for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:15 +0000 Date: Mon, 04 Aug 2014 00:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Backport pc & q35: Add new machine opt max-ram-below-4g X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffdacad07002e14a8072ae28086a57452e48d458 Author: Don Slutz AuthorDate: Mon Jul 28 09:31:39 2014 -0400 Commit: Stefano Stabellini CommitDate: Mon Jul 28 15:40:07 2014 +0000 Backport pc & q35: Add new machine opt max-ram-below-4g This is a xen only backport of 2 QEMU 2.1.0 changes: commit c87b1520726f7ae1e698a41f07043d1b539ac88c pc & q35: Add new machine opt max-ram-below-4g commit c4f5cdc53f181f6fe84a0f1bf99914598934a8a6 xen-hvm: Handle machine opt max-ram-below-4g It changes all machine types to have this, not just pc & q35. But only pc & q35 machines do anything with it. I.E. this machine option will be ignored by other types. If you add enough PCI devices then all mmio for them will not fit below 4G which may not be the layout the user wanted. This allows you to increase the below 4G address space that PCI devices can use (aka decrease ram below 4G) and therefore in more cases not have any mmio that is above 4G. For example using "-machine pc,max-ram-below-4g=2G" on the command line will limit the amount of ram that is below 4G to 2G. Note: this machine option cannot be used to increase the amount of ram below 4G. Signed-off-by: Don Slutz --- hw/i386/pc_piix.c | 24 +++++++++++++++++++++++- hw/i386/pc_q35.c | 24 +++++++++++++++++++++++- vl.c | 28 ++++++++++++++++++++++++++++ xen-hvm.c | 35 +++++++++++++++++++++++------------ 4 files changed, 97 insertions(+), 14 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index bd52f6e..d506630 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -48,10 +48,13 @@ #include "exec/address-spaces.h" #include "hw/acpi/acpi.h" #include "cpu.h" +#include "qemu/error-report.h" #ifdef CONFIG_XEN # include #endif +extern uint64_t max_ram_below_4g; + #define MAX_IDE_BUS 2 static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; @@ -95,6 +98,7 @@ static void pc_init1(QEMUMachineInitArgs *args, DeviceState *icc_bridge; FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; + ram_addr_t lowmem; /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory). * If it doesn't, we need to split it in chunks below and above 4G. @@ -104,7 +108,25 @@ static void pc_init1(QEMUMachineInitArgs *args, * breaking migration. */ if (args->ram_size >= 0xe0000000) { - ram_addr_t lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000; + lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000; + } else { + lowmem = 0xe0000000; + } + + /* Handle the machine opt max-ram-below-4g. It is basicly doing + * min(qemu limit, user limit). + */ + if (lowmem > max_ram_below_4g) { + lowmem = max_ram_below_4g; + if (args->ram_size - lowmem > lowmem && + lowmem & ((1ULL << 30) - 1)) { + error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 + ") not a multiple of 1G; possible bad performance.", + max_ram_below_4g); + } + } + + if (args->ram_size >= lowmem) { above_4g_mem_size = args->ram_size - lowmem; below_4g_mem_size = lowmem; } else { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6e34fe1..c529e02 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -44,6 +44,9 @@ #include "hw/ide/ahci.h" #include "hw/usb.h" #include "hw/cpu/icc_bus.h" +#include "qemu/error-report.h" + +extern uint64_t max_ram_below_4g; /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 @@ -82,6 +85,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) PCIDevice *ahci; DeviceState *icc_bridge; PcGuestInfo *guest_info; + ram_addr_t lowmem; /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping @@ -93,7 +97,25 @@ static void pc_q35_init(QEMUMachineInitArgs *args) * breaking migration. */ if (args->ram_size >= 0xb0000000) { - ram_addr_t lowmem = gigabyte_align ? 0x80000000 : 0xb0000000; + lowmem = gigabyte_align ? 0x80000000 : 0xb0000000; + } else { + lowmem = 0xb0000000; + } + + /* Handle the machine opt max-ram-below-4g. It is basicly doing + * min(qemu limit, user limit). + */ + if (lowmem > max_ram_below_4g) { + lowmem = max_ram_below_4g; + if (args->ram_size - lowmem > lowmem && + lowmem & ((1ULL << 30) - 1)) { + error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 + ") not a multiple of 1G; possible bad performance.", + max_ram_below_4g); + } + } + + if (args->ram_size >= lowmem) { above_4g_mem_size = args->ram_size - lowmem; below_4g_mem_size = lowmem; } else { diff --git a/vl.c b/vl.c index 9975e5a..83927c9 100644 --- a/vl.c +++ b/vl.c @@ -212,6 +212,7 @@ static NotifierList machine_init_done_notifiers = static bool tcg_allowed = true; bool xen_allowed; +uint64_t max_ram_below_4g = 1ULL << 32; /* 4G */ uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; static int tcg_tb_size; @@ -382,6 +383,10 @@ static QemuOptsList qemu_machine_opts = { .name = "kvm-type", .type = QEMU_OPT_STRING, .help = "Specifies the KVM virtualization mode (HV, PR)", + },{ + .name = "max-ram-below-4g", + .type = QEMU_OPT_SIZE, + .help = "maximum ram below the 4G boundary (32bit boundary)", }, { /* End of list */ } }, @@ -4182,6 +4187,29 @@ int main(int argc, char **argv, char **envp) kernel_cmdline = qemu_opt_get(machine_opts, "append"); bios_name = qemu_opt_get(machine_opts, "firmware"); + max_ram_below_4g = qemu_opt_get_size(machine_opts, + "max-ram-below-4g", + max_ram_below_4g); + + if (max_ram_below_4g > (1ULL << 32)) { + Error *local_err = NULL; + error_set(&local_err, ERROR_CLASS_GENERIC_ERROR, + "Machine option 'max-ram-below-4g=%"PRIu64 + "' expects size less than or equal to 4G", + max_ram_below_4g); + if (local_err) { + error_report("%s", error_get_pretty(local_err)); + error_free(local_err); + exit(1); + } + } + + if (max_ram_below_4g < (1ULL << 20)) { + error_report("Warning: small max_ram_below_4g(%"PRIu64 + ") less than 1M. BIOS may not work..", + max_ram_below_4g); + } + boot_order = machine->default_boot_order; opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); if (opts) { diff --git a/xen-hvm.c b/xen-hvm.c index ad9ee45..a573a20 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -26,6 +26,8 @@ #include #include +extern uint64_t max_ram_below_4g; + //#define DEBUG_XEN_HVM #ifdef DEBUG_XEN_HVM @@ -161,25 +163,34 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size, { MemoryRegion *sysmem = get_system_memory(); ram_addr_t block_len; + uint64_t user_lowmem = max_ram_below_4g; - block_len = ram_size; - if (ram_size >= HVM_BELOW_4G_RAM_END) { - /* Xen does not allocate the memory continuously, and keep a hole at - * HVM_BELOW_4G_MMIO_START of HVM_BELOW_4G_MMIO_LENGTH - */ - block_len += HVM_BELOW_4G_MMIO_LENGTH; + /* Handle the machine opt max-ram-below-4g. It is basically doing + * min(xen limit, user limit). + */ + if (HVM_BELOW_4G_RAM_END <= user_lowmem) { + user_lowmem = HVM_BELOW_4G_RAM_END; } - memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); - *ram_memory_p = &ram_memory; - vmstate_register_ram_global(&ram_memory); - if (ram_size >= HVM_BELOW_4G_RAM_END) { - *above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END; - *below_4g_mem_size = HVM_BELOW_4G_RAM_END; + if (ram_size >= user_lowmem) { + *above_4g_mem_size = ram_size - user_lowmem; + *below_4g_mem_size = user_lowmem; } else { *above_4g_mem_size = 0; *below_4g_mem_size = ram_size; } + if (!*above_4g_mem_size) { + block_len = ram_size; + } else { + /* + * Xen does not allocate the memory continuously, it keeps a + * hole of the size computed above or passed in. + */ + block_len = (1ULL << 32) + *above_4g_mem_size; + } + memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len); + *ram_memory_p = &ram_memory; + vmstate_register_ram_global(&ram_memory); memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k", &ram_memory, 0, 0xa0000); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 00:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 00:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rq-00044D-FI; Mon, 04 Aug 2014 00:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5ro-000445-J0 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:08 +0000 Received: from [85.158.137.68:13407] by server-17.bemta-3.messagelabs.com id 2A/A0-27015-B9FCED35; Mon, 04 Aug 2014 00:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1407111065!11552812!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32431 invoked from network); 4 Aug 2014 00:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 00:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XE5rj-0003CN-D3 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XE5rj-0005qu-8A for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 00:11:03 +0000 Date: Mon, 04 Aug 2014 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen-hvm: Fix xen_hvm_init() to adjust pc memory layout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ff1af823b1789710639ba22d7d3698044ab5c6a Author: Don Slutz AuthorDate: Mon Jul 28 09:31:38 2014 -0400 Commit: Stefano Stabellini CommitDate: Mon Jul 28 15:40:06 2014 +0000 xen-hvm: Fix xen_hvm_init() to adjust pc memory layout This is just below_4g_mem_size and above_4g_mem_size which is used later in QEMU. Acked-by: Stefano Stabellini Signed-off-by: Don Slutz Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 3c2a96699e9fc09b5712dacfe200cdaaff0bb55c) --- hw/i386/pc_piix.c | 31 ++++++++++++++++--------------- hw/i386/pc_q35.c | 29 +++++++++++++++-------------- include/hw/xen/xen.h | 3 ++- xen-hvm-stub.c | 3 ++- xen-hvm.c | 24 ++++++++++++++---------- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7930a26..bd52f6e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -96,21 +96,6 @@ static void pc_init1(QEMUMachineInitArgs *args, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { - fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); - exit(1); - } - - icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); - object_property_add_child(qdev_get_machine(), "icc-bridge", - OBJECT(icc_bridge), NULL); - - pc_cpus_init(args->cpu_model, icc_bridge); - - if (kvm_enabled() && kvmclock_enabled) { - kvmclock_create(); - } - /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory). * If it doesn't, we need to split it in chunks below and above 4G. * In any case, try to make sure that guest addresses aligned at @@ -127,6 +112,22 @@ static void pc_init1(QEMUMachineInitArgs *args, below_4g_mem_size = args->ram_size; } + if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size, + &ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); + object_property_add_child(qdev_get_machine(), "icc-bridge", + OBJECT(icc_bridge), NULL); + + pc_cpus_init(args->cpu_model, icc_bridge); + + if (kvm_enabled() && kvmclock_enabled) { + kvmclock_create(); + } + if (pci_enabled) { pci_memory = g_new(MemoryRegion, 1); memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index c844dc2..6e34fe1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -83,20 +83,6 @@ static void pc_q35_init(QEMUMachineInitArgs *args) DeviceState *icc_bridge; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { - fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); - exit(1); - } - - icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); - object_property_add_child(qdev_get_machine(), "icc-bridge", - OBJECT(icc_bridge), NULL); - - pc_cpus_init(args->cpu_model, icc_bridge); - pc_acpi_init("q35-acpi-dsdt.aml"); - - kvmclock_create(); - /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping * also known as MMCFG). @@ -115,6 +101,21 @@ static void pc_q35_init(QEMUMachineInitArgs *args) below_4g_mem_size = args->ram_size; } + if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size, + &ram_memory) != 0) { + fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); + exit(1); + } + + icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE); + object_property_add_child(qdev_get_machine(), "icc-bridge", + OBJECT(icc_bridge), NULL); + + pc_cpus_init(args->cpu_model, icc_bridge); + pc_acpi_init("q35-acpi-dsdt.aml"); + + kvmclock_create(); + /* pci enabled */ if (pci_enabled) { pci_memory = g_new(MemoryRegion, 1); diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 9d549fc..0f3942e 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -37,10 +37,11 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); int xen_init(QEMUMachine *machine); -int xen_hvm_init(MemoryRegion **ram_memory); void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) +int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, + MemoryRegion **ram_memory); void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr); void xen_modified_memory(ram_addr_t start, ram_addr_t length); diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c index 4eb27b5..2d98696 100644 --- a/xen-hvm-stub.c +++ b/xen-hvm-stub.c @@ -51,7 +51,8 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(MemoryRegion **ram_memory) +int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, + MemoryRegion **ram_memory) { return 0; } diff --git a/xen-hvm.c b/xen-hvm.c index 8c69b34..ad9ee45 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -155,10 +155,11 @@ qemu_irq *xen_interrupt_controller_init(void) /* Memory Ops */ -static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) +static void xen_ram_init(ram_addr_t *below_4g_mem_size, + ram_addr_t *above_4g_mem_size, + ram_addr_t ram_size, MemoryRegion **ram_memory_p) { MemoryRegion *sysmem = get_system_memory(); - ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; ram_addr_t block_len; block_len = ram_size; @@ -173,10 +174,11 @@ static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) vmstate_register_ram_global(&ram_memory); if (ram_size >= HVM_BELOW_4G_RAM_END) { - above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END; - below_4g_mem_size = HVM_BELOW_4G_RAM_END; + *above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END; + *below_4g_mem_size = HVM_BELOW_4G_RAM_END; } else { - below_4g_mem_size = ram_size; + *above_4g_mem_size = 0; + *below_4g_mem_size = ram_size; } memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k", @@ -189,12 +191,13 @@ static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) * the Options ROM, so it is registered here as RAM. */ memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", - &ram_memory, 0xc0000, below_4g_mem_size - 0xc0000); + &ram_memory, 0xc0000, + *below_4g_mem_size - 0xc0000); memory_region_add_subregion(sysmem, 0xc0000, &ram_lo); - if (above_4g_mem_size > 0) { + if (*above_4g_mem_size > 0) { memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory, 0x100000000ULL, - above_4g_mem_size); + *above_4g_mem_size); memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi); } } @@ -958,7 +961,8 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data) xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0); } -int xen_hvm_init(MemoryRegion **ram_memory) +int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, + MemoryRegion **ram_memory) { int i, rc; unsigned long ioreq_pfn; @@ -1036,7 +1040,7 @@ int xen_hvm_init(MemoryRegion **ram_memory) /* Init RAM management */ xen_map_cache_init(xen_phys_offset_to_gaddr, state); - xen_ram_init(ram_size, ram_memory); + xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory); qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMJ-00082R-Jb; Mon, 04 Aug 2014 08:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMI-00082M-8c for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:06 +0000 Received: from [85.158.137.68:60184] by server-5.bemta-3.messagelabs.com id F3/2E-30889-9104FD35; Mon, 04 Aug 2014 08:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1407139863!9212985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12193 invoked from network); 4 Aug 2014 08:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMF-0007XP-Ez for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMF-0004R8-4P for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:03 +0000 Date: Mon, 04 Aug 2014 08:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] loadpolicy.c: Fix return handling for case of mmap failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 822b956ef7d5ccab86133d0cc8d49d87103adf3e Author: Don Slutz AuthorDate: Mon Jul 28 12:06:00 2014 -0400 Commit: Ian Campbell CommitDate: Wed Jul 30 12:42:17 2014 +0100 loadpolicy.c: Fix return handling for case of mmap failure mmap() returns MAP_FAILED not NULL. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/flask/utils/loadpolicy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/flask/utils/loadpolicy.c b/tools/flask/utils/loadpolicy.c index 2edcf97..47b5139 100644 --- a/tools/flask/utils/loadpolicy.c +++ b/tools/flask/utils/loadpolicy.c @@ -61,7 +61,7 @@ int main (int argCnt, const char *args[]) #ifdef USE_MMAP polMem = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, polFd, 0); - if ( !polMem ) + if ( polMem == MAP_FAILED ) { fprintf(stderr, "Error occurred mapping policy file in memory: %s\n", strerror(errno)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMJ-00082R-Jb; Mon, 04 Aug 2014 08:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMI-00082M-8c for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:06 +0000 Received: from [85.158.137.68:60184] by server-5.bemta-3.messagelabs.com id F3/2E-30889-9104FD35; Mon, 04 Aug 2014 08:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1407139863!9212985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12193 invoked from network); 4 Aug 2014 08:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMF-0007XP-Ez for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMF-0004R8-4P for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:03 +0000 Date: Mon, 04 Aug 2014 08:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] loadpolicy.c: Fix return handling for case of mmap failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 822b956ef7d5ccab86133d0cc8d49d87103adf3e Author: Don Slutz AuthorDate: Mon Jul 28 12:06:00 2014 -0400 Commit: Ian Campbell CommitDate: Wed Jul 30 12:42:17 2014 +0100 loadpolicy.c: Fix return handling for case of mmap failure mmap() returns MAP_FAILED not NULL. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/flask/utils/loadpolicy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/flask/utils/loadpolicy.c b/tools/flask/utils/loadpolicy.c index 2edcf97..47b5139 100644 --- a/tools/flask/utils/loadpolicy.c +++ b/tools/flask/utils/loadpolicy.c @@ -61,7 +61,7 @@ int main (int argCnt, const char *args[]) #ifdef USE_MMAP polMem = mmap(NULL, info.st_size, PROT_READ, MAP_SHARED, polFd, 0); - if ( !polMem ) + if ( polMem == MAP_FAILED ) { fprintf(stderr, "Error occurred mapping policy file in memory: %s\n", strerror(errno)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMU-000838-M8; Mon, 04 Aug 2014 08:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMS-00082v-FV for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:16 +0000 Received: from [85.158.137.68:49905] by server-9.bemta-3.messagelabs.com id 3B/85-30790-3204FD35; Mon, 04 Aug 2014 08:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407139873!7936839!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11692 invoked from network); 4 Aug 2014 08:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMP-0007XS-Ld for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMP-0004Rf-Jc for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:13 +0000 Date: Mon, 04 Aug 2014 08:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal.c: Fix return handling for case of mmap failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a14ca08f2aa5e52ffd8b42792ae1f3a708339ee Author: Don Slutz AuthorDate: Mon Jul 28 12:06:01 2014 -0400 Commit: Ian Campbell CommitDate: Wed Jul 30 12:42:17 2014 +0100 libxl_internal.c: Fix return handling for case of mmap failure mmap() returns MAP_FAILED not NULL. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/libxl/libxl_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 81f8985..b880c89 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -246,7 +246,7 @@ int libxl__file_reference_map(libxl__file_reference *f) ret = -1; data = mmap(NULL, st_buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (data == NULL) + if (data == MAP_FAILED) goto out; f->mapped = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMU-000838-M8; Mon, 04 Aug 2014 08:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMS-00082v-FV for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:16 +0000 Received: from [85.158.137.68:49905] by server-9.bemta-3.messagelabs.com id 3B/85-30790-3204FD35; Mon, 04 Aug 2014 08:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407139873!7936839!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11692 invoked from network); 4 Aug 2014 08:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMP-0007XS-Ld for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMP-0004Rf-Jc for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:13 +0000 Date: Mon, 04 Aug 2014 08:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl_internal.c: Fix return handling for case of mmap failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8a14ca08f2aa5e52ffd8b42792ae1f3a708339ee Author: Don Slutz AuthorDate: Mon Jul 28 12:06:01 2014 -0400 Commit: Ian Campbell CommitDate: Wed Jul 30 12:42:17 2014 +0100 libxl_internal.c: Fix return handling for case of mmap failure mmap() returns MAP_FAILED not NULL. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/libxl/libxl_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 81f8985..b880c89 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -246,7 +246,7 @@ int libxl__file_reference_map(libxl__file_reference *f) ret = -1; data = mmap(NULL, st_buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (data == NULL) + if (data == MAP_FAILED) goto out; f->mapped = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMe-00084Q-Oh; Mon, 04 Aug 2014 08:11:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMc-000847-Hb for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:26 +0000 Received: from [193.109.254.147:19009] by server-1.bemta-14.messagelabs.com id 35/15-24760-D204FD35; Mon, 04 Aug 2014 08:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1407139884!10188654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5219 invoked from network); 4 Aug 2014 08:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMZ-0007Xb-Qt for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMZ-0004S4-Pr for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:23 +0000 Date: Mon, 04 Aug 2014 08:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenbaked.c: Fix return handling for case of mmap failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ef51438e5410650c0525274dcfc7e1a503b6833 Author: Don Slutz AuthorDate: Mon Jul 28 12:06:02 2014 -0400 Commit: Ian Campbell CommitDate: Wed Jul 30 12:42:18 2014 +0100 xenbaked.c: Fix return handling for case of mmap failure mmap() returns MAP_FAILED not NULL. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/xenmon/xenbaked.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenmon/xenbaked.c b/tools/xenmon/xenbaked.c index 985f1dd..dc61d14 100644 --- a/tools/xenmon/xenbaked.c +++ b/tools/xenmon/xenbaked.c @@ -674,7 +674,7 @@ static void alloc_qos_data(int ncpu) new_qos = (_new_qos_data *) mmap(0, sizeof(_new_qos_data), PROT_READ|PROT_WRITE, MAP_SHARED, qos_fd, off); off += i; - if (new_qos == NULL) { + if (new_qos == MAP_FAILED) { PERROR("mmap"); exit(3); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMe-00084Q-Oh; Mon, 04 Aug 2014 08:11:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMc-000847-Hb for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:26 +0000 Received: from [193.109.254.147:19009] by server-1.bemta-14.messagelabs.com id 35/15-24760-D204FD35; Mon, 04 Aug 2014 08:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1407139884!10188654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5219 invoked from network); 4 Aug 2014 08:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMZ-0007Xb-Qt for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMZ-0004S4-Pr for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:23 +0000 Date: Mon, 04 Aug 2014 08:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenbaked.c: Fix return handling for case of mmap failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ef51438e5410650c0525274dcfc7e1a503b6833 Author: Don Slutz AuthorDate: Mon Jul 28 12:06:02 2014 -0400 Commit: Ian Campbell CommitDate: Wed Jul 30 12:42:18 2014 +0100 xenbaked.c: Fix return handling for case of mmap failure mmap() returns MAP_FAILED not NULL. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/xenmon/xenbaked.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/xenmon/xenbaked.c b/tools/xenmon/xenbaked.c index 985f1dd..dc61d14 100644 --- a/tools/xenmon/xenbaked.c +++ b/tools/xenmon/xenbaked.c @@ -674,7 +674,7 @@ static void alloc_qos_data(int ncpu) new_qos = (_new_qos_data *) mmap(0, sizeof(_new_qos_data), PROT_READ|PROT_WRITE, MAP_SHARED, qos_fd, off); off += i; - if (new_qos == NULL) { + if (new_qos == MAP_FAILED) { PERROR("mmap"); exit(3); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMn-000868-TX; Mon, 04 Aug 2014 08:11:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMn-00085s-9i for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:37 +0000 Received: from [85.158.143.35:37061] by server-1.bemta-4.messagelabs.com id 3D/07-05872-8304FD35; Mon, 04 Aug 2014 08:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1407139894!5230057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2229 invoked from network); 4 Aug 2014 08:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMk-0007Xj-6R for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMk-0004SU-06 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:34 +0000 Date: Mon, 04 Aug 2014 08:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: enable getting and setting soft affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e474ba61c2fa6babf77466bbf4ce873733a9670 Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:17 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:44:44 2014 +0100 xl: enable getting and setting soft affinity Getting happens via `xl vcpu-list', which now looks like this: # xl vcpu-list -s Name ID VCPU CPU State Time(s) Affinity (Hard / Soft) Domain-0 0 0 11 -b- 5.4 8-15 / all Domain-0 0 1 11 -b- 1.0 8-15 / all Domain-0 0 14 13 -b- 1.4 8-15 / all Domain-0 0 15 8 -b- 1.6 8-15 / all vm-test 3 0 4 -b- 2.5 0-12 / 0-7 vm-test 3 1 0 -b- 3.2 0-12 / 0-7 Setting happens by specifying two pCPU masks to the `xl vcpu-pin' command, the first one will be hard affinity, the second soft affinity. If only one mask is specified, it is only hard affinity that is affected. To change only soft affinity, '-' can be used as the hard affinity mask parameter, and it will be left alone. xl manual page is updated accordingly. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 32 ++++++++++--- tools/libxl/xl_cmdimpl.c | 111 +++++++++++++++++++++++++++++---------------- tools/libxl/xl_cmdtable.c | 2 +- 3 files changed, 96 insertions(+), 49 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 30bd4bf..9d1c2a5 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -651,16 +651,32 @@ after B, go to B section for information. Lists VCPU information for a specific domain. If no domain is specified, VCPU information for all domains will be provided. -=item B I I I +=item B I I I I -Pins the VCPU to only run on the specific CPUs. The keyword -B can be used to apply the I list to all VCPUs in the -domain. +Set hard and soft affinity for a I of . Normally VCPUs +can float between available CPUs whenever Xen deems a different run state +is appropriate. -Normally VCPUs can float between available CPUs whenever Xen deems a -different run state is appropriate. Pinning can be used to restrict -this, by ensuring certain VCPUs can only run on certain physical -CPUs. +Hard affinity can be used to restrict this, by ensuring certain VCPUs +can only run on certain physical CPUs. Soft affinity specifies a I +set of CPUs. Soft affinity needs special support in the scheduler, which is +only provided in credit1. + +The keyword B can be used to apply the hard and soft affinity masks to +all the VCPUs in the domain. The symbol '-' can be used to leave either +hard or soft affinity alone. + +For example: + + xl vcpu-pin 0 3 - 6-9 + +will set soft affinity for vCPU 3 of domain 0 to pCPUs 6,7,8 and 9, +leaving its hard affinity untouched. On the othe hand: + + xl vcpu-pin 0 3 3,4 6-9 + +will set both hard and soft affinity, the former to pCPUs 3 and 4, the +latter to pCPUs 6,7,8, and 9. =item B diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 01bce2f..ad445b0 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -653,17 +653,18 @@ static int update_cpumap_range(const char *str, libxl_bitmap *cpumap) * single cpus or as eintire NUMA nodes) and turns it into the * corresponding libxl_bitmap (in cpumap). */ -static int vcpupin_parse(char *cpu, libxl_bitmap *cpumap) +static int vcpupin_parse(const char *cpu, libxl_bitmap *cpumap) { - char *ptr, *saveptr = NULL; + char *ptr, *saveptr = NULL, *buf = strdup(cpu); int rc = 0; - for (ptr = strtok_r(cpu, ",", &saveptr); ptr; + for (ptr = strtok_r(buf, ",", &saveptr); ptr; ptr = strtok_r(NULL, ",", &saveptr)) { rc = update_cpumap_range(ptr, cpumap); if (rc) break; } + free(buf); return rc; } @@ -826,17 +827,14 @@ static void parse_config_data(const char *config_source, libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { - char *buf2 = strdup(buf); - if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } libxl_bitmap_set_none(&b_info->cpumap); - if (vcpupin_parse(buf2, &b_info->cpumap)) + if (vcpupin_parse(buf, &b_info->cpumap)) exit(1); - free(buf2); libxl_defbool_set(&b_info->numa_placement, false); } @@ -4482,8 +4480,10 @@ static void print_vcpuinfo(uint32_t tdomid, } /* TIM */ printf("%9.1f ", ((float)vcpuinfo->vcpu_time / 1e9)); - /* CPU AFFINITY */ + /* CPU HARD AND SOFT AFFINITY */ print_bitmap(vcpuinfo->cpumap.map, nr_cpus, stdout); + printf(" / "); + print_bitmap(vcpuinfo->cpumap_soft.map, nr_cpus, stdout); printf("\n"); } @@ -4518,7 +4518,8 @@ static void vcpulist(int argc, char **argv) } printf("%-32s %5s %5s %5s %5s %9s %s\n", - "Name", "ID", "VCPU", "CPU", "State", "Time(s)", "CPU Affinity"); + "Name", "ID", "VCPU", "CPU", "State", "Time(s)", + "Affinity (Hard / Soft)"); if (!argc) { if (!(dominfo = libxl_list_domain(ctx, &nb_domain))) { fprintf(stderr, "libxl_list_domain failed.\n"); @@ -4551,17 +4552,29 @@ int main_vcpulist(int argc, char **argv) return 0; } -static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) +int main_vcpupin(int argc, char **argv) { libxl_vcpuinfo *vcpuinfo; - libxl_bitmap cpumap; - - uint32_t vcpuid; + libxl_bitmap cpumap_hard, cpumap_soft;; + libxl_bitmap *soft = &cpumap_soft, *hard = &cpumap_hard; + uint32_t vcpuid, domid; + const char *vcpu, *hard_str, *soft_str; char *endptr; - int i, nb_cpu, nb_vcpu, rc = -1; + int opt, nb_cpu, nb_vcpu, rc = -1; - libxl_bitmap_init(&cpumap); + libxl_bitmap_init(&cpumap_hard); + libxl_bitmap_init(&cpumap_soft); + + SWITCH_FOREACH_OPT(opt, "", NULL, "vcpu-pin", 3) { + /* No options */ + } + domid = find_domain(argv[optind]); + vcpu = argv[optind+1]; + hard_str = argv[optind+2]; + soft_str = (argc > optind+3) ? argv[optind+3] : NULL; + + /* Figure out with which vCPU we are dealing with */ vcpuid = strtoul(vcpu, &endptr, 10); if (vcpu == endptr) { if (strcmp(vcpu, "all")) { @@ -4571,10 +4584,35 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) vcpuid = -1; } - if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) + if (libxl_cpu_bitmap_alloc(ctx, &cpumap_hard, 0) || + libxl_cpu_bitmap_alloc(ctx, &cpumap_soft, 0)) goto out; - if (vcpupin_parse(cpu, &cpumap)) + /* + * Syntax is: xl vcpu-pin + * We want to handle all the following cases ('-' means + * "leave it alone"): + * xl vcpu-pin 0 3 3,4 + * xl vcpu-pin 0 3 3,4 - + * xl vcpu-pin 0 3 - 6-9 + * xl vcpu-pin 0 3 3,4 6-9 + */ + + /* + * Hard affinity is always present. However, if it's "-", all we need + * is passing a NULL pointer to the libxl_set_vcpuaffinity() call below. + */ + if (!strcmp(hard_str, "-")) + hard = NULL; + else if (vcpupin_parse(hard_str, hard)) + goto out; + /* + * Soft affinity is handled similarly. Only difference: we also want + * to pass NULL to libxl_set_vcpuaffinity() if it is not specified. + */ + if (argc <= optind+3 || !strcmp(soft_str, "-")) + soft = NULL; + else if (vcpupin_parse(soft_str, soft)) goto out; if (dryrun_only) { @@ -4585,7 +4623,14 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } fprintf(stdout, "cpumap: "); - print_bitmap(cpumap.map, nb_cpu, stdout); + if (hard) + print_bitmap(hard->map, nb_cpu, stdout); + else + fprintf(stdout, "-"); + if (soft) { + fprintf(stdout, " "); + print_bitmap(soft->map, nb_cpu, stdout); + } fprintf(stdout, "\n"); if (ferror(stdout) || fflush(stdout)) { @@ -4598,43 +4643,29 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } if (vcpuid != -1) { - if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap, NULL)) { - fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", vcpuid); + if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, hard, soft)) { + fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", + vcpuid); goto out; } } else { - if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &i))) { + if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nb_cpu))) { fprintf(stderr, "libxl_list_vcpu failed.\n"); goto out; } - for (i = 0; i < nb_vcpu; i++) { - if (libxl_set_vcpuaffinity(ctx, domid, vcpuinfo[i].vcpuid, - &cpumap, NULL)) { - fprintf(stderr, "libxl_set_vcpuaffinity failed" - " on vcpu `%u'.\n", vcpuinfo[i].vcpuid); - } - } + if (libxl_set_vcpuaffinity_all(ctx, domid, nb_vcpu, hard, soft)) + fprintf(stderr, "Could not set affinity.\n"); libxl_vcpuinfo_list_free(vcpuinfo, nb_vcpu); } rc = 0; out: - libxl_bitmap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap_soft); + libxl_bitmap_dispose(&cpumap_hard); return rc; } -int main_vcpupin(int argc, char **argv) -{ - int opt; - - SWITCH_FOREACH_OPT(opt, "", NULL, "vcpu-pin", 3) { - /* No options */ - } - - return vcpupin(find_domain(argv[optind]), argv[optind+1] , argv[optind+2]); -} - static void vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) { char *endptr; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 4279b9f..7b7fa92 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -218,7 +218,7 @@ struct cmd_spec cmd_table[] = { { "vcpu-pin", &main_vcpupin, 1, 1, "Set which CPUs a VCPU can use", - " ", + " ", }, { "vcpu-set", &main_vcpuset, 0, 1, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMn-000868-TX; Mon, 04 Aug 2014 08:11:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMn-00085s-9i for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:37 +0000 Received: from [85.158.143.35:37061] by server-1.bemta-4.messagelabs.com id 3D/07-05872-8304FD35; Mon, 04 Aug 2014 08:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1407139894!5230057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2229 invoked from network); 4 Aug 2014 08:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMk-0007Xj-6R for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMk-0004SU-06 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:34 +0000 Date: Mon, 04 Aug 2014 08:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: enable getting and setting soft affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e474ba61c2fa6babf77466bbf4ce873733a9670 Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:17 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:44:44 2014 +0100 xl: enable getting and setting soft affinity Getting happens via `xl vcpu-list', which now looks like this: # xl vcpu-list -s Name ID VCPU CPU State Time(s) Affinity (Hard / Soft) Domain-0 0 0 11 -b- 5.4 8-15 / all Domain-0 0 1 11 -b- 1.0 8-15 / all Domain-0 0 14 13 -b- 1.4 8-15 / all Domain-0 0 15 8 -b- 1.6 8-15 / all vm-test 3 0 4 -b- 2.5 0-12 / 0-7 vm-test 3 1 0 -b- 3.2 0-12 / 0-7 Setting happens by specifying two pCPU masks to the `xl vcpu-pin' command, the first one will be hard affinity, the second soft affinity. If only one mask is specified, it is only hard affinity that is affected. To change only soft affinity, '-' can be used as the hard affinity mask parameter, and it will be left alone. xl manual page is updated accordingly. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 32 ++++++++++--- tools/libxl/xl_cmdimpl.c | 111 +++++++++++++++++++++++++++++---------------- tools/libxl/xl_cmdtable.c | 2 +- 3 files changed, 96 insertions(+), 49 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 30bd4bf..9d1c2a5 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -651,16 +651,32 @@ after B, go to B section for information. Lists VCPU information for a specific domain. If no domain is specified, VCPU information for all domains will be provided. -=item B I I I +=item B I I I I -Pins the VCPU to only run on the specific CPUs. The keyword -B can be used to apply the I list to all VCPUs in the -domain. +Set hard and soft affinity for a I of . Normally VCPUs +can float between available CPUs whenever Xen deems a different run state +is appropriate. -Normally VCPUs can float between available CPUs whenever Xen deems a -different run state is appropriate. Pinning can be used to restrict -this, by ensuring certain VCPUs can only run on certain physical -CPUs. +Hard affinity can be used to restrict this, by ensuring certain VCPUs +can only run on certain physical CPUs. Soft affinity specifies a I +set of CPUs. Soft affinity needs special support in the scheduler, which is +only provided in credit1. + +The keyword B can be used to apply the hard and soft affinity masks to +all the VCPUs in the domain. The symbol '-' can be used to leave either +hard or soft affinity alone. + +For example: + + xl vcpu-pin 0 3 - 6-9 + +will set soft affinity for vCPU 3 of domain 0 to pCPUs 6,7,8 and 9, +leaving its hard affinity untouched. On the othe hand: + + xl vcpu-pin 0 3 3,4 6-9 + +will set both hard and soft affinity, the former to pCPUs 3 and 4, the +latter to pCPUs 6,7,8, and 9. =item B diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 01bce2f..ad445b0 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -653,17 +653,18 @@ static int update_cpumap_range(const char *str, libxl_bitmap *cpumap) * single cpus or as eintire NUMA nodes) and turns it into the * corresponding libxl_bitmap (in cpumap). */ -static int vcpupin_parse(char *cpu, libxl_bitmap *cpumap) +static int vcpupin_parse(const char *cpu, libxl_bitmap *cpumap) { - char *ptr, *saveptr = NULL; + char *ptr, *saveptr = NULL, *buf = strdup(cpu); int rc = 0; - for (ptr = strtok_r(cpu, ",", &saveptr); ptr; + for (ptr = strtok_r(buf, ",", &saveptr); ptr; ptr = strtok_r(NULL, ",", &saveptr)) { rc = update_cpumap_range(ptr, cpumap); if (rc) break; } + free(buf); return rc; } @@ -826,17 +827,14 @@ static void parse_config_data(const char *config_source, libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { - char *buf2 = strdup(buf); - if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap\n"); exit(1); } libxl_bitmap_set_none(&b_info->cpumap); - if (vcpupin_parse(buf2, &b_info->cpumap)) + if (vcpupin_parse(buf, &b_info->cpumap)) exit(1); - free(buf2); libxl_defbool_set(&b_info->numa_placement, false); } @@ -4482,8 +4480,10 @@ static void print_vcpuinfo(uint32_t tdomid, } /* TIM */ printf("%9.1f ", ((float)vcpuinfo->vcpu_time / 1e9)); - /* CPU AFFINITY */ + /* CPU HARD AND SOFT AFFINITY */ print_bitmap(vcpuinfo->cpumap.map, nr_cpus, stdout); + printf(" / "); + print_bitmap(vcpuinfo->cpumap_soft.map, nr_cpus, stdout); printf("\n"); } @@ -4518,7 +4518,8 @@ static void vcpulist(int argc, char **argv) } printf("%-32s %5s %5s %5s %5s %9s %s\n", - "Name", "ID", "VCPU", "CPU", "State", "Time(s)", "CPU Affinity"); + "Name", "ID", "VCPU", "CPU", "State", "Time(s)", + "Affinity (Hard / Soft)"); if (!argc) { if (!(dominfo = libxl_list_domain(ctx, &nb_domain))) { fprintf(stderr, "libxl_list_domain failed.\n"); @@ -4551,17 +4552,29 @@ int main_vcpulist(int argc, char **argv) return 0; } -static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) +int main_vcpupin(int argc, char **argv) { libxl_vcpuinfo *vcpuinfo; - libxl_bitmap cpumap; - - uint32_t vcpuid; + libxl_bitmap cpumap_hard, cpumap_soft;; + libxl_bitmap *soft = &cpumap_soft, *hard = &cpumap_hard; + uint32_t vcpuid, domid; + const char *vcpu, *hard_str, *soft_str; char *endptr; - int i, nb_cpu, nb_vcpu, rc = -1; + int opt, nb_cpu, nb_vcpu, rc = -1; - libxl_bitmap_init(&cpumap); + libxl_bitmap_init(&cpumap_hard); + libxl_bitmap_init(&cpumap_soft); + + SWITCH_FOREACH_OPT(opt, "", NULL, "vcpu-pin", 3) { + /* No options */ + } + domid = find_domain(argv[optind]); + vcpu = argv[optind+1]; + hard_str = argv[optind+2]; + soft_str = (argc > optind+3) ? argv[optind+3] : NULL; + + /* Figure out with which vCPU we are dealing with */ vcpuid = strtoul(vcpu, &endptr, 10); if (vcpu == endptr) { if (strcmp(vcpu, "all")) { @@ -4571,10 +4584,35 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) vcpuid = -1; } - if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) + if (libxl_cpu_bitmap_alloc(ctx, &cpumap_hard, 0) || + libxl_cpu_bitmap_alloc(ctx, &cpumap_soft, 0)) goto out; - if (vcpupin_parse(cpu, &cpumap)) + /* + * Syntax is: xl vcpu-pin + * We want to handle all the following cases ('-' means + * "leave it alone"): + * xl vcpu-pin 0 3 3,4 + * xl vcpu-pin 0 3 3,4 - + * xl vcpu-pin 0 3 - 6-9 + * xl vcpu-pin 0 3 3,4 6-9 + */ + + /* + * Hard affinity is always present. However, if it's "-", all we need + * is passing a NULL pointer to the libxl_set_vcpuaffinity() call below. + */ + if (!strcmp(hard_str, "-")) + hard = NULL; + else if (vcpupin_parse(hard_str, hard)) + goto out; + /* + * Soft affinity is handled similarly. Only difference: we also want + * to pass NULL to libxl_set_vcpuaffinity() if it is not specified. + */ + if (argc <= optind+3 || !strcmp(soft_str, "-")) + soft = NULL; + else if (vcpupin_parse(soft_str, soft)) goto out; if (dryrun_only) { @@ -4585,7 +4623,14 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } fprintf(stdout, "cpumap: "); - print_bitmap(cpumap.map, nb_cpu, stdout); + if (hard) + print_bitmap(hard->map, nb_cpu, stdout); + else + fprintf(stdout, "-"); + if (soft) { + fprintf(stdout, " "); + print_bitmap(soft->map, nb_cpu, stdout); + } fprintf(stdout, "\n"); if (ferror(stdout) || fflush(stdout)) { @@ -4598,43 +4643,29 @@ static int vcpupin(uint32_t domid, const char *vcpu, char *cpu) } if (vcpuid != -1) { - if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap, NULL)) { - fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", vcpuid); + if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, hard, soft)) { + fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", + vcpuid); goto out; } } else { - if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &i))) { + if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nb_cpu))) { fprintf(stderr, "libxl_list_vcpu failed.\n"); goto out; } - for (i = 0; i < nb_vcpu; i++) { - if (libxl_set_vcpuaffinity(ctx, domid, vcpuinfo[i].vcpuid, - &cpumap, NULL)) { - fprintf(stderr, "libxl_set_vcpuaffinity failed" - " on vcpu `%u'.\n", vcpuinfo[i].vcpuid); - } - } + if (libxl_set_vcpuaffinity_all(ctx, domid, nb_vcpu, hard, soft)) + fprintf(stderr, "Could not set affinity.\n"); libxl_vcpuinfo_list_free(vcpuinfo, nb_vcpu); } rc = 0; out: - libxl_bitmap_dispose(&cpumap); + libxl_bitmap_dispose(&cpumap_soft); + libxl_bitmap_dispose(&cpumap_hard); return rc; } -int main_vcpupin(int argc, char **argv) -{ - int opt; - - SWITCH_FOREACH_OPT(opt, "", NULL, "vcpu-pin", 3) { - /* No options */ - } - - return vcpupin(find_domain(argv[optind]), argv[optind+1] , argv[optind+2]); -} - static void vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) { char *endptr; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 4279b9f..7b7fa92 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -218,7 +218,7 @@ struct cmd_spec cmd_table[] = { { "vcpu-pin", &main_vcpupin, 1, 1, "Set which CPUs a VCPU can use", - " ", + " ", }, { "vcpu-set", &main_vcpuset, 0, 1, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMy-00087n-0F; Mon, 04 Aug 2014 08:11:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMx-00087W-Ch for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:47 +0000 Received: from [85.158.139.211:22168] by server-17.bemta-5.messagelabs.com id 0F/B6-08943-2404FD35; Mon, 04 Aug 2014 08:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1407139904!6278478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22018 invoked from network); 4 Aug 2014 08:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMu-0007Xp-Cb for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMu-0004Sq-BO for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:44 +0000 Date: Mon, 04 Aug 2014 08:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: move away from the use of cpumap for hard affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af589e1a9c77c52be5da84c6eabc92a2bb0e72d2 Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:28 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:44:53 2014 +0100 xl: move away from the use of cpumap for hard affinity and start using the vcpu_hard_affinity array instead. This is done as when, in a subsequent patch ("libxl/xl: make it possible to specify soft-affinity in domain config file") we will become able to deal with soft affinity, code can be shared. This change also enables more advanced VCPU to PCPU (hard, for now) affinity specification, in case a list is used, like: cpus = ["3-4", "2-6,^4"] What it means is that VCPU 0 must be pinned to PCPU 3,4 and VCPU 1 to PCPUs 2,3,5,6 (before this change, cpus=[xx, yy] only supported single values). Of course, the old (e.g., cpus=[2, 3]) syntax continues to work. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 12 ++++++++---- tools/libxl/xl_cmdimpl.c | 31 +++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index ff9ea77..ffd94a8 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -143,11 +143,15 @@ Combining this with "all" is also possible, meaning "all,^nodes:1" results in all the vcpus of the guest running on all the cpus on the host, except for the cpus belonging to the host NUMA node 1. -=item ["2", "3"] (or [2, 3]) +=item ["2", "3-8,^5"] -To ask for specific vcpu mapping. That means (in this example), vcpu #0 -of the guest will run on cpu #2 of the host and vcpu #1 of the guest will -run on cpu #3 of the host. +To ask for specific vcpu mapping. That means (in this example), vcpu 0 +of the guest will run on cpu 2 of the host and vcpu 1 of the guest will +run on cpus 3,4,6,7,8 of the host. + +More complex notation can be also used, exactly as described above. So +"all,^5-8", or just "all", or "node:0,node:2,^9-11,18-20" are all legal, +for each element of the list. =back diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ad445b0..8c2ef07 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -808,16 +808,15 @@ static void parse_config_data(const char *config_source, b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { - i = atoi(buf); - libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); if (libxl_cpu_bitmap_alloc(ctx, &b_info->vcpu_hard_affinity[j], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); exit(1); } - libxl_bitmap_set_none(&b_info->vcpu_hard_affinity[j]); - libxl_bitmap_set(&b_info->vcpu_hard_affinity[j], i); + + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) + exit(1); j++; } @@ -827,15 +826,31 @@ static void parse_config_data(const char *config_source, libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { - if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { - fprintf(stderr, "Unable to allocate cpumap\n"); + b_info->vcpu_hard_affinity = + xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); + + libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[0], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); exit(1); } - libxl_bitmap_set_none(&b_info->cpumap); - if (vcpupin_parse(buf, &b_info->cpumap)) + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) exit(1); + for (i = 1; i < b_info->max_vcpus; i++) { + libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[i], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); + exit(1); + } + libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], + &b_info->vcpu_hard_affinity[0]); + } + b_info->num_vcpu_hard_affinity = b_info->max_vcpus; + libxl_defbool_set(&b_info->numa_placement, false); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMy-00087n-0F; Mon, 04 Aug 2014 08:11:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMx-00087W-Ch for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:47 +0000 Received: from [85.158.139.211:22168] by server-17.bemta-5.messagelabs.com id 0F/B6-08943-2404FD35; Mon, 04 Aug 2014 08:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1407139904!6278478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22018 invoked from network); 4 Aug 2014 08:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDMu-0007Xp-Cb for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDMu-0004Sq-BO for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:44 +0000 Date: Mon, 04 Aug 2014 08:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: move away from the use of cpumap for hard affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af589e1a9c77c52be5da84c6eabc92a2bb0e72d2 Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:28 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:44:53 2014 +0100 xl: move away from the use of cpumap for hard affinity and start using the vcpu_hard_affinity array instead. This is done as when, in a subsequent patch ("libxl/xl: make it possible to specify soft-affinity in domain config file") we will become able to deal with soft affinity, code can be shared. This change also enables more advanced VCPU to PCPU (hard, for now) affinity specification, in case a list is used, like: cpus = ["3-4", "2-6,^4"] What it means is that VCPU 0 must be pinned to PCPU 3,4 and VCPU 1 to PCPUs 2,3,5,6 (before this change, cpus=[xx, yy] only supported single values). Of course, the old (e.g., cpus=[2, 3]) syntax continues to work. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 12 ++++++++---- tools/libxl/xl_cmdimpl.c | 31 +++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index ff9ea77..ffd94a8 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -143,11 +143,15 @@ Combining this with "all" is also possible, meaning "all,^nodes:1" results in all the vcpus of the guest running on all the cpus on the host, except for the cpus belonging to the host NUMA node 1. -=item ["2", "3"] (or [2, 3]) +=item ["2", "3-8,^5"] -To ask for specific vcpu mapping. That means (in this example), vcpu #0 -of the guest will run on cpu #2 of the host and vcpu #1 of the guest will -run on cpu #3 of the host. +To ask for specific vcpu mapping. That means (in this example), vcpu 0 +of the guest will run on cpu 2 of the host and vcpu 1 of the guest will +run on cpus 3,4,6,7,8 of the host. + +More complex notation can be also used, exactly as described above. So +"all,^5-8", or just "all", or "node:0,node:2,^9-11,18-20" are all legal, +for each element of the list. =back diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ad445b0..8c2ef07 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -808,16 +808,15 @@ static void parse_config_data(const char *config_source, b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { - i = atoi(buf); - libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); if (libxl_cpu_bitmap_alloc(ctx, &b_info->vcpu_hard_affinity[j], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); exit(1); } - libxl_bitmap_set_none(&b_info->vcpu_hard_affinity[j]); - libxl_bitmap_set(&b_info->vcpu_hard_affinity[j], i); + + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) + exit(1); j++; } @@ -827,15 +826,31 @@ static void parse_config_data(const char *config_source, libxl_defbool_set(&b_info->numa_placement, false); } else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { - if (libxl_cpu_bitmap_alloc(ctx, &b_info->cpumap, 0)) { - fprintf(stderr, "Unable to allocate cpumap\n"); + b_info->vcpu_hard_affinity = + xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); + + libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[0], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); exit(1); } - libxl_bitmap_set_none(&b_info->cpumap); - if (vcpupin_parse(buf, &b_info->cpumap)) + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) exit(1); + for (i = 1; i < b_info->max_vcpus; i++) { + libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[i], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); + exit(1); + } + libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], + &b_info->vcpu_hard_affinity[0]); + } + b_info->num_vcpu_hard_affinity = b_info->max_vcpus; + libxl_defbool_set(&b_info->numa_placement, false); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDN9-00089S-2y; Mon, 04 Aug 2014 08:11:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDN7-00089B-Nd for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:58 +0000 Received: from [193.109.254.147:39502] by server-3.bemta-14.messagelabs.com id C0/A0-23707-C404FD35; Mon, 04 Aug 2014 08:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1407139914!10188797!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9175 invoked from network); 4 Aug 2014 08:11:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDN4-0007Xy-Ho for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDN4-0004Ti-Gg for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:54 +0000 Date: Mon, 04 Aug 2014 08:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: move the vcpu affinity parsing in a function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 14ea07848b8b0f00ea311ee5413932129b6f6c72 Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:42 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:45:25 2014 +0100 xl: move the vcpu affinity parsing in a function so that such parsing code can be used for both hard and soft affinity, the support for which is introduced in the next change. This is pure code motion, no functional change intended. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 127 +++++++++++++++++++++++++--------------------- 1 files changed, 70 insertions(+), 57 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8c2ef07..6b91f76 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -691,6 +691,72 @@ static void parse_top_level_sdl_options(XLU_Config *config, xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); } +static void parse_vcpu_affinity(XLU_Config *config, + libxl_domain_build_info *b_info) +{ + XLU_ConfigList *cpus; + const char *buf; + int num_cpus; + + if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { + int j = 0; + + /* Silently ignore values corresponding to non existing vcpus */ + if (num_cpus > b_info->max_vcpus) + num_cpus = b_info->max_vcpus; + + b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); + + while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { + libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[j], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); + exit(1); + } + + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) + exit(1); + + j++; + } + b_info->num_vcpu_hard_affinity = num_cpus; + + /* We have a list of cpumaps, disable automatic placement */ + libxl_defbool_set(&b_info->numa_placement, false); + } + else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { + int i; + + b_info->vcpu_hard_affinity = + xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); + + libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[0], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); + exit(1); + } + + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) + exit(1); + + for (i = 1; i < b_info->max_vcpus; i++) { + libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[i], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); + exit(1); + } + libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], + &b_info->vcpu_hard_affinity[0]); + } + b_info->num_vcpu_hard_affinity = b_info->max_vcpus; + + libxl_defbool_set(&b_info->numa_placement, false); + } +} + static void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -699,9 +765,9 @@ static void parse_config_data(const char *config_source, const char *buf; long l; XLU_Config *config; - XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; + XLU_ConfigList *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; - int num_ioports, num_irqs, num_iomem, num_cpus; + int num_ioports, num_irqs, num_iomem; int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; @@ -798,61 +864,8 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; - if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { - int j = 0; - - /* Silently ignore values corresponding to non existing vcpus */ - if (num_cpus > b_info->max_vcpus) - num_cpus = b_info->max_vcpus; - - b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); - - while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[j], 0)) { - fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); - exit(1); - } - - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) - exit(1); - - j++; - } - b_info->num_vcpu_hard_affinity = num_cpus; - - /* We have a list of cpumaps, disable automatic placement */ - libxl_defbool_set(&b_info->numa_placement, false); - } - else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { - b_info->vcpu_hard_affinity = - xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); - - libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[0], 0)) { - fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); - exit(1); - } - - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) - exit(1); - - for (i = 1; i < b_info->max_vcpus; i++) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[i], 0)) { - fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); - exit(1); - } - libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], - &b_info->vcpu_hard_affinity[0]); - } - b_info->num_vcpu_hard_affinity = b_info->max_vcpus; - - libxl_defbool_set(&b_info->numa_placement, false); - } + /* Figure out VCPU hard-affinity ("cpus" config option) */ + parse_vcpu_affinity(config, b_info); if (!xlu_cfg_get_long (config, "memory", &l, 0)) { b_info->max_memkb = l * 1024; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:11:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:11:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDN9-00089S-2y; Mon, 04 Aug 2014 08:11:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDN7-00089B-Nd for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:58 +0000 Received: from [193.109.254.147:39502] by server-3.bemta-14.messagelabs.com id C0/A0-23707-C404FD35; Mon, 04 Aug 2014 08:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1407139914!10188797!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9175 invoked from network); 4 Aug 2014 08:11:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDN4-0007Xy-Ho for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDN4-0004Ti-Gg for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:11:54 +0000 Date: Mon, 04 Aug 2014 08:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: move the vcpu affinity parsing in a function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 14ea07848b8b0f00ea311ee5413932129b6f6c72 Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:42 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:45:25 2014 +0100 xl: move the vcpu affinity parsing in a function so that such parsing code can be used for both hard and soft affinity, the support for which is introduced in the next change. This is pure code motion, no functional change intended. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 127 +++++++++++++++++++++++++--------------------- 1 files changed, 70 insertions(+), 57 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8c2ef07..6b91f76 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -691,6 +691,72 @@ static void parse_top_level_sdl_options(XLU_Config *config, xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); } +static void parse_vcpu_affinity(XLU_Config *config, + libxl_domain_build_info *b_info) +{ + XLU_ConfigList *cpus; + const char *buf; + int num_cpus; + + if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { + int j = 0; + + /* Silently ignore values corresponding to non existing vcpus */ + if (num_cpus > b_info->max_vcpus) + num_cpus = b_info->max_vcpus; + + b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); + + while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { + libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[j], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); + exit(1); + } + + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) + exit(1); + + j++; + } + b_info->num_vcpu_hard_affinity = num_cpus; + + /* We have a list of cpumaps, disable automatic placement */ + libxl_defbool_set(&b_info->numa_placement, false); + } + else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { + int i; + + b_info->vcpu_hard_affinity = + xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); + + libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[0], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); + exit(1); + } + + if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) + exit(1); + + for (i = 1; i < b_info->max_vcpus; i++) { + libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); + if (libxl_cpu_bitmap_alloc(ctx, + &b_info->vcpu_hard_affinity[i], 0)) { + fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); + exit(1); + } + libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], + &b_info->vcpu_hard_affinity[0]); + } + b_info->num_vcpu_hard_affinity = b_info->max_vcpus; + + libxl_defbool_set(&b_info->numa_placement, false); + } +} + static void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -699,9 +765,9 @@ static void parse_config_data(const char *config_source, const char *buf; long l; XLU_Config *config; - XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; + XLU_ConfigList *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; - int num_ioports, num_irqs, num_iomem, num_cpus; + int num_ioports, num_irqs, num_iomem; int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; @@ -798,61 +864,8 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; - if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { - int j = 0; - - /* Silently ignore values corresponding to non existing vcpus */ - if (num_cpus > b_info->max_vcpus) - num_cpus = b_info->max_vcpus; - - b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); - - while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[j], 0)) { - fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); - exit(1); - } - - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) - exit(1); - - j++; - } - b_info->num_vcpu_hard_affinity = num_cpus; - - /* We have a list of cpumaps, disable automatic placement */ - libxl_defbool_set(&b_info->numa_placement, false); - } - else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { - b_info->vcpu_hard_affinity = - xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); - - libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[0], 0)) { - fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); - exit(1); - } - - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) - exit(1); - - for (i = 1; i < b_info->max_vcpus; i++) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[i], 0)) { - fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); - exit(1); - } - libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], - &b_info->vcpu_hard_affinity[0]); - } - b_info->num_vcpu_hard_affinity = b_info->max_vcpus; - - libxl_defbool_set(&b_info->numa_placement, false); - } + /* Figure out VCPU hard-affinity ("cpus" config option) */ + parse_vcpu_affinity(config, b_info); if (!xlu_cfg_get_long (config, "memory", &l, 0)) { b_info->max_memkb = l * 1024; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNJ-0008Au-5h; Mon, 04 Aug 2014 08:12:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNI-0008Af-7V for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:08 +0000 Received: from [85.158.137.68:3085] by server-13.bemta-3.messagelabs.com id AD/E5-09942-7504FD35; Mon, 04 Aug 2014 08:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1407139925!11698505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19392 invoked from network); 4 Aug 2014 08:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNE-0007YV-P0 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNE-0004UE-MU for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:04 +0000 Date: Mon, 04 Aug 2014 08:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/xl: make it possible to specify soft-affinity in domain config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d00662816fe74678c5b233c59e40dca604ca2bd Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:52 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:45:25 2014 +0100 libxl/xl: make it possible to specify soft-affinity in domain config file To do so, we add the vcpu_soft_affinity array to build_info, and treat it much like vcpu_hard_affinity. The new config option is called "cpus_soft". Note that the vcpu_hard_affinity array, introduced in a previous patch, and the vcpu_soft_affinity array, introduced here, share the same LIBXL_HAVE_xxx macro, in libxl.h. That is called LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS, and was introduced together with vcpu_hard_affinity, but only inside a comment. In this change, we uncomment, and hence properly define it. In order to avoid having to issue separate calls to libxl_set_vcpuaffinity() (one for hard affinity and one for soft affinity) in libxl__build_pre(), in case the caller uses b_info->cpumap (for the former) and b_info->vcpu_soft_affinity (for the latter), we also set (again!) a new default for b_info->cpumap. This allows, from this change on, to always and only deal with b_info->vcpu_hard_affinity all around libxl internals. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 23 ++++++++++- tools/libxl/libxl.h | 3 +- tools/libxl/libxl_create.c | 15 +++++++ tools/libxl/libxl_dom.c | 33 ++++++++++++---- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 88 +++++++++++++++++++++++++----------------- 6 files changed, 113 insertions(+), 50 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index ffd94a8..5833054 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -156,19 +156,36 @@ for each element of the list. =back If this option is not specified, no vcpu to cpu pinning is established, -and the vcpus of the guest can run on all the cpus of the host. +and the vcpus of the guest can run on all the cpus of the host. If this +option is specified, the intersection of the vcpu pinning mask, provided +here, and the soft affinity mask, provided via B (if any), +is utilized to compute the domain node-affinity, for driving memory +allocations. If we are on a NUMA machine (i.e., if the host has more than one NUMA node) and this option is not specified, libxl automatically tries to place the guest on the least possible number of nodes. That, however, will not affect vcpu pinning, so the guest will still be able to run on -all the cpus, it will just prefer the ones from the node it has been -placed on. A heuristic approach is used for choosing the best node (or +all the cpus. A heuristic approach is used for choosing the best node (or set of nodes), with the goals of maximizing performance for the guest and, at the same time, achieving efficient utilization of host cpus and memory. See F for more details. +=item B + +Exactly as B, but specifies soft affinity, rather than pinning +(hard affinity). When using the credit scheduler, this means what cpus +the vcpus of the domain prefer. + +A C is specified exactly as above, for B. + +If this option is not specified, the vcpus of the guest will not have +any preference regarding on what cpu to run. If this option is specified, +the intersection of the soft affinity mask, provided here, and the vcpu +pinning, provided via B (if any), is utilized to compute the +domain node-affinity, for driving memory allocations. + =back =head3 CPU Scheduling diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 5ae6532..bfeb3bc 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -380,8 +380,7 @@ typedef struct libxl__ctx libxl_ctx; * Each bitmap should be big enough to accommodate the maximum number of * PCPUs of the host. */ -/* to be uncommented when soft array added */ -/* #define LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS 1 */ +#define LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS 1 /* * LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5bc8286..9b66294 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -187,6 +187,21 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) return ERROR_FAIL; + /* In libxl internals, we want to deal with vcpu_hard_affinity only! */ + if (b_info->cpumap.size && !b_info->num_vcpu_hard_affinity) { + int i; + + b_info->vcpu_hard_affinity = libxl__calloc(gc, b_info->max_vcpus, + sizeof(libxl_bitmap)); + for (i = 0; i < b_info->max_vcpus; i++) { + if (libxl_cpu_bitmap_alloc(CTX, &b_info->vcpu_hard_affinity[i], 0)) + return ERROR_FAIL; + libxl_bitmap_copy(CTX, &b_info->vcpu_hard_affinity[i], + &b_info->cpumap); + } + b_info->num_vcpu_hard_affinity = b_info->max_vcpus; + } + libxl_defbool_setdefault(&b_info->numa_placement, true); if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 83eb29a..cfbd13d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -272,21 +272,36 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); /* As mentioned in libxl.h, vcpu_hard_array takes precedence */ - if (info->num_vcpu_hard_affinity) { - int i; + if (info->num_vcpu_hard_affinity || info->num_vcpu_soft_affinity) { + libxl_bitmap *hard_affinity, *soft_affinity; + int i, n_vcpus; + + n_vcpus = info->num_vcpu_hard_affinity > info->num_vcpu_soft_affinity ? + info->num_vcpu_hard_affinity : info->num_vcpu_soft_affinity; + + for (i = 0; i < n_vcpus; i++) { + /* + * Prepare hard and soft affinity pointers in a way that allows + * us to issue only one call to libxl_set_vcpuaffinity(), setting, + * for each vcpu, both hard and soft affinity "atomically". + */ + hard_affinity = NULL; + if (info->num_vcpu_hard_affinity && + i < info->num_vcpu_hard_affinity) + hard_affinity = &info->vcpu_hard_affinity[i]; + + soft_affinity = NULL; + if (info->num_vcpu_soft_affinity && + i < info->num_vcpu_soft_affinity) + soft_affinity = &info->vcpu_soft_affinity[i]; - for (i = 0; i < info->num_vcpu_hard_affinity; i++) { if (libxl_set_vcpuaffinity(ctx, domid, i, - &info->vcpu_hard_affinity[i], - NULL)) { + hard_affinity, soft_affinity)) { LOG(ERROR, "setting affinity failed on vcpu `%d'", i); return ERROR_FAIL; } } - } else if (info->cpumap.size) - libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, - &info->cpumap, NULL); - + } if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 0) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index a412f9c..0b3496f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -319,6 +319,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("cpumap", libxl_bitmap), ("nodemap", libxl_bitmap), ("vcpu_hard_affinity", Array(libxl_bitmap, "num_vcpu_hard_affinity")), + ("vcpu_soft_affinity", Array(libxl_bitmap, "num_vcpu_soft_affinity")), ("numa_placement", libxl_defbool), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6b91f76..f1c136a 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -691,67 +691,76 @@ static void parse_top_level_sdl_options(XLU_Config *config, xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); } -static void parse_vcpu_affinity(XLU_Config *config, - libxl_domain_build_info *b_info) +static void parse_vcpu_affinity(libxl_domain_build_info *b_info, + XLU_ConfigList *cpus, const char *buf, + int num_cpus, bool is_hard) { - XLU_ConfigList *cpus; - const char *buf; - int num_cpus; + libxl_bitmap *vcpu_affinity_array; - if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { - int j = 0; + /* + * If we are here, and buf is !NULL, we're dealing with a string. What + * we do in this case is parse it, and copy the result in _all_ (up to + * b_info->max_vcpus) the elements of the vcpu affinity array. + * + * If buf is NULL, we have a list, and what we do is putting in the + * i-eth element of the vcpu affinity array the result of the parsing + * of the i-eth entry of the list. If there are more vcpus than + * entries, it is fine to just not touch the last array elements. + */ - /* Silently ignore values corresponding to non existing vcpus */ - if (num_cpus > b_info->max_vcpus) - num_cpus = b_info->max_vcpus; + /* Silently ignore values corresponding to non existing vcpus */ + if (buf || num_cpus > b_info->max_vcpus) + num_cpus = b_info->max_vcpus; + if (is_hard) { + b_info->num_vcpu_hard_affinity = num_cpus; b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); + vcpu_affinity_array = b_info->vcpu_hard_affinity; + } else { + b_info->num_vcpu_soft_affinity = num_cpus; + b_info->vcpu_soft_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); + vcpu_affinity_array = b_info->vcpu_soft_affinity; + } + + if (!buf) { + int j = 0; while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[j], 0)) { + libxl_bitmap_init(&vcpu_affinity_array[j]); + if (libxl_cpu_bitmap_alloc(ctx, &vcpu_affinity_array[j], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); exit(1); } - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) + if (vcpupin_parse(buf, &vcpu_affinity_array[j])) exit(1); j++; } - b_info->num_vcpu_hard_affinity = num_cpus; /* We have a list of cpumaps, disable automatic placement */ libxl_defbool_set(&b_info->numa_placement, false); - } - else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { + } else { int i; - b_info->vcpu_hard_affinity = - xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); - - libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[0], 0)) { + libxl_bitmap_init(&vcpu_affinity_array[0]); + if (libxl_cpu_bitmap_alloc(ctx, &vcpu_affinity_array[0], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); exit(1); } - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) + if (vcpupin_parse(buf, &vcpu_affinity_array[0])) exit(1); for (i = 1; i < b_info->max_vcpus; i++) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[i], 0)) { + libxl_bitmap_init(&vcpu_affinity_array[i]); + if (libxl_cpu_bitmap_alloc(ctx, &vcpu_affinity_array[i], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); exit(1); } - libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], - &b_info->vcpu_hard_affinity[0]); + libxl_bitmap_copy(ctx, &vcpu_affinity_array[i], + &vcpu_affinity_array[0]); } - b_info->num_vcpu_hard_affinity = b_info->max_vcpus; libxl_defbool_set(&b_info->numa_placement, false); } @@ -765,9 +774,9 @@ static void parse_config_data(const char *config_source, const char *buf; long l; XLU_Config *config; - XLU_ConfigList *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; - int num_ioports, num_irqs, num_iomem; + int num_ioports, num_irqs, num_iomem, num_cpus; int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; @@ -864,8 +873,15 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; - /* Figure out VCPU hard-affinity ("cpus" config option) */ - parse_vcpu_affinity(config, b_info); + buf = NULL; + if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1) || + !xlu_cfg_get_string (config, "cpus", &buf, 0)) + parse_vcpu_affinity(b_info, cpus, buf, num_cpus, /* is_hard */ true); + + buf = NULL; + if (!xlu_cfg_get_list (config, "cpus_soft", &cpus, &num_cpus, 1) || + !xlu_cfg_get_string (config, "cpus_soft", &buf, 0)) + parse_vcpu_affinity(b_info, cpus, buf, num_cpus, false); if (!xlu_cfg_get_long (config, "memory", &l, 0)) { b_info->max_memkb = l * 1024; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNJ-0008Au-5h; Mon, 04 Aug 2014 08:12:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNI-0008Af-7V for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:08 +0000 Received: from [85.158.137.68:3085] by server-13.bemta-3.messagelabs.com id AD/E5-09942-7504FD35; Mon, 04 Aug 2014 08:12:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1407139925!11698505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19392 invoked from network); 4 Aug 2014 08:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNE-0007YV-P0 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNE-0004UE-MU for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:04 +0000 Date: Mon, 04 Aug 2014 08:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/xl: make it possible to specify soft-affinity in domain config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d00662816fe74678c5b233c59e40dca604ca2bd Author: Dario Faggioli AuthorDate: Tue Jul 29 18:06:52 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:45:25 2014 +0100 libxl/xl: make it possible to specify soft-affinity in domain config file To do so, we add the vcpu_soft_affinity array to build_info, and treat it much like vcpu_hard_affinity. The new config option is called "cpus_soft". Note that the vcpu_hard_affinity array, introduced in a previous patch, and the vcpu_soft_affinity array, introduced here, share the same LIBXL_HAVE_xxx macro, in libxl.h. That is called LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS, and was introduced together with vcpu_hard_affinity, but only inside a comment. In this change, we uncomment, and hence properly define it. In order to avoid having to issue separate calls to libxl_set_vcpuaffinity() (one for hard affinity and one for soft affinity) in libxl__build_pre(), in case the caller uses b_info->cpumap (for the former) and b_info->vcpu_soft_affinity (for the latter), we also set (again!) a new default for b_info->cpumap. This allows, from this change on, to always and only deal with b_info->vcpu_hard_affinity all around libxl internals. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 23 ++++++++++- tools/libxl/libxl.h | 3 +- tools/libxl/libxl_create.c | 15 +++++++ tools/libxl/libxl_dom.c | 33 ++++++++++++---- tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 88 +++++++++++++++++++++++++----------------- 6 files changed, 113 insertions(+), 50 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index ffd94a8..5833054 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -156,19 +156,36 @@ for each element of the list. =back If this option is not specified, no vcpu to cpu pinning is established, -and the vcpus of the guest can run on all the cpus of the host. +and the vcpus of the guest can run on all the cpus of the host. If this +option is specified, the intersection of the vcpu pinning mask, provided +here, and the soft affinity mask, provided via B (if any), +is utilized to compute the domain node-affinity, for driving memory +allocations. If we are on a NUMA machine (i.e., if the host has more than one NUMA node) and this option is not specified, libxl automatically tries to place the guest on the least possible number of nodes. That, however, will not affect vcpu pinning, so the guest will still be able to run on -all the cpus, it will just prefer the ones from the node it has been -placed on. A heuristic approach is used for choosing the best node (or +all the cpus. A heuristic approach is used for choosing the best node (or set of nodes), with the goals of maximizing performance for the guest and, at the same time, achieving efficient utilization of host cpus and memory. See F for more details. +=item B + +Exactly as B, but specifies soft affinity, rather than pinning +(hard affinity). When using the credit scheduler, this means what cpus +the vcpus of the domain prefer. + +A C is specified exactly as above, for B. + +If this option is not specified, the vcpus of the guest will not have +any preference regarding on what cpu to run. If this option is specified, +the intersection of the soft affinity mask, provided here, and the vcpu +pinning, provided via B (if any), is utilized to compute the +domain node-affinity, for driving memory allocations. + =back =head3 CPU Scheduling diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 5ae6532..bfeb3bc 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -380,8 +380,7 @@ typedef struct libxl__ctx libxl_ctx; * Each bitmap should be big enough to accommodate the maximum number of * PCPUs of the host. */ -/* to be uncommented when soft array added */ -/* #define LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS 1 */ +#define LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS 1 /* * LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5bc8286..9b66294 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -187,6 +187,21 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } else if (b_info->avail_vcpus.size > HVM_MAX_VCPUS) return ERROR_FAIL; + /* In libxl internals, we want to deal with vcpu_hard_affinity only! */ + if (b_info->cpumap.size && !b_info->num_vcpu_hard_affinity) { + int i; + + b_info->vcpu_hard_affinity = libxl__calloc(gc, b_info->max_vcpus, + sizeof(libxl_bitmap)); + for (i = 0; i < b_info->max_vcpus; i++) { + if (libxl_cpu_bitmap_alloc(CTX, &b_info->vcpu_hard_affinity[i], 0)) + return ERROR_FAIL; + libxl_bitmap_copy(CTX, &b_info->vcpu_hard_affinity[i], + &b_info->cpumap); + } + b_info->num_vcpu_hard_affinity = b_info->max_vcpus; + } + libxl_defbool_setdefault(&b_info->numa_placement, true); if (b_info->max_memkb == LIBXL_MEMKB_DEFAULT) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 83eb29a..cfbd13d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -272,21 +272,36 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); /* As mentioned in libxl.h, vcpu_hard_array takes precedence */ - if (info->num_vcpu_hard_affinity) { - int i; + if (info->num_vcpu_hard_affinity || info->num_vcpu_soft_affinity) { + libxl_bitmap *hard_affinity, *soft_affinity; + int i, n_vcpus; + + n_vcpus = info->num_vcpu_hard_affinity > info->num_vcpu_soft_affinity ? + info->num_vcpu_hard_affinity : info->num_vcpu_soft_affinity; + + for (i = 0; i < n_vcpus; i++) { + /* + * Prepare hard and soft affinity pointers in a way that allows + * us to issue only one call to libxl_set_vcpuaffinity(), setting, + * for each vcpu, both hard and soft affinity "atomically". + */ + hard_affinity = NULL; + if (info->num_vcpu_hard_affinity && + i < info->num_vcpu_hard_affinity) + hard_affinity = &info->vcpu_hard_affinity[i]; + + soft_affinity = NULL; + if (info->num_vcpu_soft_affinity && + i < info->num_vcpu_soft_affinity) + soft_affinity = &info->vcpu_soft_affinity[i]; - for (i = 0; i < info->num_vcpu_hard_affinity; i++) { if (libxl_set_vcpuaffinity(ctx, domid, i, - &info->vcpu_hard_affinity[i], - NULL)) { + hard_affinity, soft_affinity)) { LOG(ERROR, "setting affinity failed on vcpu `%d'", i); return ERROR_FAIL; } } - } else if (info->cpumap.size) - libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, - &info->cpumap, NULL); - + } if (xc_domain_setmaxmem(ctx->xch, domid, info->target_memkb + LIBXL_MAXMEM_CONSTANT) < 0) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index a412f9c..0b3496f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -319,6 +319,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("cpumap", libxl_bitmap), ("nodemap", libxl_bitmap), ("vcpu_hard_affinity", Array(libxl_bitmap, "num_vcpu_hard_affinity")), + ("vcpu_soft_affinity", Array(libxl_bitmap, "num_vcpu_soft_affinity")), ("numa_placement", libxl_defbool), ("tsc_mode", libxl_tsc_mode), ("max_memkb", MemKB), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6b91f76..f1c136a 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -691,67 +691,76 @@ static void parse_top_level_sdl_options(XLU_Config *config, xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); } -static void parse_vcpu_affinity(XLU_Config *config, - libxl_domain_build_info *b_info) +static void parse_vcpu_affinity(libxl_domain_build_info *b_info, + XLU_ConfigList *cpus, const char *buf, + int num_cpus, bool is_hard) { - XLU_ConfigList *cpus; - const char *buf; - int num_cpus; + libxl_bitmap *vcpu_affinity_array; - if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1)) { - int j = 0; + /* + * If we are here, and buf is !NULL, we're dealing with a string. What + * we do in this case is parse it, and copy the result in _all_ (up to + * b_info->max_vcpus) the elements of the vcpu affinity array. + * + * If buf is NULL, we have a list, and what we do is putting in the + * i-eth element of the vcpu affinity array the result of the parsing + * of the i-eth entry of the list. If there are more vcpus than + * entries, it is fine to just not touch the last array elements. + */ - /* Silently ignore values corresponding to non existing vcpus */ - if (num_cpus > b_info->max_vcpus) - num_cpus = b_info->max_vcpus; + /* Silently ignore values corresponding to non existing vcpus */ + if (buf || num_cpus > b_info->max_vcpus) + num_cpus = b_info->max_vcpus; + if (is_hard) { + b_info->num_vcpu_hard_affinity = num_cpus; b_info->vcpu_hard_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); + vcpu_affinity_array = b_info->vcpu_hard_affinity; + } else { + b_info->num_vcpu_soft_affinity = num_cpus; + b_info->vcpu_soft_affinity = xmalloc(num_cpus * sizeof(libxl_bitmap)); + vcpu_affinity_array = b_info->vcpu_soft_affinity; + } + + if (!buf) { + int j = 0; while ((buf = xlu_cfg_get_listitem(cpus, j)) != NULL && j < num_cpus) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[j]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[j], 0)) { + libxl_bitmap_init(&vcpu_affinity_array[j]); + if (libxl_cpu_bitmap_alloc(ctx, &vcpu_affinity_array[j], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", j); exit(1); } - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[j])) + if (vcpupin_parse(buf, &vcpu_affinity_array[j])) exit(1); j++; } - b_info->num_vcpu_hard_affinity = num_cpus; /* We have a list of cpumaps, disable automatic placement */ libxl_defbool_set(&b_info->numa_placement, false); - } - else if (!xlu_cfg_get_string (config, "cpus", &buf, 0)) { + } else { int i; - b_info->vcpu_hard_affinity = - xmalloc(b_info->max_vcpus * sizeof(libxl_bitmap)); - - libxl_bitmap_init(&b_info->vcpu_hard_affinity[0]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[0], 0)) { + libxl_bitmap_init(&vcpu_affinity_array[0]); + if (libxl_cpu_bitmap_alloc(ctx, &vcpu_affinity_array[0], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu 0\n"); exit(1); } - if (vcpupin_parse(buf, &b_info->vcpu_hard_affinity[0])) + if (vcpupin_parse(buf, &vcpu_affinity_array[0])) exit(1); for (i = 1; i < b_info->max_vcpus; i++) { - libxl_bitmap_init(&b_info->vcpu_hard_affinity[i]); - if (libxl_cpu_bitmap_alloc(ctx, - &b_info->vcpu_hard_affinity[i], 0)) { + libxl_bitmap_init(&vcpu_affinity_array[i]); + if (libxl_cpu_bitmap_alloc(ctx, &vcpu_affinity_array[i], 0)) { fprintf(stderr, "Unable to allocate cpumap for vcpu %d\n", i); exit(1); } - libxl_bitmap_copy(ctx, &b_info->vcpu_hard_affinity[i], - &b_info->vcpu_hard_affinity[0]); + libxl_bitmap_copy(ctx, &vcpu_affinity_array[i], + &vcpu_affinity_array[0]); } - b_info->num_vcpu_hard_affinity = b_info->max_vcpus; libxl_defbool_set(&b_info->numa_placement, false); } @@ -765,9 +774,9 @@ static void parse_config_data(const char *config_source, const char *buf; long l; XLU_Config *config; - XLU_ConfigList *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; - int num_ioports, num_irqs, num_iomem; + int num_ioports, num_irqs, num_iomem, num_cpus; int pci_power_mgmt = 0; int pci_msitranslate = 0; int pci_permissive = 0; @@ -864,8 +873,15 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; - /* Figure out VCPU hard-affinity ("cpus" config option) */ - parse_vcpu_affinity(config, b_info); + buf = NULL; + if (!xlu_cfg_get_list (config, "cpus", &cpus, &num_cpus, 1) || + !xlu_cfg_get_string (config, "cpus", &buf, 0)) + parse_vcpu_affinity(b_info, cpus, buf, num_cpus, /* is_hard */ true); + + buf = NULL; + if (!xlu_cfg_get_list (config, "cpus_soft", &cpus, &num_cpus, 1) || + !xlu_cfg_get_string (config, "cpus_soft", &buf, 0)) + parse_vcpu_affinity(b_info, cpus, buf, num_cpus, false); if (!xlu_cfg_get_long (config, "memory", &l, 0)) { b_info->max_memkb = l * 1024; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNT-0008Cj-AT; Mon, 04 Aug 2014 08:12:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNS-0008CU-4I for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:18 +0000 Received: from [193.109.254.147:41622] by server-1.bemta-14.messagelabs.com id FA/46-24760-1604FD35; Mon, 04 Aug 2014 08:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1407139935!13516267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1834 invoked from network); 4 Aug 2014 08:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNP-0007Yf-5F for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNO-0004Ud-V7 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:15 +0000 Date: Mon, 04 Aug 2014 08:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: automatic NUMA placement affects soft affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 705fad1227a3313f05e0f64da46d19a5c52dacde Author: Dario Faggioli AuthorDate: Tue Jul 29 18:07:09 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:45:25 2014 +0100 libxl: automatic NUMA placement affects soft affinity vCPU soft affinity and NUMA-aware scheduling does not have to be related. However, soft affinity is how NUMA-aware scheduling is actually implemented, and therefore, by default, the results of automatic NUMA placement (at VM creation time) are also used to set the soft affinity of all the vCPUs of the domain. Of course, this only happens if automatic NUMA placement is enabled and actually takes place (for instance, if the user does not specify any hard and soft affiniy in the xl config file). This also takes care of the vice-versa, i.e., don't trigger automatic placement if the config file specifies either an hard (the check for which was already there) or a soft (the check for which is introduced by this commit) affinity. Signed-off-by: Dario Faggioli Acked-by: George Dunlap Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 21 ++++++++++--------- docs/misc/xl-numa-placement.markdown | 14 +++++++++++- tools/libxl/libxl_dom.c | 36 +++++++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 5833054..1e04eed 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -162,16 +162,6 @@ here, and the soft affinity mask, provided via B (if any), is utilized to compute the domain node-affinity, for driving memory allocations. -If we are on a NUMA machine (i.e., if the host has more than one NUMA -node) and this option is not specified, libxl automatically tries to -place the guest on the least possible number of nodes. That, however, -will not affect vcpu pinning, so the guest will still be able to run on -all the cpus. A heuristic approach is used for choosing the best node (or -set of nodes), with the goals of maximizing performance for the guest -and, at the same time, achieving efficient utilization of host cpus -and memory. See F for more -details. - =item B Exactly as B, but specifies soft affinity, rather than pinning @@ -186,6 +176,17 @@ the intersection of the soft affinity mask, provided here, and the vcpu pinning, provided via B (if any), is utilized to compute the domain node-affinity, for driving memory allocations. +If this option is not specified (and B is not specified either), +libxl automatically tries to place the guest on the least possible +number of nodes. A heuristic approach is used for choosing the best +node (or set of nodes), with the goal of maximizing performance for +the guest and, at the same time, achieving efficient utilization of +host cpus and memory. In that case, the soft affinity of all the vcpus +of the domain will be set to the pcpus belonging to the NUMA nodes +chosen during placement. + +For more details, see F. + =back =head3 CPU Scheduling diff --git a/docs/misc/xl-numa-placement.markdown b/docs/misc/xl-numa-placement.markdown index 9d64eae..f863492 100644 --- a/docs/misc/xl-numa-placement.markdown +++ b/docs/misc/xl-numa-placement.markdown @@ -126,10 +126,20 @@ or Xen won't be able to guarantee the locality for their memory accesses. That, of course, also mean the vCPUs of the domain will only be able to execute on those same pCPUs. +It is is also possible to have a "cpus\_soft=" option in the xl config file, +to specify the soft affinity for all the vCPUs of the domain. This affects +the NUMA placement in the following way: + + * if only "cpus\_soft=" is present, the VM's node-affinity will be equal + to the nodes to which the pCPUs in the soft affinity mask belong; + * if both "cpus\_soft=" and "cpus=" are present, the VM's node-affinity + will be equal to the nodes to which the pCPUs present both in hard and + soft affinity belong. + ### Placing the guest automatically ### -If no "cpus=" option is specified in the config file, libxl tries -to figure out on its own on which node(s) the domain could fit best. +If neither "cpus=" nor "cpus\_soft=" are present in the config file, libxl +tries to figure out on its own on which node(s) the domain could fit best. If it finds one (some), the domain's node affinity get set to there, and both memory allocations and NUMA aware scheduling (for the credit scheduler and starting from Xen 4.3) will comply with it. Starting from diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index cfbd13d..c944804 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -247,11 +247,20 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, * updated accordingly; if it does not manage, info->nodemap is just left * alone. It is then the the subsequent call to * libxl_domain_set_nodeaffinity() that enacts the actual placement. + * + * As far as scheduling is concerned, we achieve NUMA-aware scheduling + * by having the results of placement affect the soft affinity of all + * the vcpus of the domain. Of course, we want that iff placement is + * enabled and actually happens, so we only change info->cpumap_soft to + * reflect the placement result if that is the case */ if (libxl_defbool_val(info->numa_placement)) { - if (info->cpumap.size || info->num_vcpu_hard_affinity) { + libxl_bitmap cpumap_soft; + + if (info->cpumap.size || + info->num_vcpu_hard_affinity || info->num_vcpu_soft_affinity) { LOG(ERROR, "Can run NUMA placement only if no vcpu " - "affinity is specified explicitly"); + "(hard or soft) affinity is specified explicitly"); return ERROR_INVAL; } if (info->nodemap.size) { @@ -265,9 +274,30 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, return rc; libxl_bitmap_set_any(&info->nodemap); - rc = numa_place_domain(gc, domid, info); + rc = libxl_cpu_bitmap_alloc(ctx, &cpumap_soft, 0); if (rc) return rc; + + rc = numa_place_domain(gc, domid, info); + if (rc) { + libxl_bitmap_dispose(&cpumap_soft); + return rc; + } + + /* + * All we need to do now is converting the result of automatic + * placement from nodemap to cpumap, and then use such cpumap as + * the soft affinity for all the vcpus of the domain. + * + * When calling libxl_set_vcpuaffinity_all(), it is ok to use NULL + * as hard affinity, as we know we don't have one, or we won't be + * here. + */ + libxl_nodemap_to_cpumap(ctx, &info->nodemap, &cpumap_soft); + libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, + NULL, &cpumap_soft); + + libxl_bitmap_dispose(&cpumap_soft); } if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNT-0008Cj-AT; Mon, 04 Aug 2014 08:12:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNS-0008CU-4I for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:18 +0000 Received: from [193.109.254.147:41622] by server-1.bemta-14.messagelabs.com id FA/46-24760-1604FD35; Mon, 04 Aug 2014 08:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1407139935!13516267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1834 invoked from network); 4 Aug 2014 08:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNP-0007Yf-5F for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNO-0004Ud-V7 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:15 +0000 Date: Mon, 04 Aug 2014 08:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: automatic NUMA placement affects soft affinity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 705fad1227a3313f05e0f64da46d19a5c52dacde Author: Dario Faggioli AuthorDate: Tue Jul 29 18:07:09 2014 +0200 Commit: Ian Campbell CommitDate: Wed Jul 30 12:45:25 2014 +0100 libxl: automatic NUMA placement affects soft affinity vCPU soft affinity and NUMA-aware scheduling does not have to be related. However, soft affinity is how NUMA-aware scheduling is actually implemented, and therefore, by default, the results of automatic NUMA placement (at VM creation time) are also used to set the soft affinity of all the vCPUs of the domain. Of course, this only happens if automatic NUMA placement is enabled and actually takes place (for instance, if the user does not specify any hard and soft affiniy in the xl config file). This also takes care of the vice-versa, i.e., don't trigger automatic placement if the config file specifies either an hard (the check for which was already there) or a soft (the check for which is introduced by this commit) affinity. Signed-off-by: Dario Faggioli Acked-by: George Dunlap Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 21 ++++++++++--------- docs/misc/xl-numa-placement.markdown | 14 +++++++++++- tools/libxl/libxl_dom.c | 36 +++++++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 5833054..1e04eed 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -162,16 +162,6 @@ here, and the soft affinity mask, provided via B (if any), is utilized to compute the domain node-affinity, for driving memory allocations. -If we are on a NUMA machine (i.e., if the host has more than one NUMA -node) and this option is not specified, libxl automatically tries to -place the guest on the least possible number of nodes. That, however, -will not affect vcpu pinning, so the guest will still be able to run on -all the cpus. A heuristic approach is used for choosing the best node (or -set of nodes), with the goals of maximizing performance for the guest -and, at the same time, achieving efficient utilization of host cpus -and memory. See F for more -details. - =item B Exactly as B, but specifies soft affinity, rather than pinning @@ -186,6 +176,17 @@ the intersection of the soft affinity mask, provided here, and the vcpu pinning, provided via B (if any), is utilized to compute the domain node-affinity, for driving memory allocations. +If this option is not specified (and B is not specified either), +libxl automatically tries to place the guest on the least possible +number of nodes. A heuristic approach is used for choosing the best +node (or set of nodes), with the goal of maximizing performance for +the guest and, at the same time, achieving efficient utilization of +host cpus and memory. In that case, the soft affinity of all the vcpus +of the domain will be set to the pcpus belonging to the NUMA nodes +chosen during placement. + +For more details, see F. + =back =head3 CPU Scheduling diff --git a/docs/misc/xl-numa-placement.markdown b/docs/misc/xl-numa-placement.markdown index 9d64eae..f863492 100644 --- a/docs/misc/xl-numa-placement.markdown +++ b/docs/misc/xl-numa-placement.markdown @@ -126,10 +126,20 @@ or Xen won't be able to guarantee the locality for their memory accesses. That, of course, also mean the vCPUs of the domain will only be able to execute on those same pCPUs. +It is is also possible to have a "cpus\_soft=" option in the xl config file, +to specify the soft affinity for all the vCPUs of the domain. This affects +the NUMA placement in the following way: + + * if only "cpus\_soft=" is present, the VM's node-affinity will be equal + to the nodes to which the pCPUs in the soft affinity mask belong; + * if both "cpus\_soft=" and "cpus=" are present, the VM's node-affinity + will be equal to the nodes to which the pCPUs present both in hard and + soft affinity belong. + ### Placing the guest automatically ### -If no "cpus=" option is specified in the config file, libxl tries -to figure out on its own on which node(s) the domain could fit best. +If neither "cpus=" nor "cpus\_soft=" are present in the config file, libxl +tries to figure out on its own on which node(s) the domain could fit best. If it finds one (some), the domain's node affinity get set to there, and both memory allocations and NUMA aware scheduling (for the credit scheduler and starting from Xen 4.3) will comply with it. Starting from diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index cfbd13d..c944804 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -247,11 +247,20 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, * updated accordingly; if it does not manage, info->nodemap is just left * alone. It is then the the subsequent call to * libxl_domain_set_nodeaffinity() that enacts the actual placement. + * + * As far as scheduling is concerned, we achieve NUMA-aware scheduling + * by having the results of placement affect the soft affinity of all + * the vcpus of the domain. Of course, we want that iff placement is + * enabled and actually happens, so we only change info->cpumap_soft to + * reflect the placement result if that is the case */ if (libxl_defbool_val(info->numa_placement)) { - if (info->cpumap.size || info->num_vcpu_hard_affinity) { + libxl_bitmap cpumap_soft; + + if (info->cpumap.size || + info->num_vcpu_hard_affinity || info->num_vcpu_soft_affinity) { LOG(ERROR, "Can run NUMA placement only if no vcpu " - "affinity is specified explicitly"); + "(hard or soft) affinity is specified explicitly"); return ERROR_INVAL; } if (info->nodemap.size) { @@ -265,9 +274,30 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, return rc; libxl_bitmap_set_any(&info->nodemap); - rc = numa_place_domain(gc, domid, info); + rc = libxl_cpu_bitmap_alloc(ctx, &cpumap_soft, 0); if (rc) return rc; + + rc = numa_place_domain(gc, domid, info); + if (rc) { + libxl_bitmap_dispose(&cpumap_soft); + return rc; + } + + /* + * All we need to do now is converting the result of automatic + * placement from nodemap to cpumap, and then use such cpumap as + * the soft affinity for all the vcpus of the domain. + * + * When calling libxl_set_vcpuaffinity_all(), it is ok to use NULL + * as hard affinity, as we know we don't have one, or we won't be + * here. + */ + libxl_nodemap_to_cpumap(ctx, &info->nodemap, &cpumap_soft); + libxl_set_vcpuaffinity_all(ctx, domid, info->max_vcpus, + NULL, &cpumap_soft); + + libxl_bitmap_dispose(&cpumap_soft); } if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNc-0008E6-DL; Mon, 04 Aug 2014 08:12:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNb-0008Dr-NO for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:27 +0000 Received: from [85.158.139.211:27685] by server-1.bemta-5.messagelabs.com id 98/9B-17892-A604FD35; Mon, 04 Aug 2014 08:12:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1407139945!11666073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2152 invoked from network); 4 Aug 2014 08:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNZ-0007Yl-As for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNZ-0004VA-9F for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:25 +0000 Date: Mon, 04 Aug 2014 08:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: make .txt files over-writable when building from r/o sources X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb33b2bd7fda7b183a6bf07995c0ff476b676414 Author: Jan Beulich AuthorDate: Fri Aug 1 16:28:48 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:28:48 2014 +0200 docs: make .txt files over-writable when building from r/o sources Otherwise an incremental build will fail to overwrite the destination files. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 46e8f22..2c0903b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -124,7 +124,7 @@ endif html/%.txt: %.txt $(INSTALL_DIR) $(@D) - cp $< $@ + $(INSTALL_DATA) $< $@ html/man/%.1.html: man/%.pod.1 Makefile $(INSTALL_DIR) $(@D) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNc-0008E6-DL; Mon, 04 Aug 2014 08:12:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNb-0008Dr-NO for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:27 +0000 Received: from [85.158.139.211:27685] by server-1.bemta-5.messagelabs.com id 98/9B-17892-A604FD35; Mon, 04 Aug 2014 08:12:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1407139945!11666073!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2152 invoked from network); 4 Aug 2014 08:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNZ-0007Yl-As for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNZ-0004VA-9F for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:25 +0000 Date: Mon, 04 Aug 2014 08:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: make .txt files over-writable when building from r/o sources X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fb33b2bd7fda7b183a6bf07995c0ff476b676414 Author: Jan Beulich AuthorDate: Fri Aug 1 16:28:48 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:28:48 2014 +0200 docs: make .txt files over-writable when building from r/o sources Otherwise an incremental build will fail to overwrite the destination files. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 46e8f22..2c0903b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -124,7 +124,7 @@ endif html/%.txt: %.txt $(INSTALL_DIR) $(@D) - cp $< $@ + $(INSTALL_DATA) $< $@ html/man/%.1.html: man/%.pod.1 Makefile $(INSTALL_DIR) $(@D) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNn-0008Fr-GH; Mon, 04 Aug 2014 08:12:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNm-0008Fb-D4 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:38 +0000 Received: from [193.109.254.147:43944] by server-4.bemta-14.messagelabs.com id 6D/C7-23592-5704FD35; Mon, 04 Aug 2014 08:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1407139955!13527851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16331 invoked from network); 4 Aug 2014 08:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNj-0007Yx-Fh for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNj-0004Va-E0 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:35 +0000 Date: Mon, 04 Aug 2014 08:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI: allow CMOS RTC use even when ACPI says there is none X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9425f05b90811458a08355a55a0b0d608c440cf Author: Jan Beulich AuthorDate: Fri Aug 1 16:29:27 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:29:27 2014 +0200 x86/ACPI: allow CMOS RTC use even when ACPI says there is none HP is setting the ACPI_FADT_NO_CMOS_RTC flag on newer systems, regardless of whether they're being booted from UEFI. Add a command line option to allow probing for a working RTC in that case. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 8 +++ xen/arch/x86/time.c | 98 ++++++++++++++++++++++++----------- 2 files changed, 76 insertions(+), 30 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 3ff02bd..1604c9a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -218,6 +218,14 @@ If set, override Xen's calculation of the level 2 cache line size. If set, override Xen's default choice for the platform timer. +### cmos-rtc-probe +> `= ` + +> Default: `false` + +Flag to indicate whether to probe for a CMOS Real Time Clock irrespective of +ACPI indicating none to be there. + ### com1,com2 > `= [/][,[DPS][,[|pci|amt][,[][,[][,[]]]]]]` diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index a4e1656..9e30d97 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -654,37 +654,40 @@ mktime (unsigned int year, unsigned int mon, )*60 + sec; /* finally seconds */ } -static unsigned long __get_cmos_time(void) -{ +struct rtc_time { unsigned int year, mon, day, hour, min, sec; +}; - sec = CMOS_READ(RTC_SECONDS); - min = CMOS_READ(RTC_MINUTES); - hour = CMOS_READ(RTC_HOURS); - day = CMOS_READ(RTC_DAY_OF_MONTH); - mon = CMOS_READ(RTC_MONTH); - year = CMOS_READ(RTC_YEAR); +static void __get_cmos_time(struct rtc_time *rtc) +{ + rtc->sec = CMOS_READ(RTC_SECONDS); + rtc->min = CMOS_READ(RTC_MINUTES); + rtc->hour = CMOS_READ(RTC_HOURS); + rtc->day = CMOS_READ(RTC_DAY_OF_MONTH); + rtc->mon = CMOS_READ(RTC_MONTH); + rtc->year = CMOS_READ(RTC_YEAR); if ( RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ) { - BCD_TO_BIN(sec); - BCD_TO_BIN(min); - BCD_TO_BIN(hour); - BCD_TO_BIN(day); - BCD_TO_BIN(mon); - BCD_TO_BIN(year); + BCD_TO_BIN(rtc->sec); + BCD_TO_BIN(rtc->min); + BCD_TO_BIN(rtc->hour); + BCD_TO_BIN(rtc->day); + BCD_TO_BIN(rtc->mon); + BCD_TO_BIN(rtc->year); } - if ( (year += 1900) < 1970 ) - year += 100; - - return mktime(year, mon, day, hour, min, sec); + if ( (rtc->year += 1900) < 1970 ) + rtc->year += 100; } static unsigned long get_cmos_time(void) { unsigned long res, flags; - int i; + struct rtc_time rtc; + unsigned int seconds = 60; + static bool_t __read_mostly cmos_rtc_probe; + boolean_param("cmos-rtc-probe", cmos_rtc_probe); if ( efi_enabled ) { @@ -693,23 +696,58 @@ static unsigned long get_cmos_time(void) return res; } - if ( unlikely(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) ) - panic("System without CMOS RTC must be booted from EFI"); + if ( likely(!(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC)) ) + cmos_rtc_probe = 0; + else if ( system_state < SYS_STATE_smp_boot && !cmos_rtc_probe ) + panic("System with no CMOS RTC advertised must be booted from EFI" + " (or with command line option \"cmos-rtc-probe\")"); + + for ( ; ; ) + { + s_time_t start, t1, t2; + + spin_lock_irqsave(&rtc_lock, flags); + + /* read RTC exactly on falling edge of update flag */ + start = NOW(); + do { /* may take up to 1 second... */ + t1 = NOW() - start; + } while ( !(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) && + t1 <= SECONDS(1) ); - spin_lock_irqsave(&rtc_lock, flags); + start = NOW(); + do { /* must try at least 2.228 ms */ + t2 = NOW() - start; + } while ( (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) && + t2 < MILLISECS(3) ); - /* read RTC exactly on falling edge of update flag */ - for ( i = 0 ; i < 1000000 ; i++ ) /* may take up to 1 second... */ - if ( (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) ) + __get_cmos_time(&rtc); + + spin_unlock_irqrestore(&rtc_lock, flags); + + if ( likely(!cmos_rtc_probe) || + t1 > SECONDS(1) || t2 >= MILLISECS(3) || + rtc.sec >= 60 || rtc.min >= 60 || rtc.hour >= 24 || + !rtc.day || rtc.day > 31 || + !rtc.mon || rtc.mon > 12 ) break; - for ( i = 0 ; i < 1000000 ; i++ ) /* must try at least 2.228 ms */ - if ( !(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) ) + + if ( seconds < 60 ) + { + if ( rtc.sec != seconds ) + cmos_rtc_probe = 0; break; + } + + process_pending_softirqs(); + + seconds = rtc.sec; + } - res = __get_cmos_time(); + if ( unlikely(cmos_rtc_probe) ) + panic("No CMOS RTC found - system must be booted from EFI"); - spin_unlock_irqrestore(&rtc_lock, flags); - return res; + return mktime(rtc.year, rtc.mon, rtc.day, rtc.hour, rtc.min, rtc.sec); } /*************************************************************************** -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNn-0008Fr-GH; Mon, 04 Aug 2014 08:12:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNm-0008Fb-D4 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:38 +0000 Received: from [193.109.254.147:43944] by server-4.bemta-14.messagelabs.com id 6D/C7-23592-5704FD35; Mon, 04 Aug 2014 08:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1407139955!13527851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16331 invoked from network); 4 Aug 2014 08:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNj-0007Yx-Fh for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNj-0004Va-E0 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:35 +0000 Date: Mon, 04 Aug 2014 08:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI: allow CMOS RTC use even when ACPI says there is none X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9425f05b90811458a08355a55a0b0d608c440cf Author: Jan Beulich AuthorDate: Fri Aug 1 16:29:27 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:29:27 2014 +0200 x86/ACPI: allow CMOS RTC use even when ACPI says there is none HP is setting the ACPI_FADT_NO_CMOS_RTC flag on newer systems, regardless of whether they're being booted from UEFI. Add a command line option to allow probing for a working RTC in that case. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 8 +++ xen/arch/x86/time.c | 98 ++++++++++++++++++++++++----------- 2 files changed, 76 insertions(+), 30 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 3ff02bd..1604c9a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -218,6 +218,14 @@ If set, override Xen's calculation of the level 2 cache line size. If set, override Xen's default choice for the platform timer. +### cmos-rtc-probe +> `= ` + +> Default: `false` + +Flag to indicate whether to probe for a CMOS Real Time Clock irrespective of +ACPI indicating none to be there. + ### com1,com2 > `= [/][,[DPS][,[|pci|amt][,[][,[][,[]]]]]]` diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index a4e1656..9e30d97 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -654,37 +654,40 @@ mktime (unsigned int year, unsigned int mon, )*60 + sec; /* finally seconds */ } -static unsigned long __get_cmos_time(void) -{ +struct rtc_time { unsigned int year, mon, day, hour, min, sec; +}; - sec = CMOS_READ(RTC_SECONDS); - min = CMOS_READ(RTC_MINUTES); - hour = CMOS_READ(RTC_HOURS); - day = CMOS_READ(RTC_DAY_OF_MONTH); - mon = CMOS_READ(RTC_MONTH); - year = CMOS_READ(RTC_YEAR); +static void __get_cmos_time(struct rtc_time *rtc) +{ + rtc->sec = CMOS_READ(RTC_SECONDS); + rtc->min = CMOS_READ(RTC_MINUTES); + rtc->hour = CMOS_READ(RTC_HOURS); + rtc->day = CMOS_READ(RTC_DAY_OF_MONTH); + rtc->mon = CMOS_READ(RTC_MONTH); + rtc->year = CMOS_READ(RTC_YEAR); if ( RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ) { - BCD_TO_BIN(sec); - BCD_TO_BIN(min); - BCD_TO_BIN(hour); - BCD_TO_BIN(day); - BCD_TO_BIN(mon); - BCD_TO_BIN(year); + BCD_TO_BIN(rtc->sec); + BCD_TO_BIN(rtc->min); + BCD_TO_BIN(rtc->hour); + BCD_TO_BIN(rtc->day); + BCD_TO_BIN(rtc->mon); + BCD_TO_BIN(rtc->year); } - if ( (year += 1900) < 1970 ) - year += 100; - - return mktime(year, mon, day, hour, min, sec); + if ( (rtc->year += 1900) < 1970 ) + rtc->year += 100; } static unsigned long get_cmos_time(void) { unsigned long res, flags; - int i; + struct rtc_time rtc; + unsigned int seconds = 60; + static bool_t __read_mostly cmos_rtc_probe; + boolean_param("cmos-rtc-probe", cmos_rtc_probe); if ( efi_enabled ) { @@ -693,23 +696,58 @@ static unsigned long get_cmos_time(void) return res; } - if ( unlikely(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) ) - panic("System without CMOS RTC must be booted from EFI"); + if ( likely(!(acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC)) ) + cmos_rtc_probe = 0; + else if ( system_state < SYS_STATE_smp_boot && !cmos_rtc_probe ) + panic("System with no CMOS RTC advertised must be booted from EFI" + " (or with command line option \"cmos-rtc-probe\")"); + + for ( ; ; ) + { + s_time_t start, t1, t2; + + spin_lock_irqsave(&rtc_lock, flags); + + /* read RTC exactly on falling edge of update flag */ + start = NOW(); + do { /* may take up to 1 second... */ + t1 = NOW() - start; + } while ( !(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) && + t1 <= SECONDS(1) ); - spin_lock_irqsave(&rtc_lock, flags); + start = NOW(); + do { /* must try at least 2.228 ms */ + t2 = NOW() - start; + } while ( (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) && + t2 < MILLISECS(3) ); - /* read RTC exactly on falling edge of update flag */ - for ( i = 0 ; i < 1000000 ; i++ ) /* may take up to 1 second... */ - if ( (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) ) + __get_cmos_time(&rtc); + + spin_unlock_irqrestore(&rtc_lock, flags); + + if ( likely(!cmos_rtc_probe) || + t1 > SECONDS(1) || t2 >= MILLISECS(3) || + rtc.sec >= 60 || rtc.min >= 60 || rtc.hour >= 24 || + !rtc.day || rtc.day > 31 || + !rtc.mon || rtc.mon > 12 ) break; - for ( i = 0 ; i < 1000000 ; i++ ) /* must try at least 2.228 ms */ - if ( !(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) ) + + if ( seconds < 60 ) + { + if ( rtc.sec != seconds ) + cmos_rtc_probe = 0; break; + } + + process_pending_softirqs(); + + seconds = rtc.sec; + } - res = __get_cmos_time(); + if ( unlikely(cmos_rtc_probe) ) + panic("No CMOS RTC found - system must be booted from EFI"); - spin_unlock_irqrestore(&rtc_lock, flags); - return res; + return mktime(rtc.year, rtc.mon, rtc.day, rtc.hour, rtc.min, rtc.sec); } /*************************************************************************** -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNx-0008HJ-Ji; Mon, 04 Aug 2014 08:12:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNw-0008H4-DD for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:48 +0000 Received: from [85.158.137.68:20236] by server-1.bemta-3.messagelabs.com id 78/0A-30185-F704FD35; Mon, 04 Aug 2014 08:12:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407139965!7937165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20024 invoked from network); 4 Aug 2014 08:12:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNt-0007Z3-MR for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNt-0004Vw-Jw for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:45 +0000 Date: Mon, 04 Aug 2014 08:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: drop the num_siblings check against nr_cpu_ids X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d91b0f9b58219724717db503f46ff2f731aa4c59 Author: Andrew Cooper AuthorDate: Fri Aug 1 16:32:39 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:32:39 2014 +0200 x86/cpu: drop the num_siblings check against nr_cpu_ids The printk() is missing a newline which resulted in console corruption. However, nr_cpu_ids can be legitimately lower than valid num_sibling values given certain compile or boot time configuration. Suggested-by: Jan Beulich Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 5156df3..5c8d3c2 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -443,13 +443,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) if (c->x86_num_siblings == 1) { printk(KERN_INFO "CPU: Hyper-Threading is disabled\n"); } else if (c->x86_num_siblings > 1 ) { - - if (c->x86_num_siblings > nr_cpu_ids) { - printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", c->x86_num_siblings); - c->x86_num_siblings = 1; - return; - } - index_msb = get_count_order(c->x86_num_siblings); c->phys_proc_id = phys_pkg_id((ebx >> 24) & 0xFF, index_msb); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNx-0008HJ-Ji; Mon, 04 Aug 2014 08:12:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNw-0008H4-DD for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:48 +0000 Received: from [85.158.137.68:20236] by server-1.bemta-3.messagelabs.com id 78/0A-30185-F704FD35; Mon, 04 Aug 2014 08:12:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407139965!7937165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20024 invoked from network); 4 Aug 2014 08:12:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDNt-0007Z3-MR for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDNt-0004Vw-Jw for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:45 +0000 Date: Mon, 04 Aug 2014 08:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: drop the num_siblings check against nr_cpu_ids X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d91b0f9b58219724717db503f46ff2f731aa4c59 Author: Andrew Cooper AuthorDate: Fri Aug 1 16:32:39 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:32:39 2014 +0200 x86/cpu: drop the num_siblings check against nr_cpu_ids The printk() is missing a newline which resulted in console corruption. However, nr_cpu_ids can be legitimately lower than valid num_sibling values given certain compile or boot time configuration. Suggested-by: Jan Beulich Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 5156df3..5c8d3c2 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -443,13 +443,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) if (c->x86_num_siblings == 1) { printk(KERN_INFO "CPU: Hyper-Threading is disabled\n"); } else if (c->x86_num_siblings > 1 ) { - - if (c->x86_num_siblings > nr_cpu_ids) { - printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", c->x86_num_siblings); - c->x86_num_siblings = 1; - return; - } - index_msb = get_count_order(c->x86_num_siblings); c->phys_proc_id = phys_pkg_id((ebx >> 24) & 0xFF, index_msb); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDO7-0008Iw-MM; Mon, 04 Aug 2014 08:12:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDO6-0008Ik-KP for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:58 +0000 Received: from [85.158.143.35:49052] by server-3.bemta-4.messagelabs.com id 6F/B3-06192-9804FD35; Mon, 04 Aug 2014 08:12:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1407139976!12912375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6231 invoked from network); 4 Aug 2014 08:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDO3-0007ZC-So for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDO3-0004X1-QT for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:55 +0000 Date: Mon, 04 Aug 2014 08:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: always do SMAP check when updating runstate_guest(v) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31ae587e6f0181bf1f7d196fe1b49357c8922e60 Author: Feng Wu AuthorDate: Fri Aug 1 16:39:17 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:39:17 2014 +0200 x86/hvm: always do SMAP check when updating runstate_guest(v) In the current implementation, we honor the guest's CPL and AC to determain whether do the SMAP check or not for runstate_guest(v). However, this doesn't work. The VMCS feild is invalid when we try to get geust's SS by hvm_get_segment_register(), since the right VMCS has not beed loaded for the current VCPU. In this patch, we always do the SMAP check when updating runstate_guest(v) for the guest when SMAP is enabled by it. Reported-by: Sander Eikelenboom Signed-off-by: Feng Wu Reviewed-by: Jan Beulich Tested-by: Sander Eikelenboom --- xen/arch/x86/domain.c | 25 +++++++++++++++++++++---- xen/arch/x86/mm/guest_walk.c | 39 ++++++++++++++++++++++++++------------- xen/include/asm-x86/domain.h | 17 ++++++++++++++++- 3 files changed, 63 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index e896210..f7e0e78 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -180,6 +180,14 @@ void dump_pageframe_info(struct domain *d) spin_unlock(&d->page_alloc_lock); } +smap_check_policy_t smap_policy_change(struct vcpu *v, + smap_check_policy_t new_policy) +{ + smap_check_policy_t old_policy = v->arch.smap_check_policy; + v->arch.smap_check_policy = new_policy; + return old_policy; +} + /* * The hole may be at or above the 44-bit boundary, so we need to determine * the total bit count until reaching 32 significant (not squashed out) bits @@ -1349,22 +1357,31 @@ static void paravirt_ctxt_switch_to(struct vcpu *v) } /* Update per-VCPU guest runstate shared memory area (if registered). */ -bool_t update_runstate_area(const struct vcpu *v) +bool_t update_runstate_area(struct vcpu *v) { + bool_t rc; + smap_check_policy_t smap_policy; + if ( guest_handle_is_null(runstate_guest(v)) ) return 1; + smap_policy = smap_policy_change(v, SMAP_CHECK_ENABLED); + if ( has_32bit_shinfo(v->domain) ) { struct compat_vcpu_runstate_info info; XLAT_vcpu_runstate_info(&info, &v->runstate); __copy_to_guest(v->runstate_guest.compat, &info, 1); - return 1; + rc = 1; } + else + rc = __copy_to_guest(runstate_guest(v), &v->runstate, 1) != + sizeof(v->runstate); - return __copy_to_guest(runstate_guest(v), &v->runstate, 1) != - sizeof(v->runstate); + smap_policy_change(v, smap_policy); + + return rc; } static void _update_runstate_area(struct vcpu *v) diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index bb38fda..1b26175 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -164,25 +164,38 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, struct segment_register seg; const struct cpu_user_regs *regs = guest_cpu_user_regs(); - hvm_get_segment_register(v, x86_seg_ss, &seg); - /* SMEP: kernel-mode instruction fetches from user-mode mappings * should fault. Unlike NX or invalid bits, we're looking for _all_ * entries in the walk to have _PAGE_USER set, so we need to do the * whole walk as if it were a user-mode one and then invert the answer. */ smep = hvm_smep_enabled(v) && (pfec & PFEC_insn_fetch); - /* - * SMAP: kernel-mode data accesses from user-mode mappings should fault - * A fault is considered as a SMAP violation if the following - * conditions come true: - * - X86_CR4_SMAP is set in CR4 - * - A user page is accessed - * - CPL = 3 or X86_EFLAGS_AC is clear - * - Page fault in kernel mode - */ - smap = hvm_smap_enabled(v) && - ((seg.attr.fields.dpl == 3) || !(regs->eflags & X86_EFLAGS_AC)); + switch ( v->arch.smap_check_policy ) + { + case SMAP_CHECK_HONOR_CPL_AC: + hvm_get_segment_register(v, x86_seg_ss, &seg); + + /* + * SMAP: kernel-mode data accesses from user-mode mappings + * should fault. + * A fault is considered as a SMAP violation if the following + * conditions come true: + * - X86_CR4_SMAP is set in CR4 + * - A user page is accessed + * - CPL = 3 or X86_EFLAGS_AC is clear + * - Page fault in kernel mode + */ + smap = hvm_smap_enabled(v) && + ((seg.attr.fields.dpl == 3) || + !(regs->eflags & X86_EFLAGS_AC)); + break; + case SMAP_CHECK_ENABLED: + smap = hvm_smap_enabled(v); + break; + default: + ASSERT(v->arch.smap_check_policy == SMAP_CHECK_DISABLED); + break; + } } if ( smep || smap ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index abf55fb..112d0b1 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -382,6 +382,12 @@ struct pv_vcpu struct vcpu_time_info pending_system_time; }; +typedef enum __packed { + SMAP_CHECK_HONOR_CPL_AC, /* honor the guest's CPL and AC */ + SMAP_CHECK_ENABLED, /* enable the check */ + SMAP_CHECK_DISABLED, /* disable the check */ +} smap_check_policy_t; + struct arch_vcpu { /* @@ -438,6 +444,12 @@ struct arch_vcpu * and thus should be saved/restored. */ bool_t nonlazy_xstate_used; + /* + * The SMAP check policy when updating runstate_guest(v) and the + * secondary system time. + */ + smap_check_policy_t smap_check_policy; + struct vmce vmce; struct paging_vcpu paging; @@ -448,11 +460,14 @@ struct arch_vcpu XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; } __cacheline_aligned; +smap_check_policy_t smap_policy_change(struct vcpu *v, + smap_check_policy_t new_policy); + /* Shorthands to improve code legibility. */ #define hvm_vmx hvm_vcpu.u.vmx #define hvm_svm hvm_vcpu.u.svm -bool_t update_runstate_area(const struct vcpu *); +bool_t update_runstate_area(struct vcpu *); bool_t update_secondary_system_time(const struct vcpu *, struct vcpu_time_info *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:12:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:12:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDO7-0008Iw-MM; Mon, 04 Aug 2014 08:12:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDO6-0008Ik-KP for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:58 +0000 Received: from [85.158.143.35:49052] by server-3.bemta-4.messagelabs.com id 6F/B3-06192-9804FD35; Mon, 04 Aug 2014 08:12:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1407139976!12912375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6231 invoked from network); 4 Aug 2014 08:12:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDO3-0007ZC-So for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDO3-0004X1-QT for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:12:55 +0000 Date: Mon, 04 Aug 2014 08:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: always do SMAP check when updating runstate_guest(v) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31ae587e6f0181bf1f7d196fe1b49357c8922e60 Author: Feng Wu AuthorDate: Fri Aug 1 16:39:17 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:39:17 2014 +0200 x86/hvm: always do SMAP check when updating runstate_guest(v) In the current implementation, we honor the guest's CPL and AC to determain whether do the SMAP check or not for runstate_guest(v). However, this doesn't work. The VMCS feild is invalid when we try to get geust's SS by hvm_get_segment_register(), since the right VMCS has not beed loaded for the current VCPU. In this patch, we always do the SMAP check when updating runstate_guest(v) for the guest when SMAP is enabled by it. Reported-by: Sander Eikelenboom Signed-off-by: Feng Wu Reviewed-by: Jan Beulich Tested-by: Sander Eikelenboom --- xen/arch/x86/domain.c | 25 +++++++++++++++++++++---- xen/arch/x86/mm/guest_walk.c | 39 ++++++++++++++++++++++++++------------- xen/include/asm-x86/domain.h | 17 ++++++++++++++++- 3 files changed, 63 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index e896210..f7e0e78 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -180,6 +180,14 @@ void dump_pageframe_info(struct domain *d) spin_unlock(&d->page_alloc_lock); } +smap_check_policy_t smap_policy_change(struct vcpu *v, + smap_check_policy_t new_policy) +{ + smap_check_policy_t old_policy = v->arch.smap_check_policy; + v->arch.smap_check_policy = new_policy; + return old_policy; +} + /* * The hole may be at or above the 44-bit boundary, so we need to determine * the total bit count until reaching 32 significant (not squashed out) bits @@ -1349,22 +1357,31 @@ static void paravirt_ctxt_switch_to(struct vcpu *v) } /* Update per-VCPU guest runstate shared memory area (if registered). */ -bool_t update_runstate_area(const struct vcpu *v) +bool_t update_runstate_area(struct vcpu *v) { + bool_t rc; + smap_check_policy_t smap_policy; + if ( guest_handle_is_null(runstate_guest(v)) ) return 1; + smap_policy = smap_policy_change(v, SMAP_CHECK_ENABLED); + if ( has_32bit_shinfo(v->domain) ) { struct compat_vcpu_runstate_info info; XLAT_vcpu_runstate_info(&info, &v->runstate); __copy_to_guest(v->runstate_guest.compat, &info, 1); - return 1; + rc = 1; } + else + rc = __copy_to_guest(runstate_guest(v), &v->runstate, 1) != + sizeof(v->runstate); - return __copy_to_guest(runstate_guest(v), &v->runstate, 1) != - sizeof(v->runstate); + smap_policy_change(v, smap_policy); + + return rc; } static void _update_runstate_area(struct vcpu *v) diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index bb38fda..1b26175 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -164,25 +164,38 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, struct segment_register seg; const struct cpu_user_regs *regs = guest_cpu_user_regs(); - hvm_get_segment_register(v, x86_seg_ss, &seg); - /* SMEP: kernel-mode instruction fetches from user-mode mappings * should fault. Unlike NX or invalid bits, we're looking for _all_ * entries in the walk to have _PAGE_USER set, so we need to do the * whole walk as if it were a user-mode one and then invert the answer. */ smep = hvm_smep_enabled(v) && (pfec & PFEC_insn_fetch); - /* - * SMAP: kernel-mode data accesses from user-mode mappings should fault - * A fault is considered as a SMAP violation if the following - * conditions come true: - * - X86_CR4_SMAP is set in CR4 - * - A user page is accessed - * - CPL = 3 or X86_EFLAGS_AC is clear - * - Page fault in kernel mode - */ - smap = hvm_smap_enabled(v) && - ((seg.attr.fields.dpl == 3) || !(regs->eflags & X86_EFLAGS_AC)); + switch ( v->arch.smap_check_policy ) + { + case SMAP_CHECK_HONOR_CPL_AC: + hvm_get_segment_register(v, x86_seg_ss, &seg); + + /* + * SMAP: kernel-mode data accesses from user-mode mappings + * should fault. + * A fault is considered as a SMAP violation if the following + * conditions come true: + * - X86_CR4_SMAP is set in CR4 + * - A user page is accessed + * - CPL = 3 or X86_EFLAGS_AC is clear + * - Page fault in kernel mode + */ + smap = hvm_smap_enabled(v) && + ((seg.attr.fields.dpl == 3) || + !(regs->eflags & X86_EFLAGS_AC)); + break; + case SMAP_CHECK_ENABLED: + smap = hvm_smap_enabled(v); + break; + default: + ASSERT(v->arch.smap_check_policy == SMAP_CHECK_DISABLED); + break; + } } if ( smep || smap ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index abf55fb..112d0b1 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -382,6 +382,12 @@ struct pv_vcpu struct vcpu_time_info pending_system_time; }; +typedef enum __packed { + SMAP_CHECK_HONOR_CPL_AC, /* honor the guest's CPL and AC */ + SMAP_CHECK_ENABLED, /* enable the check */ + SMAP_CHECK_DISABLED, /* disable the check */ +} smap_check_policy_t; + struct arch_vcpu { /* @@ -438,6 +444,12 @@ struct arch_vcpu * and thus should be saved/restored. */ bool_t nonlazy_xstate_used; + /* + * The SMAP check policy when updating runstate_guest(v) and the + * secondary system time. + */ + smap_check_policy_t smap_check_policy; + struct vmce vmce; struct paging_vcpu paging; @@ -448,11 +460,14 @@ struct arch_vcpu XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; } __cacheline_aligned; +smap_check_policy_t smap_policy_change(struct vcpu *v, + smap_check_policy_t new_policy); + /* Shorthands to improve code legibility. */ #define hvm_vmx hvm_vcpu.u.vmx #define hvm_svm hvm_vcpu.u.svm -bool_t update_runstate_area(const struct vcpu *); +bool_t update_runstate_area(struct vcpu *); bool_t update_secondary_system_time(const struct vcpu *, struct vcpu_time_info *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOH-0008Kf-RJ; Mon, 04 Aug 2014 08:13:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOG-0008KJ-Fs for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:08 +0000 Received: from [85.158.143.35:39376] by server-2.bemta-4.messagelabs.com id E5/4B-04525-3904FD35; Mon, 04 Aug 2014 08:13:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1407139986!13195974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22106 invoked from network); 4 Aug 2014 08:13:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOE-0007Zk-2a for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOE-0004XY-02 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:06 +0000 Date: Mon, 04 Aug 2014 08:13:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: always do SMAP check when updating secondary system time for guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 340f8cb83013dc80ebd29ed5b743040a5a45c146 Author: Feng Wu AuthorDate: Fri Aug 1 16:40:39 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:40:39 2014 +0200 x86/hvm: always do SMAP check when updating secondary system time for guest In this patch, we always do the SMAP check when updating secondary system time for the guest when SMAP is enabled by it. Signed-off-by: Feng Wu Reviewed-by: Jan Beulich --- xen/arch/x86/time.c | 10 +++++++++- xen/include/asm-x86/domain.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 9e30d97..bd89219 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -859,17 +859,23 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) v->arch.pv_vcpu.pending_system_time = _u; } -bool_t update_secondary_system_time(const struct vcpu *v, +bool_t update_secondary_system_time(struct vcpu *v, struct vcpu_time_info *u) { XEN_GUEST_HANDLE(vcpu_time_info_t) user_u = v->arch.time_info_guest; + smap_check_policy_t saved_policy; if ( guest_handle_is_null(user_u) ) return 1; + saved_policy = smap_policy_change(v, SMAP_CHECK_ENABLED); + /* 1. Update userspace version. */ if ( __copy_field_to_guest(user_u, u, version) == sizeof(u->version) ) + { + smap_policy_change(v, saved_policy); return 0; + } wmb(); /* 2. Update all other userspace fields. */ __copy_to_guest(user_u, u, 1); @@ -878,6 +884,8 @@ bool_t update_secondary_system_time(const struct vcpu *v, u->version = version_update_end(u->version); __copy_field_to_guest(user_u, u, version); + smap_policy_change(v, saved_policy); + return 1; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 112d0b1..83329ed 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -468,7 +468,7 @@ smap_check_policy_t smap_policy_change(struct vcpu *v, #define hvm_svm hvm_vcpu.u.svm bool_t update_runstate_area(struct vcpu *); -bool_t update_secondary_system_time(const struct vcpu *, +bool_t update_secondary_system_time(struct vcpu *, struct vcpu_time_info *); void vcpu_show_execution_state(struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOH-0008Kf-RJ; Mon, 04 Aug 2014 08:13:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOG-0008KJ-Fs for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:08 +0000 Received: from [85.158.143.35:39376] by server-2.bemta-4.messagelabs.com id E5/4B-04525-3904FD35; Mon, 04 Aug 2014 08:13:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1407139986!13195974!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22106 invoked from network); 4 Aug 2014 08:13:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOE-0007Zk-2a for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOE-0004XY-02 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:06 +0000 Date: Mon, 04 Aug 2014 08:13:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: always do SMAP check when updating secondary system time for guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 340f8cb83013dc80ebd29ed5b743040a5a45c146 Author: Feng Wu AuthorDate: Fri Aug 1 16:40:39 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:40:39 2014 +0200 x86/hvm: always do SMAP check when updating secondary system time for guest In this patch, we always do the SMAP check when updating secondary system time for the guest when SMAP is enabled by it. Signed-off-by: Feng Wu Reviewed-by: Jan Beulich --- xen/arch/x86/time.c | 10 +++++++++- xen/include/asm-x86/domain.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 9e30d97..bd89219 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -859,17 +859,23 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) v->arch.pv_vcpu.pending_system_time = _u; } -bool_t update_secondary_system_time(const struct vcpu *v, +bool_t update_secondary_system_time(struct vcpu *v, struct vcpu_time_info *u) { XEN_GUEST_HANDLE(vcpu_time_info_t) user_u = v->arch.time_info_guest; + smap_check_policy_t saved_policy; if ( guest_handle_is_null(user_u) ) return 1; + saved_policy = smap_policy_change(v, SMAP_CHECK_ENABLED); + /* 1. Update userspace version. */ if ( __copy_field_to_guest(user_u, u, version) == sizeof(u->version) ) + { + smap_policy_change(v, saved_policy); return 0; + } wmb(); /* 2. Update all other userspace fields. */ __copy_to_guest(user_u, u, 1); @@ -878,6 +884,8 @@ bool_t update_secondary_system_time(const struct vcpu *v, u->version = version_update_end(u->version); __copy_field_to_guest(user_u, u, version); + smap_policy_change(v, saved_policy); + return 1; } diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 112d0b1..83329ed 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -468,7 +468,7 @@ smap_check_policy_t smap_policy_change(struct vcpu *v, #define hvm_svm hvm_vcpu.u.svm bool_t update_runstate_area(struct vcpu *); -bool_t update_secondary_system_time(const struct vcpu *, +bool_t update_secondary_system_time(struct vcpu *, struct vcpu_time_info *); void vcpu_show_execution_state(struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOR-0008M3-UC; Mon, 04 Aug 2014 08:13:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOQ-0008Lr-Sj for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:18 +0000 Received: from [193.109.254.147:59775] by server-15.bemta-14.messagelabs.com id 78/ED-30948-E904FD35; Mon, 04 Aug 2014 08:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1407139996!13516556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10391 invoked from network); 4 Aug 2014 08:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOO-0007Zq-7q for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOO-0004YK-6p for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:16 +0000 Date: Mon, 04 Aug 2014 08:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: make EVTCHNOP_reset suitable for kexec X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 400b3bd6426f3334e47f16d55fd42f438d7fe6fa Author: Vitaly Kuznetsov AuthorDate: Fri Aug 1 16:46:40 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:46:40 2014 +0200 evtchn: make EVTCHNOP_reset suitable for kexec It would be nice to allow guests to close all event channels in ABI-agnostic way in case of kexec/kdump. EVTCHNOP_reset looks suitable for this purpose. However control blocks for vcpus and event array need cleanup when FIFO ABI is being used. With this change a guest can simply do EVTCHNOP_reset before kexec in both 2-level and FIFO cases. It is also important to perform store/console channel remapping after such call. The issue can also be solved by introducing a new EVTCHNOP operation but it seems that EVTCHNOP_reset can be reused. [The idea was suggested by Ian Campbell, Andrew Cooper, and David Vrabel] Signed-off-by: Vitaly Kuznetsov --- xen/common/event_channel.c | 15 +++++++++++++++ xen/common/event_fifo.c | 1 + xen/include/public/event_channel.h | 4 ++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 6853842..7d6de54 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -957,6 +957,21 @@ static long evtchn_reset(evtchn_reset_t *r) for ( i = 0; port_is_valid(d, i); i++ ) (void)__evtchn_close(d, i); + spin_lock(&d->event_lock); + + if ( (dom == DOMID_SELF) && d->evtchn_fifo ) + { + /* + * Guest domain called EVTCHNOP_reset with DOMID_SELF, destroying + * FIFO event array and control blocks, resetting evtchn_port_ops to + * evtchn_port_ops_2l. + */ + evtchn_fifo_destroy(d); + evtchn_2l_init(d); + } + + spin_unlock(&d->event_lock); + rc = 0; out: diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 1fce3f1..51b4ff6 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -451,6 +451,7 @@ static void cleanup_event_array(struct domain *d) for ( i = 0; i < EVTCHN_FIFO_MAX_EVENT_ARRAY_PAGES; i++ ) unmap_guest_page(d->evtchn_fifo->event_array[i]); xfree(d->evtchn_fifo); + d->evtchn_fifo = NULL; } static void setup_ports(struct domain *d) diff --git a/xen/include/public/event_channel.h b/xen/include/public/event_channel.h index 49ac8cc..05e531d 100644 --- a/xen/include/public/event_channel.h +++ b/xen/include/public/event_channel.h @@ -264,6 +264,10 @@ typedef struct evtchn_unmask evtchn_unmask_t; * NOTES: * 1. may be specified as DOMID_SELF. * 2. Only a sufficiently-privileged domain may specify other than DOMID_SELF. + * 3. Destroys all control blocks and event array, resets event channel + * operations to 2-level ABI if called with == DOMID_SELF and FIFO + * ABI was used. Guests should not bind events during EVTCHNOP_reset call + * as these events are likely to be lost. */ struct evtchn_reset { /* IN parameters. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOR-0008M3-UC; Mon, 04 Aug 2014 08:13:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOQ-0008Lr-Sj for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:18 +0000 Received: from [193.109.254.147:59775] by server-15.bemta-14.messagelabs.com id 78/ED-30948-E904FD35; Mon, 04 Aug 2014 08:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1407139996!13516556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10391 invoked from network); 4 Aug 2014 08:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOO-0007Zq-7q for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOO-0004YK-6p for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:16 +0000 Date: Mon, 04 Aug 2014 08:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: make EVTCHNOP_reset suitable for kexec X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 400b3bd6426f3334e47f16d55fd42f438d7fe6fa Author: Vitaly Kuznetsov AuthorDate: Fri Aug 1 16:46:40 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:46:40 2014 +0200 evtchn: make EVTCHNOP_reset suitable for kexec It would be nice to allow guests to close all event channels in ABI-agnostic way in case of kexec/kdump. EVTCHNOP_reset looks suitable for this purpose. However control blocks for vcpus and event array need cleanup when FIFO ABI is being used. With this change a guest can simply do EVTCHNOP_reset before kexec in both 2-level and FIFO cases. It is also important to perform store/console channel remapping after such call. The issue can also be solved by introducing a new EVTCHNOP operation but it seems that EVTCHNOP_reset can be reused. [The idea was suggested by Ian Campbell, Andrew Cooper, and David Vrabel] Signed-off-by: Vitaly Kuznetsov --- xen/common/event_channel.c | 15 +++++++++++++++ xen/common/event_fifo.c | 1 + xen/include/public/event_channel.h | 4 ++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 6853842..7d6de54 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -957,6 +957,21 @@ static long evtchn_reset(evtchn_reset_t *r) for ( i = 0; port_is_valid(d, i); i++ ) (void)__evtchn_close(d, i); + spin_lock(&d->event_lock); + + if ( (dom == DOMID_SELF) && d->evtchn_fifo ) + { + /* + * Guest domain called EVTCHNOP_reset with DOMID_SELF, destroying + * FIFO event array and control blocks, resetting evtchn_port_ops to + * evtchn_port_ops_2l. + */ + evtchn_fifo_destroy(d); + evtchn_2l_init(d); + } + + spin_unlock(&d->event_lock); + rc = 0; out: diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 1fce3f1..51b4ff6 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -451,6 +451,7 @@ static void cleanup_event_array(struct domain *d) for ( i = 0; i < EVTCHN_FIFO_MAX_EVENT_ARRAY_PAGES; i++ ) unmap_guest_page(d->evtchn_fifo->event_array[i]); xfree(d->evtchn_fifo); + d->evtchn_fifo = NULL; } static void setup_ports(struct domain *d) diff --git a/xen/include/public/event_channel.h b/xen/include/public/event_channel.h index 49ac8cc..05e531d 100644 --- a/xen/include/public/event_channel.h +++ b/xen/include/public/event_channel.h @@ -264,6 +264,10 @@ typedef struct evtchn_unmask evtchn_unmask_t; * NOTES: * 1. may be specified as DOMID_SELF. * 2. Only a sufficiently-privileged domain may specify other than DOMID_SELF. + * 3. Destroys all control blocks and event array, resets event channel + * operations to 2-level ABI if called with == DOMID_SELF and FIFO + * ABI was used. Guests should not bind events during EVTCHNOP_reset call + * as these events are likely to be lost. */ struct evtchn_reset { /* IN parameters. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOd-0008NY-0W; Mon, 04 Aug 2014 08:13:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOb-0008ND-0l for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:29 +0000 Received: from [85.158.143.35:54249] by server-2.bemta-4.messagelabs.com id B3/CB-04525-8A04FD35; Mon, 04 Aug 2014 08:13:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1407140006!13269191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7104 invoked from network); 4 Aug 2014 08:13:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOY-0007Zw-Ca for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOY-0004ZQ-B1 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:26 +0000 Date: Mon, 04 Aug 2014 08:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: fix coverity issues found in cpu_request_microcode() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6784dd6fdc43914e9bf5b080e12c7877d000dffa Author: Aravind Gopalakrishnan AuthorDate: Fri Aug 1 16:47:48 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:47:48 2014 +0200 x86, amd_ucode: fix coverity issues found in cpu_request_microcode() This patch fixes issues reported by coverity. - CID 1229147: dead code - CID 1229148: possible resource leak of mc_amd due to goto out statements. Coverity-IDs: 1229147, 1229148 Reported-by: Andrew Cooper Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Andrew Cooper --- xen/arch/x86/microcode_amd.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 8f16826..1e5503d 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -379,9 +379,13 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) while ( offset < bufsize ) { error = install_equiv_cpu_table(mc_amd, buf, &offset); + if ( error ) + { + printk(KERN_ERR "microcode: installing equivalent cpu table failed\n"); + break; + } - if ( !error && - find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, &equiv_cpu_id) ) break; @@ -393,7 +397,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) { printk(KERN_ERR "microcode: Microcode buffer overrun\n"); error = -EINVAL; - goto out; + break; } error = container_fast_forward(buf, bufsize - offset, &offset); @@ -402,15 +406,13 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n" "microcode: Failed to update patch level. " "Current lvl:%#x\n", cpu, uci->cpu_sig.rev); - goto out; + break; } } if ( error ) { xfree(mc_amd); - printk(KERN_ERR "microcode: installing equivalent cpu table failed\n"); - error = -EINVAL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOd-0008NY-0W; Mon, 04 Aug 2014 08:13:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOb-0008ND-0l for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:29 +0000 Received: from [85.158.143.35:54249] by server-2.bemta-4.messagelabs.com id B3/CB-04525-8A04FD35; Mon, 04 Aug 2014 08:13:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1407140006!13269191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7104 invoked from network); 4 Aug 2014 08:13:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOY-0007Zw-Ca for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOY-0004ZQ-B1 for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:26 +0000 Date: Mon, 04 Aug 2014 08:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: fix coverity issues found in cpu_request_microcode() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6784dd6fdc43914e9bf5b080e12c7877d000dffa Author: Aravind Gopalakrishnan AuthorDate: Fri Aug 1 16:47:48 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:47:48 2014 +0200 x86, amd_ucode: fix coverity issues found in cpu_request_microcode() This patch fixes issues reported by coverity. - CID 1229147: dead code - CID 1229148: possible resource leak of mc_amd due to goto out statements. Coverity-IDs: 1229147, 1229148 Reported-by: Andrew Cooper Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Andrew Cooper --- xen/arch/x86/microcode_amd.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 8f16826..1e5503d 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -379,9 +379,13 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) while ( offset < bufsize ) { error = install_equiv_cpu_table(mc_amd, buf, &offset); + if ( error ) + { + printk(KERN_ERR "microcode: installing equivalent cpu table failed\n"); + break; + } - if ( !error && - find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, + if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id, &equiv_cpu_id) ) break; @@ -393,7 +397,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) { printk(KERN_ERR "microcode: Microcode buffer overrun\n"); error = -EINVAL; - goto out; + break; } error = container_fast_forward(buf, bufsize - offset, &offset); @@ -402,15 +406,13 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n" "microcode: Failed to update patch level. " "Current lvl:%#x\n", cpu, uci->cpu_sig.rev); - goto out; + break; } } if ( error ) { xfree(mc_amd); - printk(KERN_ERR "microcode: installing equivalent cpu table failed\n"); - error = -EINVAL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOn-0008Ov-3D; Mon, 04 Aug 2014 08:13:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOl-0008Oc-5O for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:39 +0000 Received: from [85.158.139.211:53192] by server-2.bemta-5.messagelabs.com id 76/E4-31832-2B04FD35; Mon, 04 Aug 2014 08:13:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1407140016!4091466!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12717 invoked from network); 4 Aug 2014 08:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOi-0007a4-IX for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOi-0004Zq-Gq for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:36 +0000 Date: Mon, 04 Aug 2014 08:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: safeguard against #GP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b24b07eef3ba13ce48d800f28c1c28de5a2b4a7 Author: Aravind Gopalakrishnan AuthorDate: Fri Aug 1 16:48:30 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:48:30 2014 +0200 x86, amd_ucode: safeguard against #GP When HW tries to load a corrupted patch, it generates #GP and depending on 'noreboot' parameter on grub, the system is either stuck in a reboot loop or is hung. Use wrmsr_safe instead of wrmsrl so that we fail to load microcode gracefully. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Boris Ostrovsky Reviewed-by: Andrew Cooper --- xen/arch/x86/microcode_amd.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 1e5503d..b68cf93 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -193,6 +193,7 @@ static int apply_microcode(int cpu) uint32_t rev; struct microcode_amd *mc_amd = uci->mc.mc_amd; struct microcode_header_amd *hdr; + int hw_err; /* We should bind the task to the CPU */ BUG_ON(raw_smp_processor_id() != cpu); @@ -206,7 +207,7 @@ static int apply_microcode(int cpu) spin_lock_irqsave(µcode_update_lock, flags); - wrmsrl(MSR_AMD_PATCHLOADER, (unsigned long)hdr); + hw_err = wrmsr_safe(MSR_AMD_PATCHLOADER, (unsigned long)hdr); /* get patch id after patching */ rdmsrl(MSR_AMD_PATCHLEVEL, rev); @@ -214,7 +215,7 @@ static int apply_microcode(int cpu) spin_unlock_irqrestore(µcode_update_lock, flags); /* check current patch id and patch's id for match */ - if ( rev != hdr->patch_id ) + if ( hw_err || (rev != hdr->patch_id) ) { printk(KERN_ERR "microcode: CPU%d update from revision " "%#x to %#x failed\n", cpu, rev, hdr->patch_id); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 04 08:13:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Aug 2014 08:13:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOn-0008Ov-3D; Mon, 04 Aug 2014 08:13:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOl-0008Oc-5O for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:39 +0000 Received: from [85.158.139.211:53192] by server-2.bemta-5.messagelabs.com id 76/E4-31832-2B04FD35; Mon, 04 Aug 2014 08:13:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1407140016!4091466!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12717 invoked from network); 4 Aug 2014 08:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2014 08:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEDOi-0007a4-IX for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEDOi-0004Zq-Gq for xen-changelog@lists.xensource.com; Mon, 04 Aug 2014 08:13:36 +0000 Date: Mon, 04 Aug 2014 08:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: safeguard against #GP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8b24b07eef3ba13ce48d800f28c1c28de5a2b4a7 Author: Aravind Gopalakrishnan AuthorDate: Fri Aug 1 16:48:30 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 1 16:48:30 2014 +0200 x86, amd_ucode: safeguard against #GP When HW tries to load a corrupted patch, it generates #GP and depending on 'noreboot' parameter on grub, the system is either stuck in a reboot loop or is hung. Use wrmsr_safe instead of wrmsrl so that we fail to load microcode gracefully. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Boris Ostrovsky Reviewed-by: Andrew Cooper --- xen/arch/x86/microcode_amd.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 1e5503d..b68cf93 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -193,6 +193,7 @@ static int apply_microcode(int cpu) uint32_t rev; struct microcode_amd *mc_amd = uci->mc.mc_amd; struct microcode_header_amd *hdr; + int hw_err; /* We should bind the task to the CPU */ BUG_ON(raw_smp_processor_id() != cpu); @@ -206,7 +207,7 @@ static int apply_microcode(int cpu) spin_lock_irqsave(µcode_update_lock, flags); - wrmsrl(MSR_AMD_PATCHLOADER, (unsigned long)hdr); + hw_err = wrmsr_safe(MSR_AMD_PATCHLOADER, (unsigned long)hdr); /* get patch id after patching */ rdmsrl(MSR_AMD_PATCHLEVEL, rev); @@ -214,7 +215,7 @@ static int apply_microcode(int cpu) spin_unlock_irqrestore(µcode_update_lock, flags); /* check current patch id and patch's id for match */ - if ( rev != hdr->patch_id ) + if ( hw_err || (rev != hdr->patch_id) ) { printk(KERN_ERR "microcode: CPU%d update from revision " "%#x to %#x failed\n", cpu, rev, hdr->patch_id); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdA1-0006OA-AD; Tue, 05 Aug 2014 11:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdA0-0006Nh-5J for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:08 +0000 Received: from [85.158.137.68:56907] by server-3.bemta-3.messagelabs.com id B1/D5-22751-783C0E35; Tue, 05 Aug 2014 11:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1407239045!7500654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11366 invoked from network); 5 Aug 2014 11:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEd9w-0008Og-1E for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEd9v-00075N-FZ for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:03 +0000 Date: Tue, 05 Aug 2014 11:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3b1d10be6ebe4ff53d961c4507381f0aefb7f2a Author: Jan Beulich AuthorDate: Mon Jul 28 15:02:25 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:02:25 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: fd33987ba27607c3cc7da258cf1d86d21beeb735 master date: 2014-06-30 15:57:40 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdA1-0006OA-AD; Tue, 05 Aug 2014 11:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdA0-0006Nh-5J for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:08 +0000 Received: from [85.158.137.68:56907] by server-3.bemta-3.messagelabs.com id B1/D5-22751-783C0E35; Tue, 05 Aug 2014 11:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1407239045!7500654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11366 invoked from network); 5 Aug 2014 11:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEd9w-0008Og-1E for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEd9v-00075N-FZ for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:03 +0000 Date: Tue, 05 Aug 2014 11:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VT-d/ATS: correct and clean up dev_invalidate_iotlb() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3b1d10be6ebe4ff53d961c4507381f0aefb7f2a Author: Jan Beulich AuthorDate: Mon Jul 28 15:02:25 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:02:25 2014 +0200 VT-d/ATS: correct and clean up dev_invalidate_iotlb() While this was intended to only do cleanup (replace the two bogus "ret |= " constructs, and a simple formatting correction), this now also - fixes the bit manipulations for size_order > 0 a) correct an off-by-one in the use of size_order for shifting (till now double the requested size got invalidated) b) in fact setting bit 12 and up if necessary (without which too small a region might have got invalidated) c) making them capable of dealing with regions of 4Gb size and up - corrects the return value handling, such that a later iteration's success won't clear an earlier iteration's error indication - uses PCI_BDF2() instead of open coding it - bail immediately on bad passed in invalidation type, rather than repeatedly printing the same message for each ATS-capable device, at once also no longer hiding that failure from the caller Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: fd33987ba27607c3cc7da258cf1d86d21beeb735 master date: 2014-06-30 15:57:40 +0200 --- xen/drivers/passthrough/vtd/x86/ats.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c index ea57d7d..6b0632b 100644 --- a/xen/drivers/passthrough/vtd/x86/ats.c +++ b/xen/drivers/passthrough/vtd/x86/ats.c @@ -110,21 +110,23 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { struct pci_ats_dev *pdev; - int sbit, ret = 0; - u16 sid; + int ret = 0; if ( !ecap_dev_iotlb(iommu->ecap) ) return ret; list_for_each_entry( pdev, &ats_devices, list ) { - sid = (pdev->bus << 8) | pdev->devfn; + u16 sid = PCI_BDF2(pdev->bus, pdev->devfn); + bool_t sbit; + int rc = 0; /* Only invalidate devices that belong to this IOMMU */ if ( pdev->iommu != iommu ) continue; - switch ( type ) { + switch ( type ) + { case DMA_TLB_DSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; @@ -133,32 +135,37 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, /* invalidate all translations: sbit=1,bit_63=0,bit[62:12]=1 */ sbit = 1; addr = (~0 << PAGE_SHIFT_4K) & 0x7FFFFFFFFFFFFFFF; - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; case DMA_TLB_PSI_FLUSH: if ( !device_in_domain(iommu, pdev, did) ) break; - addr &= ~0 << (PAGE_SHIFT + size_order); - /* if size <= 4K, set sbit = 0, else set sbit = 1 */ sbit = size_order ? 1 : 0; /* clear lower bits */ - addr &= (~0 << (PAGE_SHIFT + size_order)); + addr &= ~0 << PAGE_SHIFT_4K; /* if sbit == 1, zero out size_order bit and set lower bits to 1 */ if ( sbit ) - addr &= (~0 & ~(1 << (PAGE_SHIFT + size_order))); + { + addr &= ~((u64)PAGE_SIZE_4K << (size_order - 1)); + addr |= (((u64)1 << (size_order - 1)) - 1) << PAGE_SHIFT_4K; + } - ret |= qinval_device_iotlb(iommu, pdev->ats_queue_depth, - sid, sbit, addr); + rc = qinval_device_iotlb(iommu, pdev->ats_queue_depth, + sid, sbit, addr); break; default: dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n"); - break; + return -EOPNOTSUPP; } + + if ( !ret ) + ret = rc; } + return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAL-0006QG-EB; Tue, 05 Aug 2014 11:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAK-0006Q5-Hm for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:28 +0000 Received: from [85.158.137.68:62878] by server-17.bemta-3.messagelabs.com id A9/C3-27015-B93C0E35; Tue, 05 Aug 2014 11:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1407239066!7500758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13859 invoked from network); 5 Aug 2014 11:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAH-0008Op-Se for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAH-000767-PD for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:25 +0000 Date: Tue, 05 Aug 2014 11:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49f8aa2e272ea7802930e60d486163ab74b291a9 Author: Juergen Gross AuthorDate: Mon Jul 28 15:04:43 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:04:43 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader master commit: 05377dede434c746e6708f055858378d20f619db master date: 2014-07-23 18:03:19 +0200 --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 2164a9f..c8bfb4c 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -465,12 +465,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAL-0006QG-EB; Tue, 05 Aug 2014 11:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAK-0006Q5-Hm for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:28 +0000 Received: from [85.158.137.68:62878] by server-17.bemta-3.messagelabs.com id A9/C3-27015-B93C0E35; Tue, 05 Aug 2014 11:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1407239066!7500758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13859 invoked from network); 5 Aug 2014 11:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAH-0008Op-Se for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAH-000767-PD for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:25 +0000 Date: Tue, 05 Aug 2014 11:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] avoid crash when doing shutdown with active cpupools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 49f8aa2e272ea7802930e60d486163ab74b291a9 Author: Juergen Gross AuthorDate: Mon Jul 28 15:04:43 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:04:43 2014 +0200 avoid crash when doing shutdown with active cpupools When shutting down the machine while there are cpus in a cpupool other than Pool-0 a crash is triggered due to cpupool handling rejecting offlining the non-boot cpus in other cpupools. It is easy to detect this case and allow offlining those cpus. Reported-by: Stefan Bader Signed-off-by: Juergen Gross Tested-by: Stefan Bader master commit: 05377dede434c746e6708f055858378d20f619db master date: 2014-07-23 18:03:19 +0200 --- xen/common/cpupool.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 2164a9f..c8bfb4c 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -465,12 +465,24 @@ static void cpupool_cpu_add(unsigned int cpu) */ static int cpupool_cpu_remove(unsigned int cpu) { - int ret = 0; + int ret = -EBUSY; + struct cpupool **c; spin_lock(&cpupool_lock); - if ( !cpumask_test_cpu(cpu, cpupool0->cpu_valid)) - ret = -EBUSY; + if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + ret = 0; else + { + for_each_cpupool(c) + { + if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + { + ret = 0; + break; + } + } + } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAV-0006S4-Gv; Tue, 05 Aug 2014 11:44:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAU-0006Rt-PF for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:38 +0000 Received: from [85.158.137.68:41909] by server-12.bemta-3.messagelabs.com id 50/DF-02460-6A3C0E35; Tue, 05 Aug 2014 11:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1407239076!11998652!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9845 invoked from network); 5 Aug 2014 11:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAS-0008Ox-6D for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAS-00076Y-0L for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:36 +0000 Date: Tue, 05 Aug 2014 11:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afb3cb30be6d3116660e1db145e0859993295161 Author: Tamas K Lengyel AuthorDate: Mon Jul 28 15:05:25 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:05:25 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan master commit: 5d570c1d0274cac3b333ef378af3325b3b69905e master date: 2014-07-23 18:05:11 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b6a8ce6..e171ed3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1848,6 +1848,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAV-0006S4-Gv; Tue, 05 Aug 2014 11:44:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAU-0006Rt-PF for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:38 +0000 Received: from [85.158.137.68:41909] by server-12.bemta-3.messagelabs.com id 50/DF-02460-6A3C0E35; Tue, 05 Aug 2014 11:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1407239076!11998652!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9845 invoked from network); 5 Aug 2014 11:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAS-0008Ox-6D for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAS-00076Y-0L for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:36 +0000 Date: Tue, 05 Aug 2014 11:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mem_event: fix regression affecting CR0 memory events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afb3cb30be6d3116660e1db145e0859993295161 Author: Tamas K Lengyel AuthorDate: Mon Jul 28 15:05:25 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:05:25 2014 +0200 x86/mem_event: fix regression affecting CR0 memory events This is a patch repairing a regression in code previously functional in 4.1.x. It appears that, during some refactoring work, call to hvm_memory_event_cr0 was lost. This function was originally called in mov_to_cr() of vmx.c, but the commit http://xenbits.xen.org/hg/xen-unstable.hg/rev/1276926e3795 abstracted the original code into generic functions up a level in hvm.c, dropping the call in the process. The same issue affected the CR3 and CR4 events, which were fixed in patch http://xenbits.xensource.com/hg/xen-unstable.hg/rev/7ab899e46347. Signed-off-by: Tamas K Lengyel Reviewed-by: Tim Deegan master commit: 5d570c1d0274cac3b333ef378af3325b3b69905e master date: 2014-07-23 18:05:11 +0200 --- xen/arch/x86/hvm/hvm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b6a8ce6..e171ed3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1848,6 +1848,7 @@ int hvm_set_cr0(unsigned long value) hvm_funcs.handle_cd(v, value); hvm_update_cr(v, 0, value); + hvm_memory_event_cr0(value, old_value); if ( (value ^ old_value) & X86_CR0_PG ) { if ( !nestedhvm_vmswitch_in_progress(v) && nestedhvm_vcpu_in_guestmode(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAg-0006Tw-Jc; Tue, 05 Aug 2014 11:44:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAf-0006Th-7Y for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:49 +0000 Received: from [85.158.137.68:36836] by server-14.bemta-3.messagelabs.com id 75/C9-09441-0B3C0E35; Tue, 05 Aug 2014 11:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1407239086!11911643!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12526 invoked from network); 5 Aug 2014 11:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAc-0008P0-D3 for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAc-000774-96 for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:46 +0000 Date: Tue, 05 Aug 2014 11:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60400ce54cbc61365ff665946f0ba767c1694203 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:06:09 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:06:09 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru master commit: ee75480b3c8856db9ef1aa45418f35ec0d78989d master date: 2014-07-23 18:07:11 +0200 --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index fa8e6ea..59dca84 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -596,11 +596,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e661525..d8fda82 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1226,8 +1226,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1246,7 +1255,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1354,11 +1363,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:44:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAg-0006Tw-Jc; Tue, 05 Aug 2014 11:44:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAf-0006Th-7Y for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:49 +0000 Received: from [85.158.137.68:36836] by server-14.bemta-3.messagelabs.com id 75/C9-09441-0B3C0E35; Tue, 05 Aug 2014 11:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1407239086!11911643!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12526 invoked from network); 5 Aug 2014 11:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAc-0008P0-D3 for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAc-000774-96 for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:46 +0000 Date: Tue, 05 Aug 2014 11:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mem_event: validate the response vcpu_id before acting on it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60400ce54cbc61365ff665946f0ba767c1694203 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:06:09 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:06:09 2014 +0200 x86/mem_event: validate the response vcpu_id before acting on it Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: Andres Lagar-Cavilla Tested-by: Razvan Cojocaru master commit: ee75480b3c8856db9ef1aa45418f35ec0d78989d master date: 2014-07-23 18:07:11 +0200 --- xen/arch/x86/mm/mem_sharing.c | 11 ++++++++++- xen/arch/x86/mm/p2m.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index fa8e6ea..59dca84 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -596,11 +596,20 @@ int mem_sharing_sharing_resume(struct domain *d) /* Get all requests off the ring */ while ( mem_event_get_response(d, &d->mem_event->share, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e661525..d8fda82 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1226,8 +1226,17 @@ void p2m_mem_paging_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->paging, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Fix p2m entry if the page was not dropped */ if ( !(rsp.flags & MEM_EVENT_FLAG_DROP_PAGE) ) { @@ -1246,7 +1255,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } @@ -1354,11 +1363,20 @@ void p2m_mem_access_resume(struct domain *d) /* Pull all responses off the ring */ while( mem_event_get_response(d, &d->mem_event->access, &rsp) ) { + struct vcpu *v; + if ( rsp.flags & MEM_EVENT_FLAG_DUMMY ) continue; + + /* Validate the vcpu_id in the response. */ + if ( (rsp.vcpu_id >= d->max_vcpus) || !d->vcpu[rsp.vcpu_id] ) + continue; + + v = d->vcpu[rsp.vcpu_id]; + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(d->vcpu[rsp.vcpu_id]); + vcpu_unpause(v); } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdB0-0006W2-DA; Tue, 05 Aug 2014 11:45:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAq-0006Vh-TF for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:45:01 +0000 Received: from [85.158.137.68:43800] by server-9.bemta-3.messagelabs.com id DF/07-30790-BB3C0E35; Tue, 05 Aug 2014 11:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1407239096!11998743!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11779 invoked from network); 5 Aug 2014 11:44:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAm-0008P9-Ij for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAm-00078F-GJ for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:56 +0000 Date: Tue, 05 Aug 2014 11:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a9452adc6795f4cc2e37d7472371993eedf2f69 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:06:47 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:06:47 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil master commit: 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 master date: 2014-07-23 18:08:04 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e171ed3..329369b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4583,7 +4583,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index d00e404..909d7a4 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -655,6 +655,38 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "d%d:v%d mem_event: Too many unpause attempts\n", + v->domain->domain_id, v->vcpu_id); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 59dca84..93c95af 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -568,7 +568,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -609,7 +609,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index d8fda82..d0934fe 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1092,7 +1092,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1255,7 +1255,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1350,7 +1350,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1376,7 +1376,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 045ef9b..ed4481a 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -66,6 +66,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE_PARAM(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 7924eb8..ea7f4a8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -170,6 +170,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ u16 virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdB0-0006W2-DA; Tue, 05 Aug 2014 11:45:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAq-0006Vh-TF for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:45:01 +0000 Received: from [85.158.137.68:43800] by server-9.bemta-3.messagelabs.com id DF/07-30790-BB3C0E35; Tue, 05 Aug 2014 11:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1407239096!11998743!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11779 invoked from network); 5 Aug 2014 11:44:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdAm-0008P9-Ij for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdAm-00078F-GJ for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:56 +0000 Date: Tue, 05 Aug 2014 11:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mem_event: prevent underflow of vcpu pause counts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a9452adc6795f4cc2e37d7472371993eedf2f69 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:06:47 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:06:47 2014 +0200 x86/mem_event: prevent underflow of vcpu pause counts Signed-off-by: Andrew Cooper Tested-by: Razvan Cojocaru Reviewed-by: Andres Lagar-Cavilla Tested-by: Aravindh Puthiyaparambil master commit: 868d9b99b39c53dc1f6ae9bfd7b148c206fd7240 master date: 2014-07-23 18:08:04 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm/mem_event.c | 32 ++++++++++++++++++++++++++++++++ xen/arch/x86/mm/mem_sharing.c | 4 ++-- xen/arch/x86/mm/p2m.c | 8 ++++---- xen/include/asm-x86/mem_event.h | 3 +++ xen/include/xen/sched.h | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e171ed3..329369b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4583,7 +4583,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, if ( (p & HVMPME_MODE_MASK) == HVMPME_mode_sync ) { req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.gfn = value; diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index d00e404..909d7a4 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -655,6 +655,38 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, return rc; } +void mem_event_vcpu_pause(struct vcpu *v) +{ + ASSERT(v == current); + + atomic_inc(&v->mem_event_pause_count); + vcpu_pause_nosync(v); +} + +void mem_event_vcpu_unpause(struct vcpu *v) +{ + int old, new, prev = v->mem_event_pause_count.counter; + + /* All unpause requests as a result of toolstack responses. Prevent + * underflow of the vcpu pause count. */ + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + { + printk(XENLOG_G_WARNING + "d%d:v%d mem_event: Too many unpause attempts\n", + v->domain->domain_id, v->vcpu_id); + return; + } + + prev = cmpxchg(&v->mem_event_pause_count.counter, old, new); + } while ( prev != old ); + + vcpu_unpause(v); +} /* * Local variables: diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 59dca84..93c95af 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -568,7 +568,7 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn, if ( v->domain == d ) { req.flags = MEM_EVENT_FLAG_VCPU_PAUSED; - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); } req.p2mt = p2m_ram_shared; @@ -609,7 +609,7 @@ int mem_sharing_sharing_resume(struct domain *d) /* Unpause domain/vcpu */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } return 0; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index d8fda82..d0934fe 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1092,7 +1092,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) /* Pause domain if request came from guest and gfn has paging type */ if ( p2m_is_paging(p2mt) && v->domain == d ) { - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED; } /* No need to inform pager if the gfn is not in the page-out path */ @@ -1255,7 +1255,7 @@ void p2m_mem_paging_resume(struct domain *d) } /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } @@ -1350,7 +1350,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Pause the current VCPU */ if ( p2ma != p2m_access_n2rwx ) - vcpu_pause_nosync(v); + mem_event_vcpu_pause(v); /* VCPU may be paused, return whether we promoted automatically */ return (p2ma == p2m_access_n2rwx); @@ -1376,7 +1376,7 @@ void p2m_mem_access_resume(struct domain *d) /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) - vcpu_unpause(v); + mem_event_vcpu_unpause(v); } } diff --git a/xen/include/asm-x86/mem_event.h b/xen/include/asm-x86/mem_event.h index 045ef9b..ed4481a 100644 --- a/xen/include/asm-x86/mem_event.h +++ b/xen/include/asm-x86/mem_event.h @@ -66,6 +66,9 @@ int do_mem_event_op(int op, uint32_t domain, void *arg); int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, XEN_GUEST_HANDLE_PARAM(void) u_domctl); +void mem_event_vcpu_pause(struct vcpu *v); +void mem_event_vcpu_unpause(struct vcpu *v); + #endif /* __MEM_EVENT_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 7924eb8..ea7f4a8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -170,6 +170,9 @@ struct vcpu unsigned long pause_flags; atomic_t pause_count; + /* VCPU paused for mem_event replies. */ + atomic_t mem_event_pause_count; + /* IRQ-safe virq_lock protects against delivering VIRQ to stale evtchn. */ u16 virq_to_evtchn[NR_VIRQS]; spinlock_t virq_lock; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:46:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:46:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdC6-0006ac-NI; Tue, 05 Aug 2014 11:46:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdC5-0006aX-Kc for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:46:17 +0000 Received: from [85.158.139.211:2765] by server-14.bemta-5.messagelabs.com id F7/78-12422-804C0E35; Tue, 05 Aug 2014 11:46:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1407239055!11985554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19621 invoked from network); 5 Aug 2014 11:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdA7-0008Ok-Mf for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdA7-00075l-AF for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:15 +0000 Date: Tue, 05 Aug 2014 11:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ea3fb47af98efa84a26aaede772abf140102323 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:03:42 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:03:42 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper master commit: 3eb1c708ab0fe1067a436498a684907afa14dacf master date: 2014-07-03 16:51:13 +0200 master commit: 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 master date: 2014-07-25 11:53:31 +0200 --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 18 ++++---------- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e8f5363..67afe8e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1005,7 +1005,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1021,7 +1021,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1039,7 +1039,7 @@ long arch_do_domctl( struct vcpu *v; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index e1a2376..6dbfaa5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -260,7 +260,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(XSM_HOOK, d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( domid ) @@ -671,18 +671,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; - - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ + struct vcpu *curr = current; + struct domain *d = curr->domain; - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -829,17 +824,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 9bd8f80..2747dcd 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -181,7 +181,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -379,22 +379,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_pausedomain: - { ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } - } - break; + ret = domain_pause_by_systemcontroller(d); + break; case XEN_DOMCTL_unpausedomain: - { - domain_unpause_by_systemcontroller(d); - ret = 0; - } - break; + ret = domain_unpause_by_systemcontroller(d); + break; case XEN_DOMCTL_resumedomain: { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0ba9178..7924eb8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -302,7 +302,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -690,8 +690,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(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); +} void cpu_init(void); struct scheduler; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 05 11:46:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 Aug 2014 11:46:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdC6-0006ac-NI; Tue, 05 Aug 2014 11:46:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdC5-0006aX-Kc for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:46:17 +0000 Received: from [85.158.139.211:2765] by server-14.bemta-5.messagelabs.com id F7/78-12422-804C0E35; Tue, 05 Aug 2014 11:46:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1407239055!11985554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19621 invoked from network); 5 Aug 2014 11:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2014 11:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEdA7-0008Ok-Mf for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XEdA7-00075l-AF for xen-changelog@lists.xensource.com; Tue, 05 Aug 2014 11:44:15 +0000 Date: Tue, 05 Aug 2014 11:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] properly reference count DOMCTL_{, un}pausedomain hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ea3fb47af98efa84a26aaede772abf140102323 Author: Andrew Cooper AuthorDate: Mon Jul 28 15:03:42 2014 +0200 Commit: Jan Beulich CommitDate: Mon Jul 28 15:03:42 2014 +0200 properly reference count DOMCTL_{,un}pausedomain hypercalls For safety reasons, c/s 6ae2df93c27 "mem_access: Add helper API to setup ring and enable mem_access" has to pause the domain while it performs a set of operations. However without properly reference counted hypercalls, xc_mem_event_enable() now unconditionally unpauses a previously paused domain. To prevent toolstack software running wild, there is an arbitrary limit of 255 on the toolstack pause count. This is high enough for several components of the toolstack to safely use, but prevents over/underflow of d->pause_count. The previous domain_{,un}pause_by_systemcontroller() functions are updated to return an error code. domain_pause_by_systemcontroller() is modified to have a common stub and take a pause_fn pointer, allowing for both sync and nosync domain pauses. domain_pause_for_debugger() has a hand-rolled nosync pause replaced with the new domain_pause_by_systemcontroller_nosync(), and has its variables shuffled slightly to avoid rereading current multiple times. Suggested-by: Don Slutz Signed-off-by: Andrew Cooper With a couple of formatting adjustments: Reviewed-by: Jan Beulich x86/gdbsx: invert preconditions for XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls c/s 3eb1c708ab "properly reference count DOMCTL_{,un}pausedomain hypercalls" accidentally inverted the use of d->controller_pause_count. Revert back to how it was originally, i.e. the XEN_DOMCTL_gdbsx_{,un}pausevcpu hypercalls are only valid for a domain already paused by the system controller. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper master commit: 3eb1c708ab0fe1067a436498a684907afa14dacf master date: 2014-07-03 16:51:13 +0200 master commit: 680d79f10bb70691a9ae3b4a6a8b669e0f2837f6 master date: 2014-07-25 11:53:31 +0200 --- xen/arch/x86/domctl.c | 6 ++-- xen/common/domain.c | 61 +++++++++++++++++++++++++++++++++------------- xen/common/domctl.c | 18 ++++---------- xen/include/xen/sched.h | 15 +++++++++-- 4 files changed, 64 insertions(+), 36 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e8f5363..67afe8e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1005,7 +1005,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1021,7 +1021,7 @@ long arch_do_domctl( struct vcpu *v; ret = -EBUSY; - if ( !d->is_paused_by_controller ) + if ( !d->controller_pause_count ) break; ret = -EINVAL; if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= MAX_VIRT_CPUS || @@ -1039,7 +1039,7 @@ long arch_do_domctl( struct vcpu *v; domctl->u.gdbsx_domstatus.vcpu_id = -1; - domctl->u.gdbsx_domstatus.paused = d->is_paused_by_controller; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count > 0; if ( domctl->u.gdbsx_domstatus.paused ) { for_each_vcpu ( d, v ) diff --git a/xen/common/domain.c b/xen/common/domain.c index e1a2376..6dbfaa5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -260,7 +260,7 @@ struct domain *domain_create( if ( (err = xsm_domain_create(XSM_HOOK, d, ssidref)) != 0 ) goto fail; - d->is_paused_by_controller = 1; + d->controller_pause_count = 1; atomic_inc(&d->pause_count); if ( domid ) @@ -671,18 +671,13 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) #ifdef HAS_GDBSX void domain_pause_for_debugger(void) { - struct domain *d = current->domain; - struct vcpu *v; - - atomic_inc(&d->pause_count); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); /* race-free atomic_dec(&d->pause_count) */ + struct vcpu *curr = current; + struct domain *d = curr->domain; - for_each_vcpu ( d, v ) - vcpu_sleep_nosync(v); + domain_pause_by_systemcontroller_nosync(d); /* if gdbsx active, we just need to pause the domain */ - if (current->arch.gdbsx_vcpu_event == 0) + if ( curr->arch.gdbsx_vcpu_event == 0 ) send_global_virq(VIRQ_DEBUGGER); } #endif @@ -829,17 +824,49 @@ void domain_unpause(struct domain *d) vcpu_wake(v); } -void domain_pause_by_systemcontroller(struct domain *d) +int __domain_pause_by_systemcontroller(struct domain *d, + void (*pause_fn)(struct domain *d)) { - domain_pause(d); - if ( test_and_set_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old + 1; + + /* + * Limit the toolstack pause count to an arbitrary 255 to prevent the + * toolstack overflowing d->pause_count with many repeated hypercalls. + */ + if ( new > 255 ) + return -EUSERS; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + pause_fn(d); + + return 0; } -void domain_unpause_by_systemcontroller(struct domain *d) +int domain_unpause_by_systemcontroller(struct domain *d) { - if ( test_and_clear_bool(d->is_paused_by_controller) ) - domain_unpause(d); + int old, new, prev = d->controller_pause_count; + + do + { + old = prev; + new = old - 1; + + if ( new < 0 ) + return -EINVAL; + + prev = cmpxchg(&d->controller_pause_count, old, new); + } while ( prev != old ); + + domain_unpause(d); + + return 0; } int vcpu_reset(struct vcpu *v) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 9bd8f80..2747dcd 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -181,7 +181,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->flags = (info->nr_online_vcpus ? flags : 0) | ((d->is_dying == DOMDYING_dead) ? XEN_DOMINF_dying : 0) | (d->is_shut_down ? XEN_DOMINF_shutdown : 0) | - (d->is_paused_by_controller ? XEN_DOMINF_paused : 0) | + (d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) | (d->debugger_attached ? XEN_DOMINF_debugged : 0) | d->shutdown_code << XEN_DOMINF_shutdownshift; @@ -379,22 +379,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; case XEN_DOMCTL_pausedomain: - { ret = -EINVAL; if ( d != current->domain ) - { - domain_pause_by_systemcontroller(d); - ret = 0; - } - } - break; + ret = domain_pause_by_systemcontroller(d); + break; case XEN_DOMCTL_unpausedomain: - { - domain_unpause_by_systemcontroller(d); - ret = 0; - } - break; + ret = domain_unpause_by_systemcontroller(d); + break; case XEN_DOMCTL_resumedomain: { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0ba9178..7924eb8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -302,7 +302,7 @@ struct domain /* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying; /* Domain is paused by controller software? */ - bool_t is_paused_by_controller; + int controller_pause_count; /* Domain's VCPUs are pinned 1:1 to physical CPUs? */ bool_t is_pinned; @@ -690,8 +690,17 @@ void domain_pause(struct domain *d); void domain_pause_nosync(struct domain *d); void vcpu_unpause(struct vcpu *v); void domain_unpause(struct domain *d); -void domain_pause_by_systemcontroller(struct domain *d); -void domain_unpause_by_systemcontroller(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); +} void cpu_init(void); struct scheduler; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 06 19:55:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2014 19:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XF7Ik-0002zn-R5; Wed, 06 Aug 2014 19:55:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XF7If-0002zc-SU for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 19:55:06 +0000 Received: from [85.158.143.35:9663] by server-3.bemta-4.messagelabs.com id A4/0B-06192-91882E35; Wed, 06 Aug 2014 19:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1407354903!13866405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14390 invoked from network); 6 Aug 2014 19:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Aug 2014 19:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XF7Id-0003rS-50 for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 19:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XF7Ic-0000Za-CS for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 19:55:02 +0000 Date: Wed, 06 Aug 2014 19:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.5-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b16f9215f705ecba1a5685ae7cbc6467ec429b3f Author: Jan Beulich AuthorDate: Tue Aug 5 13:44:16 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 13:44:16 2014 +0200 update Xen version to 4.2.5-rc2 --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 75cb715..a529cd1 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 = 2 -export XEN_EXTRAVERSION ?= .5-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5-rc2$(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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 06 19:55:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2014 19:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XF7Ik-0002zn-R5; Wed, 06 Aug 2014 19:55:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XF7If-0002zc-SU for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 19:55:06 +0000 Received: from [85.158.143.35:9663] by server-3.bemta-4.messagelabs.com id A4/0B-06192-91882E35; Wed, 06 Aug 2014 19:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1407354903!13866405!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14390 invoked from network); 6 Aug 2014 19:55:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 6 Aug 2014 19:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XF7Id-0003rS-50 for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 19:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XF7Ic-0000Za-CS for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 19:55:02 +0000 Date: Wed, 06 Aug 2014 19:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.5-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b16f9215f705ecba1a5685ae7cbc6467ec429b3f Author: Jan Beulich AuthorDate: Tue Aug 5 13:44:16 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 13:44:16 2014 +0200 update Xen version to 4.2.5-rc2 --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 75cb715..a529cd1 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 = 2 -export XEN_EXTRAVERSION ?= .5-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5-rc2$(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.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 06 23:11:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2014 23:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFAMM-0007hb-1S; Wed, 06 Aug 2014 23:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFAML-0007hW-Iz for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 23:11:05 +0000 Received: from [193.109.254.147:44624] by server-7.bemta-14.messagelabs.com id 54/64-13362-806B2E35; Wed, 06 Aug 2014 23:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1407366663!14168171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 597 invoked from network); 6 Aug 2014 23:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Aug 2014 23:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFAMJ-00063J-0N for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 23:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFAMI-00075f-0H for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 23:11:02 +0000 Date: Wed, 06 Aug 2014 23:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.1-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f3cdfc4d7fa1e3dc93cc6153782872d90f25b53 Author: Jan Beulich AuthorDate: Tue Aug 5 13:41:22 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 13:41:22 2014 +0200 update Xen version to 4.4.1-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index fbc6fc3..b78eb16 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 6ae4e588081620b141071eb010ec40aca7e12876 +QEMU_TAG ?= xen-4.4.1-rc2 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index fc59708..738893a 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 = 4 -export XEN_EXTRAVERSION ?= .1-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-rc2$(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.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 06 23:11:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 Aug 2014 23:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFAMM-0007hb-1S; Wed, 06 Aug 2014 23:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFAML-0007hW-Iz for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 23:11:05 +0000 Received: from [193.109.254.147:44624] by server-7.bemta-14.messagelabs.com id 54/64-13362-806B2E35; Wed, 06 Aug 2014 23:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1407366663!14168171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 597 invoked from network); 6 Aug 2014 23:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Aug 2014 23:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFAMJ-00063J-0N for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 23:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFAMI-00075f-0H for xen-changelog@lists.xensource.com; Wed, 06 Aug 2014 23:11:02 +0000 Date: Wed, 06 Aug 2014 23:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.1-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f3cdfc4d7fa1e3dc93cc6153782872d90f25b53 Author: Jan Beulich AuthorDate: Tue Aug 5 13:41:22 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 13:41:22 2014 +0200 update Xen version to 4.4.1-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index fbc6fc3..b78eb16 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 6ae4e588081620b141071eb010ec40aca7e12876 +QEMU_TAG ?= xen-4.4.1-rc2 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index fc59708..738893a 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 = 4 -export XEN_EXTRAVERSION ?= .1-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-rc2$(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.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 08 15:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2014 15:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFloy-0005Ls-4y; Fri, 08 Aug 2014 15:11:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlox-0005Ll-5i for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:07 +0000 Content-Length: 2338 Received: from [193.109.254.147:17310] by server-5.bemta-14.messagelabs.com id C3/BD-28255-A88E4E35; Fri, 08 Aug 2014 15:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1407510665!14514388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15236 invoked from network); 8 Aug 2014 15:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Aug 2014 15:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlot-0005HU-OO for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFlot-0008DD-E5 for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:03 +0000 Date: Fri, 08 Aug 2014 15:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: fix usage of ENODATA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7138893745693685388==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7138893745693685388== Content-Length: 1935 Content-Transfer-Encoding: quoted-printable commit fb97531e52d20b864f3eb2e62695d4694a77d530 Author: Roger Pau Monne AuthorDate: Fri May 23 17:57:47 2014 +0200 Commit: Stefano Stabellini CommitDate: Mon Aug 4 16:36:12 2014 +0000 xen: fix usage of ENODATA ENODATA doesn't exist on FreeBSD, so ENODATA errors returned by the hypervisor are translated to ENOENT. Also, the error code is returned in errno if the call returns -1, so compare the error code with the value in errno instead of the value returned by the function. upstream-commit-id: 74bc41511af5c389cd9f37956bd6e7fd7de35c49 Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Stefano Stabellini Cc: xen-devel@lists.xenproject.org Cc: Stefano Stabellini Cc: Anthony Perard --- xen-hvm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index a573a20..5c69a8d 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -513,11 +513,14 @@ static void xen_sync_dirty_bitmap(XenIOState *state, start_addr >> TARGET_PAGE_BITS, npages, bitmap); if (rc < 0) { - if (rc !=3D -ENODATA) { +#ifndef ENODATA +#define ENODATA ENOENT +#endif + if (errno =3D=3D ENODATA) { memory_region_set_dirty(framebuffer, 0, size); DPRINTF("xen: track_dirty_vram failed (0x" TARGET_FMT_plx ", 0x" TARGET_FMT_plx "): %s\n", - start_addr, start_addr + size, strerror(-rc)); + start_addr, start_addr + size, strerror(errno)); } return; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============7138893745693685388== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7138893745693685388==-- From xen-changelog-bounces@lists.xen.org Fri Aug 08 15:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2014 15:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFloy-0005Ls-4y; Fri, 08 Aug 2014 15:11:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlox-0005Ll-5i for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:07 +0000 Content-Length: 2338 Received: from [193.109.254.147:17310] by server-5.bemta-14.messagelabs.com id C3/BD-28255-A88E4E35; Fri, 08 Aug 2014 15:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1407510665!14514388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15236 invoked from network); 8 Aug 2014 15:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Aug 2014 15:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlot-0005HU-OO for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFlot-0008DD-E5 for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:03 +0000 Date: Fri, 08 Aug 2014 15:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: fix usage of ENODATA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7138893745693685388==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7138893745693685388== Content-Length: 1935 Content-Transfer-Encoding: quoted-printable commit fb97531e52d20b864f3eb2e62695d4694a77d530 Author: Roger Pau Monne AuthorDate: Fri May 23 17:57:47 2014 +0200 Commit: Stefano Stabellini CommitDate: Mon Aug 4 16:36:12 2014 +0000 xen: fix usage of ENODATA ENODATA doesn't exist on FreeBSD, so ENODATA errors returned by the hypervisor are translated to ENOENT. Also, the error code is returned in errno if the call returns -1, so compare the error code with the value in errno instead of the value returned by the function. upstream-commit-id: 74bc41511af5c389cd9f37956bd6e7fd7de35c49 Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Stefano Stabellini Cc: xen-devel@lists.xenproject.org Cc: Stefano Stabellini Cc: Anthony Perard --- xen-hvm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index a573a20..5c69a8d 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -513,11 +513,14 @@ static void xen_sync_dirty_bitmap(XenIOState *state, start_addr >> TARGET_PAGE_BITS, npages, bitmap); if (rc < 0) { - if (rc !=3D -ENODATA) { +#ifndef ENODATA +#define ENODATA ENOENT +#endif + if (errno =3D=3D ENODATA) { memory_region_set_dirty(framebuffer, 0, size); DPRINTF("xen: track_dirty_vram failed (0x" TARGET_FMT_plx ", 0x" TARGET_FMT_plx "): %s\n", - start_addr, start_addr + size, strerror(-rc)); + start_addr, start_addr + size, strerror(errno)); } return; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============7138893745693685388== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7138893745693685388==-- From xen-changelog-bounces@lists.xen.org Fri Aug 08 15:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2014 15:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlp9-0005NS-7z; Fri, 08 Aug 2014 15:11:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlp7-0005NE-O5 for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:17 +0000 Content-Length: 4148 Received: from [85.158.139.211:26093] by server-15.bemta-5.messagelabs.com id 8F/53-12002-598E4E35; Fri, 08 Aug 2014 15:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1407510675!12677071!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4563 invoked from network); 8 Aug 2014 15:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Aug 2014 15:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlp5-0005HX-3c for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFlp4-0008Dk-UB for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:14 +0000 Date: Fri, 08 Aug 2014 15:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] tap-bsd: implement a FreeBSD only version of tap_open X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7184125781245699788==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7184125781245699788== Content-Length: 3817 Content-Transfer-Encoding: quoted-printable commit 2259737fd3d305077728ea7d244a8ca7a535c6b5 Author: Roger Pau Monne AuthorDate: Fri May 23 17:57:48 2014 +0200 Commit: Stefano Stabellini CommitDate: Mon Aug 4 16:36:34 2014 +0000 tap-bsd: implement a FreeBSD only version of tap_open The current behaviour of tap_open for BSD systems differ greatly from it's Linux counterpart. Since FreeBSD supports interface renaming and tap device cloning by opening /dev/tap, implement a FreeBSD specific version of tap_open that behaves like it's Linux counterpart. This is specially important for toolstacks that use Qemu (like Xen libxl), in order to have a unified behaviour across suported platforms. upstream-commit-id: 8677de2b4d26f8878b7414d540a6b2e139bc4d91 Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Stefano Stabellini Reviewed-by: Stefan Hajnoczi --- net/tap-bsd.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 90f8a02..bf91bd0 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -27,12 +27,13 @@ #include "sysemu/sysemu.h" #include "qemu/error-report.h" -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__FreeBSD__) #include #include #include #endif +#ifndef __FreeBSD__ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required) { @@ -108,6 +109,73 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, return fd; } +#else /* __FreeBSD__ */ + +#define PATH_NET_TAP "/dev/tap" + +int tap_open(char *ifname, int ifname_size, int *vnet_hdr, + int vnet_hdr_required, int mq_required) +{ + int fd, s, ret; + struct ifreq ifr; + + TFR(fd =3D open(PATH_NET_TAP, O_RDWR)); + if (fd < 0) { + error_report("could not open %s: %s", PATH_NET_TAP, strerror(errno)); + return -1; + } + + memset(&ifr, 0, sizeof(ifr)); + + ret =3D ioctl(fd, TAPGIFNAME, (void *)&ifr); + if (ret < 0) { + error_report("could not get tap interface name"); + goto error; + } + + if (ifname[0] !=3D '\0') { + /* User requested the interface to have a specific name */ + s =3D socket(AF_LOCAL, SOCK_DGRAM, 0); + if (s < 0) { + error_report("could not open socket to set interface name"); + goto error; + } + ifr.ifr_data =3D ifname; + ret =3D ioctl(s, SIOCSIFNAME, (void *)&ifr); + close(s); + if (ret < 0) { + error_report("could not set tap interface name"); + goto error; + } + } else { + pstrcpy(ifname, ifname_size, ifr.ifr_name); + } + + if (*vnet_hdr) { + /* BSD doesn't have IFF_VNET_HDR */ + *vnet_hdr =3D 0; + + if (vnet_hdr_required && !*vnet_hdr) { + error_report("vnet_hdr=3D1 requested, but no kernel " + "support for IFF_VNET_HDR available"); + goto error; + } + } + if (mq_required) { + error_report("mq_required requested, but not kernel support" + "for IFF_MULTI_QUEUE available"); + goto error; + } + + fcntl(fd, F_SETFL, O_NONBLOCK); + return fd; + +error: + close(fd); + return -1; +} +#endif /* __FreeBSD__ */ + int tap_set_sndbuf(int fd, const NetdevTapOptions *tap) { return 0; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============7184125781245699788== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7184125781245699788==-- From xen-changelog-bounces@lists.xen.org Fri Aug 08 15:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2014 15:11:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlp9-0005NS-7z; Fri, 08 Aug 2014 15:11:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlp7-0005NE-O5 for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:17 +0000 Content-Length: 4148 Received: from [85.158.139.211:26093] by server-15.bemta-5.messagelabs.com id 8F/53-12002-598E4E35; Fri, 08 Aug 2014 15:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1407510675!12677071!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4563 invoked from network); 8 Aug 2014 15:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Aug 2014 15:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlp5-0005HX-3c for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFlp4-0008Dk-UB for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:14 +0000 Date: Fri, 08 Aug 2014 15:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] tap-bsd: implement a FreeBSD only version of tap_open X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7184125781245699788==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7184125781245699788== Content-Length: 3817 Content-Transfer-Encoding: quoted-printable commit 2259737fd3d305077728ea7d244a8ca7a535c6b5 Author: Roger Pau Monne AuthorDate: Fri May 23 17:57:48 2014 +0200 Commit: Stefano Stabellini CommitDate: Mon Aug 4 16:36:34 2014 +0000 tap-bsd: implement a FreeBSD only version of tap_open The current behaviour of tap_open for BSD systems differ greatly from it's Linux counterpart. Since FreeBSD supports interface renaming and tap device cloning by opening /dev/tap, implement a FreeBSD specific version of tap_open that behaves like it's Linux counterpart. This is specially important for toolstacks that use Qemu (like Xen libxl), in order to have a unified behaviour across suported platforms. upstream-commit-id: 8677de2b4d26f8878b7414d540a6b2e139bc4d91 Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Stefano Stabellini Reviewed-by: Stefan Hajnoczi --- net/tap-bsd.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 90f8a02..bf91bd0 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -27,12 +27,13 @@ #include "sysemu/sysemu.h" #include "qemu/error-report.h" -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__FreeBSD__) #include #include #include #endif +#ifndef __FreeBSD__ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required) { @@ -108,6 +109,73 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, return fd; } +#else /* __FreeBSD__ */ + +#define PATH_NET_TAP "/dev/tap" + +int tap_open(char *ifname, int ifname_size, int *vnet_hdr, + int vnet_hdr_required, int mq_required) +{ + int fd, s, ret; + struct ifreq ifr; + + TFR(fd =3D open(PATH_NET_TAP, O_RDWR)); + if (fd < 0) { + error_report("could not open %s: %s", PATH_NET_TAP, strerror(errno)); + return -1; + } + + memset(&ifr, 0, sizeof(ifr)); + + ret =3D ioctl(fd, TAPGIFNAME, (void *)&ifr); + if (ret < 0) { + error_report("could not get tap interface name"); + goto error; + } + + if (ifname[0] !=3D '\0') { + /* User requested the interface to have a specific name */ + s =3D socket(AF_LOCAL, SOCK_DGRAM, 0); + if (s < 0) { + error_report("could not open socket to set interface name"); + goto error; + } + ifr.ifr_data =3D ifname; + ret =3D ioctl(s, SIOCSIFNAME, (void *)&ifr); + close(s); + if (ret < 0) { + error_report("could not set tap interface name"); + goto error; + } + } else { + pstrcpy(ifname, ifname_size, ifr.ifr_name); + } + + if (*vnet_hdr) { + /* BSD doesn't have IFF_VNET_HDR */ + *vnet_hdr =3D 0; + + if (vnet_hdr_required && !*vnet_hdr) { + error_report("vnet_hdr=3D1 requested, but no kernel " + "support for IFF_VNET_HDR available"); + goto error; + } + } + if (mq_required) { + error_report("mq_required requested, but not kernel support" + "for IFF_MULTI_QUEUE available"); + goto error; + } + + fcntl(fd, F_SETFL, O_NONBLOCK); + return fd; + +error: + close(fd); + return -1; +} +#endif /* __FreeBSD__ */ + int tap_set_sndbuf(int fd, const NetdevTapOptions *tap) { return 0; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============7184125781245699788== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7184125781245699788==-- From xen-changelog-bounces@lists.xen.org Fri Aug 08 15:11:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2014 15:11:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlpJ-0005Pi-NC; Fri, 08 Aug 2014 15:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlpI-0005PA-3E for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:28 +0000 Received: from [85.158.137.68:30204] by server-9.bemta-3.messagelabs.com id 51/B1-30790-F98E4E35; Fri, 08 Aug 2014 15:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1407510685!12651144!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4744 invoked from network); 8 Aug 2014 15:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Aug 2014 15:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlpF-0005Hg-CS for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFlpF-0008E6-86 for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:25 +0000 Date: Fri, 08 Aug 2014 15:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu: support xen hvm direct kernel boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9ba6139d411aedf5df36c07d6f867503fd883ba Author: Chunyan Liu AuthorDate: Mon Jul 7 14:34:35 2014 +0800 Commit: Stefano Stabellini CommitDate: Mon Aug 4 16:43:11 2014 +0000 qemu: support xen hvm direct kernel boot qemu side patch to support xen HVM direct kernel boot: if -kernel exists, calls xen_load_linux(), which will read kernel/initrd and add a linuxboot.bin or multiboot.bin option rom. The linuxboot.bin/multiboot.bin will load kernel/initrd and jump to execute kernel directly. It's working when xen uses seabios. During this work, found the 'kvmvapic' is in option_rom list, it should not be there in xen case. Set s->vapic_control = 0 in xen_apic_realize() to handle that. Signed-off-by: Chunyan Liu Acked-by: Stefano Stabellini Acked-by: Michael S. Tsirkin Conflicts: hw/i386/pc.c hw/i386/pc_piix.c include/hw/i386/pc.h --- hw/i386/pc.c | 25 +++++++++++++++++++++++++ hw/i386/pc_piix.c | 7 +++++++ hw/i386/xen/xen_apic.c | 1 + include/hw/i386/pc.h | 5 +++++ 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 14f0d91..30d3bfa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1157,6 +1157,31 @@ void pc_acpi_init(const char *default_dsdt) } } +FWCfgState *xen_load_linux(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + PcGuestInfo *guest_info) +{ + int i; + FWCfgState *fw_cfg; + + assert(kernel_filename != NULL); + + fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0); + rom_set_fw(fw_cfg); + + load_linux(fw_cfg, kernel_filename, initrd_filename, + kernel_cmdline, below_4g_mem_size); + for (i = 0; i < nb_option_roms; i++) { + assert(!strcmp(option_rom[i].name, "linuxboot.bin") || + !strcmp(option_rom[i].name, "multiboot.bin")); + rom_add_option(option_rom[i].name, option_rom[i].bootindex); + } + guest_info->fw_cfg = fw_cfg; + return fw_cfg; +} + FWCfgState *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename, const char *kernel_cmdline, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d506630..1b3cd18 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -179,6 +179,13 @@ static void pc_init1(QEMUMachineInitArgs *args, args->initrd_filename, below_4g_mem_size, above_4g_mem_size, rom_memory, &ram_memory, guest_info); + } else if (args->kernel_filename != NULL) { + /* For xen HVM direct kernel boot, load linux here */ + fw_cfg = xen_load_linux(args->kernel_filename, + args->kernel_cmdline, + args->initrd_filename, + below_4g_mem_size, + guest_info); } gsi_state = g_malloc0(sizeof(*gsi_state)); diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c index 63bb7f7..f5acd6a 100644 --- a/hw/i386/xen/xen_apic.c +++ b/hw/i386/xen/xen_apic.c @@ -40,6 +40,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); + s->vapic_control = 0; memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s, "xen-apic-msi", APIC_SPACE_SIZE); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9010246..b3ec562 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -134,6 +134,11 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, MemoryRegion *pci_address_space); +FWCfgState *xen_load_linux(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + PcGuestInfo *guest_info); FWCfgState *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename, const char *kernel_cmdline, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 08 15:11:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Aug 2014 15:11:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlpJ-0005Pi-NC; Fri, 08 Aug 2014 15:11:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlpI-0005PA-3E for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:28 +0000 Received: from [85.158.137.68:30204] by server-9.bemta-3.messagelabs.com id 51/B1-30790-F98E4E35; Fri, 08 Aug 2014 15:11:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1407510685!12651144!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4744 invoked from network); 8 Aug 2014 15:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Aug 2014 15:11:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFlpF-0005Hg-CS for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XFlpF-0008E6-86 for xen-changelog@lists.xensource.com; Fri, 08 Aug 2014 15:11:25 +0000 Date: Fri, 08 Aug 2014 15:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] qemu: support xen hvm direct kernel boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9ba6139d411aedf5df36c07d6f867503fd883ba Author: Chunyan Liu AuthorDate: Mon Jul 7 14:34:35 2014 +0800 Commit: Stefano Stabellini CommitDate: Mon Aug 4 16:43:11 2014 +0000 qemu: support xen hvm direct kernel boot qemu side patch to support xen HVM direct kernel boot: if -kernel exists, calls xen_load_linux(), which will read kernel/initrd and add a linuxboot.bin or multiboot.bin option rom. The linuxboot.bin/multiboot.bin will load kernel/initrd and jump to execute kernel directly. It's working when xen uses seabios. During this work, found the 'kvmvapic' is in option_rom list, it should not be there in xen case. Set s->vapic_control = 0 in xen_apic_realize() to handle that. Signed-off-by: Chunyan Liu Acked-by: Stefano Stabellini Acked-by: Michael S. Tsirkin Conflicts: hw/i386/pc.c hw/i386/pc_piix.c include/hw/i386/pc.h --- hw/i386/pc.c | 25 +++++++++++++++++++++++++ hw/i386/pc_piix.c | 7 +++++++ hw/i386/xen/xen_apic.c | 1 + include/hw/i386/pc.h | 5 +++++ 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 14f0d91..30d3bfa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1157,6 +1157,31 @@ void pc_acpi_init(const char *default_dsdt) } } +FWCfgState *xen_load_linux(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + PcGuestInfo *guest_info) +{ + int i; + FWCfgState *fw_cfg; + + assert(kernel_filename != NULL); + + fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0); + rom_set_fw(fw_cfg); + + load_linux(fw_cfg, kernel_filename, initrd_filename, + kernel_cmdline, below_4g_mem_size); + for (i = 0; i < nb_option_roms; i++) { + assert(!strcmp(option_rom[i].name, "linuxboot.bin") || + !strcmp(option_rom[i].name, "multiboot.bin")); + rom_add_option(option_rom[i].name, option_rom[i].bootindex); + } + guest_info->fw_cfg = fw_cfg; + return fw_cfg; +} + FWCfgState *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename, const char *kernel_cmdline, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d506630..1b3cd18 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -179,6 +179,13 @@ static void pc_init1(QEMUMachineInitArgs *args, args->initrd_filename, below_4g_mem_size, above_4g_mem_size, rom_memory, &ram_memory, guest_info); + } else if (args->kernel_filename != NULL) { + /* For xen HVM direct kernel boot, load linux here */ + fw_cfg = xen_load_linux(args->kernel_filename, + args->kernel_cmdline, + args->initrd_filename, + below_4g_mem_size, + guest_info); } gsi_state = g_malloc0(sizeof(*gsi_state)); diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c index 63bb7f7..f5acd6a 100644 --- a/hw/i386/xen/xen_apic.c +++ b/hw/i386/xen/xen_apic.c @@ -40,6 +40,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); + s->vapic_control = 0; memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s, "xen-apic-msi", APIC_SPACE_SIZE); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9010246..b3ec562 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -134,6 +134,11 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size, void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, MemoryRegion *pci_address_space); +FWCfgState *xen_load_linux(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + PcGuestInfo *guest_info); FWCfgState *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename, const char *kernel_cmdline, -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIt-00010o-AV; Tue, 12 Aug 2014 19:00:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIs-00010j-0D for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:14 +0000 Received: from [85.158.137.68:27461] by server-5.bemta-3.messagelabs.com id 02/DA-30889-C346AE35; Tue, 12 Aug 2014 19:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1407870010!13331998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8354 invoked from network); 12 Aug 2014 19:00:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIo-0008UX-Bt for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHIi-0003B1-D6 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:04 +0000 Date: Tue, 12 Aug 2014 19:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix qemu building with older make X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1b7fe9a1a1757d6634f4319e91a466d2bc8e7ab2 Author: Jan Beulich AuthorDate: Mon Aug 4 13:42:34 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:42:34 2014 +0200 fix qemu building with older make The $(or ...) builtin (uses introduced by commits ffbf089357 and 8962a8f951) is supported only from make 3.81 onwards, yet we claim to only require make 3.80. Introduce a good enough fallback. Signed-off-by: Jan Beulich Acked-by: George Dunlap Acked-by: Ian Jackson --- Config.mk | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 5370e23..015b90b 100644 --- a/Config.mk +++ b/Config.mk @@ -12,6 +12,7 @@ space := $(empty) $(empty) # fallback for older make realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) +or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$(3),$(if $(strip $(4)),$(4))))) -include $(XEN_ROOT)/.config @@ -266,11 +267,11 @@ QEMU_TRADITIONAL_REVISION ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git # Defaults for subtree locations -QEMU_TRADITIONAL_LOC ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ - $(QEMU_TRADITIONAL_URL)) +QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\ + $(QEMU_TRADITIONAL_URL)) -QEMU_UPSTREAM_LOC ?= $(or $(wildcard $(QEMU_UPSTREAM_INTREE)),\ - $(QEMU_UPSTREAM_URL)) +QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\ + $(QEMU_UPSTREAM_URL)) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIt-00010o-AV; Tue, 12 Aug 2014 19:00:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIs-00010j-0D for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:14 +0000 Received: from [85.158.137.68:27461] by server-5.bemta-3.messagelabs.com id 02/DA-30889-C346AE35; Tue, 12 Aug 2014 19:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1407870010!13331998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8354 invoked from network); 12 Aug 2014 19:00:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIo-0008UX-Bt for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHIi-0003B1-D6 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:04 +0000 Date: Tue, 12 Aug 2014 19:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix qemu building with older make X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1b7fe9a1a1757d6634f4319e91a466d2bc8e7ab2 Author: Jan Beulich AuthorDate: Mon Aug 4 13:42:34 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:42:34 2014 +0200 fix qemu building with older make The $(or ...) builtin (uses introduced by commits ffbf089357 and 8962a8f951) is supported only from make 3.81 onwards, yet we claim to only require make 3.80. Introduce a good enough fallback. Signed-off-by: Jan Beulich Acked-by: George Dunlap Acked-by: Ian Jackson --- Config.mk | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 5370e23..015b90b 100644 --- a/Config.mk +++ b/Config.mk @@ -12,6 +12,7 @@ space := $(empty) $(empty) # fallback for older make realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) +or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$(3),$(if $(strip $(4)),$(4))))) -include $(XEN_ROOT)/.config @@ -266,11 +267,11 @@ QEMU_TRADITIONAL_REVISION ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29 # QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git # Defaults for subtree locations -QEMU_TRADITIONAL_LOC ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\ - $(QEMU_TRADITIONAL_URL)) +QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\ + $(QEMU_TRADITIONAL_URL)) -QEMU_UPSTREAM_LOC ?= $(or $(wildcard $(QEMU_UPSTREAM_INTREE)),\ - $(QEMU_UPSTREAM_URL)) +QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\ + $(QEMU_UPSTREAM_URL)) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJ3-00011T-E3; Tue, 12 Aug 2014 19:00:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJ2-00011N-C8 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:24 +0000 Received: from [85.158.143.35:60017] by server-2.bemta-4.messagelabs.com id 95/5A-04525-7446AE35; Tue, 12 Aug 2014 19:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1407870021!12592786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16502 invoked from network); 12 Aug 2014 19:00:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIy-0008Ua-ML for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHIy-0003CC-GZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:20 +0000 Date: Tue, 12 Aug 2014 19:00:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lz4: check for underruns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9143a6c55ef7e8f630857cb08c03844d372c2345 Author: Jan Beulich AuthorDate: Mon Aug 4 13:43:03 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:43:03 2014 +0200 lz4: check for underruns While overruns are already being taken care of, underruns (resulting from overflows in the respective "op + length" (or similar) operations weren't. This is CVE-2014-4611. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lz4/decompress.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 40b3381..5cf8f37 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -84,6 +84,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, ip += length; break; /* EOF */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -142,6 +144,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } @@ -207,6 +211,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, op += length; break;/* Necessarily EOF, due to parsing restrictions */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -270,6 +276,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJ3-00011T-E3; Tue, 12 Aug 2014 19:00:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJ2-00011N-C8 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:24 +0000 Received: from [85.158.143.35:60017] by server-2.bemta-4.messagelabs.com id 95/5A-04525-7446AE35; Tue, 12 Aug 2014 19:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1407870021!12592786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16502 invoked from network); 12 Aug 2014 19:00:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHIy-0008Ua-ML for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHIy-0003CC-GZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:20 +0000 Date: Tue, 12 Aug 2014 19:00:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lz4: check for underruns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9143a6c55ef7e8f630857cb08c03844d372c2345 Author: Jan Beulich AuthorDate: Mon Aug 4 13:43:03 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:43:03 2014 +0200 lz4: check for underruns While overruns are already being taken care of, underruns (resulting from overflows in the respective "op + length" (or similar) operations weren't. This is CVE-2014-4611. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lz4/decompress.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 40b3381..5cf8f37 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -84,6 +84,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, ip += length; break; /* EOF */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -142,6 +144,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } @@ -207,6 +211,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, op += length; break;/* Necessarily EOF, due to parsing restrictions */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -270,6 +276,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJC-00012c-Gh; Tue, 12 Aug 2014 19:00:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJB-00012V-Lz for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:33 +0000 Received: from [85.158.137.68:34709] by server-17.bemta-3.messagelabs.com id 16/5E-01527-0546AE35; Tue, 12 Aug 2014 19:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1407870031!13300792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14628 invoked from network); 12 Aug 2014 19:00:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJ9-0008Ul-00 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJ8-0003Cc-Qb for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:30 +0000 Date: Tue, 12 Aug 2014 19:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] convert "no-" command line option prefix into "=no" for OPT_CUSTOM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a0d52bfab4cb90e0f49073f12730936c1f3e718d Author: Jan Beulich AuthorDate: Mon Aug 4 13:44:36 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:44:36 2014 +0200 convert "no-" command line option prefix into "=no" for OPT_CUSTOM ... to allow restoring/retaining previous behavior for options getting converted from boolean to custom. Obviously that'll work only when no other argument was specified for the option. Command line settings of the form "no-=" will now be ignored as ambiguous (rather than being interpreted as "=", i.e. ignoring the "no-" prefix). Reported-by: Don Slutz Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/kernel.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 7e83353..d23c422 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -135,6 +135,13 @@ void __init cmdline_parse(const char *cmdline) parse_size_and_unit(optval, NULL)); break; case OPT_CUSTOM: + if ( !bool_assert ) + { + if ( *optval ) + break; + safe_strcpy(opt, "no"); + optval = opt; + } ((void (*)(const char *))param->var)(optval); break; default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJC-00012c-Gh; Tue, 12 Aug 2014 19:00:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJB-00012V-Lz for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:33 +0000 Received: from [85.158.137.68:34709] by server-17.bemta-3.messagelabs.com id 16/5E-01527-0546AE35; Tue, 12 Aug 2014 19:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1407870031!13300792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14628 invoked from network); 12 Aug 2014 19:00:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJ9-0008Ul-00 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJ8-0003Cc-Qb for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:30 +0000 Date: Tue, 12 Aug 2014 19:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] convert "no-" command line option prefix into "=no" for OPT_CUSTOM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a0d52bfab4cb90e0f49073f12730936c1f3e718d Author: Jan Beulich AuthorDate: Mon Aug 4 13:44:36 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:44:36 2014 +0200 convert "no-" command line option prefix into "=no" for OPT_CUSTOM ... to allow restoring/retaining previous behavior for options getting converted from boolean to custom. Obviously that'll work only when no other argument was specified for the option. Command line settings of the form "no-=" will now be ignored as ambiguous (rather than being interpreted as "=", i.e. ignoring the "no-" prefix). Reported-by: Don Slutz Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/kernel.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 7e83353..d23c422 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -135,6 +135,13 @@ void __init cmdline_parse(const char *cmdline) parse_size_and_unit(optval, NULL)); break; case OPT_CUSTOM: + if ( !bool_assert ) + { + if ( *optval ) + break; + safe_strcpy(opt, "no"); + optval = opt; + } ((void (*)(const char *))param->var)(optval); break; default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJP-00015H-5q; Tue, 12 Aug 2014 19:00:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJN-00014p-Ir for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:45 +0000 Received: from [85.158.143.35:32496] by server-3.bemta-4.messagelabs.com id 4C/46-06192-C546AE35; Tue, 12 Aug 2014 19:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1407870041!4599801!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3691 invoked from network); 12 Aug 2014 19:00:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJJ-0008Ur-5z for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJJ-0003DD-48 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:41 +0000 Date: Tue, 12 Aug 2014 19:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: better handing of console_timestamps as a boolean_param X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4efef44f0adacc9857b3a5035414db7ef281c8bf Author: Don Slutz AuthorDate: Mon Aug 4 13:45:08 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:45:08 2014 +0200 console: better handing of console_timestamps as a boolean_param In order to handle all the old ways, change to use parse_bool(). Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper Restructure code to limit churn. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/drivers/char/console.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2f6c090..2f03259 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -559,6 +559,15 @@ static int printk_prefix_check(char *p, char **pp) static void __init parse_console_timestamps(char *s) { + switch ( parse_bool(s) ) + { + case 0: + opt_con_timestamp_mode = TSM_NONE; + return; + case 1: + opt_con_timestamp_mode = TSM_DATE; + return; + } if ( *s == '\0' || /* Compat for old booleanparam() */ !strcmp(s, "date") ) opt_con_timestamp_mode = TSM_DATE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJP-00015H-5q; Tue, 12 Aug 2014 19:00:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJN-00014p-Ir for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:45 +0000 Received: from [85.158.143.35:32496] by server-3.bemta-4.messagelabs.com id 4C/46-06192-C546AE35; Tue, 12 Aug 2014 19:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1407870041!4599801!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3691 invoked from network); 12 Aug 2014 19:00:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJJ-0008Ur-5z for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJJ-0003DD-48 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:41 +0000 Date: Tue, 12 Aug 2014 19:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: better handing of console_timestamps as a boolean_param X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4efef44f0adacc9857b3a5035414db7ef281c8bf Author: Don Slutz AuthorDate: Mon Aug 4 13:45:08 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:45:08 2014 +0200 console: better handing of console_timestamps as a boolean_param In order to handle all the old ways, change to use parse_bool(). Signed-off-by: Don Slutz Reviewed-by: Andrew Cooper Restructure code to limit churn. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/drivers/char/console.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2f6c090..2f03259 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -559,6 +559,15 @@ static int printk_prefix_check(char *p, char **pp) static void __init parse_console_timestamps(char *s) { + switch ( parse_bool(s) ) + { + case 0: + opt_con_timestamp_mode = TSM_NONE; + return; + case 1: + opt_con_timestamp_mode = TSM_DATE; + return; + } if ( *s == '\0' || /* Compat for old booleanparam() */ !strcmp(s, "date") ) opt_con_timestamp_mode = TSM_DATE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJX-00017M-8Y; Tue, 12 Aug 2014 19:00:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJV-000174-VZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:54 +0000 Received: from [85.158.143.35:61475] by server-2.bemta-4.messagelabs.com id 05/AA-04525-5646AE35; Tue, 12 Aug 2014 19:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1407870051!12563792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26181 invoked from network); 12 Aug 2014 19:00:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJT-0008V0-BY for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJT-0003Dp-A8 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:51 +0000 Date: Tue, 12 Aug 2014 19:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: extend LAPIC shortcuts around P2M lookups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd1863847af15c3676348447755e1a1801f9d394 Author: Jan Beulich AuthorDate: Mon Aug 4 13:46:03 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:46:03 2014 +0200 x86/HVM: extend LAPIC shortcuts around P2M lookups ... to all internally handled MMIO regions. It is in particular the HPET page that, e.g. on Windows Server 2012 R2, can get heavily accessed, and hence avoiding the unnecessary lookups is rather beneficial (in the reported case a 40+-vCPU guest would previously not have booted at all while with hvm_hap_nested_page_fault() shortcut alone it was able to boot up in 18 minutes [i.e. still room for improvement]). Note the apparently unrelated addition of a is_hvm_vcpu() check to the __hvm_copy() code: Afaict for PVH this shortcut should never have taken effect (since there's no LAPIC in that case). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 25 ++++++++++++++++++------- xen/arch/x86/hvm/intercept.c | 12 ++++++++++++ xen/include/asm-x86/hvm/io.h | 1 + 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e834406..31629e7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2779,11 +2779,14 @@ int hvm_hap_nested_page_fault(paddr_t gpa, } } - /* For the benefit of 32-bit WinXP (& older Windows) on AMD CPUs, - * a fast path for LAPIC accesses, skipping the p2m lookup. */ + /* + * No need to do the P2M lookup for internally handled MMIO, benefiting + * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, + * - newer Windows (like Server 2012) for HPET accesses. + */ if ( !nestedhvm_vcpu_in_guestmode(v) && is_hvm_vcpu(v) - && gfn == PFN_DOWN(vlapic_base_address(vcpu_vlapic(v))) ) + && hvm_mmio_internal(gpa) ) { if ( !handle_mmio() ) hvm_inject_hw_exception(TRAP_gp_fault, 0); @@ -3892,7 +3895,9 @@ static enum hvm_copy_result __hvm_copy( while ( todo > 0 ) { - count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); + paddr_t gpa = addr & ~PAGE_MASK; + + count = min_t(int, PAGE_SIZE - gpa, todo); if ( flags & HVMCOPY_virt ) { @@ -3907,16 +3912,22 @@ static enum hvm_copy_result __hvm_copy( hvm_inject_page_fault(pfec, addr); return HVMCOPY_bad_gva_to_gfn; } + gpa |= (paddr_t)gfn << PAGE_SHIFT; } else { gfn = addr >> PAGE_SHIFT; + gpa = addr; } - /* For the benefit of 32-bit WinXP (& older Windows) on AMD CPUs, - * a fast path for LAPIC accesses, skipping the p2m lookup. */ + /* + * No need to do the P2M lookup for internally handled MMIO, benefiting + * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, + * - newer Windows (like Server 2012) for HPET accesses. + */ if ( !nestedhvm_vcpu_in_guestmode(curr) - && gfn == PFN_DOWN(vlapic_base_address(vcpu_vlapic(curr))) ) + && is_hvm_vcpu(curr) + && hvm_mmio_internal(gpa) ) return HVMCOPY_bad_gfn_to_mfn; page = get_page_from_gfn(curr->domain, gfn, &p2mt, P2M_UNSHARE); diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 7cc13b5..797eedf 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -163,6 +163,18 @@ static int hvm_mmio_access(struct vcpu *v, return rc; } +bool_t hvm_mmio_internal(paddr_t gpa) +{ + struct vcpu *curr = current; + unsigned int i; + + for ( i = 0; i < HVM_MMIO_HANDLER_NR; ++i ) + if ( hvm_mmio_handlers[i]->check_handler(curr, gpa) ) + return 1; + + return 0; +} + int hvm_mmio_intercept(ioreq_t *p) { struct vcpu *v = current; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 8228ab8..c7ac566 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -91,6 +91,7 @@ static inline int hvm_buffered_io_intercept(ioreq_t *p) return hvm_io_intercept(p, HVM_BUFFERED_IO); } +bool_t hvm_mmio_internal(paddr_t gpa); int hvm_mmio_intercept(ioreq_t *p); int hvm_buffered_io_send(ioreq_t *p); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:00:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:00:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJX-00017M-8Y; Tue, 12 Aug 2014 19:00:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJV-000174-VZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:54 +0000 Received: from [85.158.143.35:61475] by server-2.bemta-4.messagelabs.com id 05/AA-04525-5646AE35; Tue, 12 Aug 2014 19:00:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1407870051!12563792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26181 invoked from network); 12 Aug 2014 19:00:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:00:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJT-0008V0-BY for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJT-0003Dp-A8 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:00:51 +0000 Date: Tue, 12 Aug 2014 19:00:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: extend LAPIC shortcuts around P2M lookups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd1863847af15c3676348447755e1a1801f9d394 Author: Jan Beulich AuthorDate: Mon Aug 4 13:46:03 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:46:03 2014 +0200 x86/HVM: extend LAPIC shortcuts around P2M lookups ... to all internally handled MMIO regions. It is in particular the HPET page that, e.g. on Windows Server 2012 R2, can get heavily accessed, and hence avoiding the unnecessary lookups is rather beneficial (in the reported case a 40+-vCPU guest would previously not have booted at all while with hvm_hap_nested_page_fault() shortcut alone it was able to boot up in 18 minutes [i.e. still room for improvement]). Note the apparently unrelated addition of a is_hvm_vcpu() check to the __hvm_copy() code: Afaict for PVH this shortcut should never have taken effect (since there's no LAPIC in that case). Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 25 ++++++++++++++++++------- xen/arch/x86/hvm/intercept.c | 12 ++++++++++++ xen/include/asm-x86/hvm/io.h | 1 + 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e834406..31629e7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2779,11 +2779,14 @@ int hvm_hap_nested_page_fault(paddr_t gpa, } } - /* For the benefit of 32-bit WinXP (& older Windows) on AMD CPUs, - * a fast path for LAPIC accesses, skipping the p2m lookup. */ + /* + * No need to do the P2M lookup for internally handled MMIO, benefiting + * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, + * - newer Windows (like Server 2012) for HPET accesses. + */ if ( !nestedhvm_vcpu_in_guestmode(v) && is_hvm_vcpu(v) - && gfn == PFN_DOWN(vlapic_base_address(vcpu_vlapic(v))) ) + && hvm_mmio_internal(gpa) ) { if ( !handle_mmio() ) hvm_inject_hw_exception(TRAP_gp_fault, 0); @@ -3892,7 +3895,9 @@ static enum hvm_copy_result __hvm_copy( while ( todo > 0 ) { - count = min_t(int, PAGE_SIZE - (addr & ~PAGE_MASK), todo); + paddr_t gpa = addr & ~PAGE_MASK; + + count = min_t(int, PAGE_SIZE - gpa, todo); if ( flags & HVMCOPY_virt ) { @@ -3907,16 +3912,22 @@ static enum hvm_copy_result __hvm_copy( hvm_inject_page_fault(pfec, addr); return HVMCOPY_bad_gva_to_gfn; } + gpa |= (paddr_t)gfn << PAGE_SHIFT; } else { gfn = addr >> PAGE_SHIFT; + gpa = addr; } - /* For the benefit of 32-bit WinXP (& older Windows) on AMD CPUs, - * a fast path for LAPIC accesses, skipping the p2m lookup. */ + /* + * No need to do the P2M lookup for internally handled MMIO, benefiting + * - 32-bit WinXP (& older Windows) on AMD CPUs for LAPIC accesses, + * - newer Windows (like Server 2012) for HPET accesses. + */ if ( !nestedhvm_vcpu_in_guestmode(curr) - && gfn == PFN_DOWN(vlapic_base_address(vcpu_vlapic(curr))) ) + && is_hvm_vcpu(curr) + && hvm_mmio_internal(gpa) ) return HVMCOPY_bad_gfn_to_mfn; page = get_page_from_gfn(curr->domain, gfn, &p2mt, P2M_UNSHARE); diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 7cc13b5..797eedf 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -163,6 +163,18 @@ static int hvm_mmio_access(struct vcpu *v, return rc; } +bool_t hvm_mmio_internal(paddr_t gpa) +{ + struct vcpu *curr = current; + unsigned int i; + + for ( i = 0; i < HVM_MMIO_HANDLER_NR; ++i ) + if ( hvm_mmio_handlers[i]->check_handler(curr, gpa) ) + return 1; + + return 0; +} + int hvm_mmio_intercept(ioreq_t *p) { struct vcpu *v = current; diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index 8228ab8..c7ac566 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -91,6 +91,7 @@ static inline int hvm_buffered_io_intercept(ioreq_t *p) return hvm_io_intercept(p, HVM_BUFFERED_IO); } +bool_t hvm_mmio_internal(paddr_t gpa); int hvm_mmio_intercept(ioreq_t *p); int hvm_buffered_io_send(ioreq_t *p); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJk-0001Af-CT; Tue, 12 Aug 2014 19:01:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJi-0001AD-V7 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:07 +0000 Content-Length: 2360 Received: from [193.109.254.147:2593] by server-6.bemta-14.messagelabs.com id E1/57-31278-2746AE35; Tue, 12 Aug 2014 19:01:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1407870064!12101095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31066 invoked from network); 12 Aug 2014 19:01:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJd-0008V9-KH for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJd-0003EQ-H9 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:01 +0000 Date: Tue, 12 Aug 2014 19:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix cpuid reporting on PVH Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7500540676909882822==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7500540676909882822== Content-Length: 1959 Content-Transfer-Encoding: quoted-printable commit 41220bb7d5946d3a693863d364a089e69b968ec7 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Aug 4 13:46:54 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:46:54 2014 +0200 x86: fix cpuid reporting on PVH Dom0 dab11417d also caused some problems regarding HVM guest creation on PVH Dom0, mainly the CR4 mask returned by hvm_cr4_guest_reserved_bits changed from 0xfffffffffffff800 to 0xfffffffffffff893, which means HVM guests created from a PVH Dom0 are unable to set VME, PVI, PSE or PGE CR4 flags. This is because cpuid on PVH guests mask PSE, PGE, PSE36 and VME flags, so the white listing done in xc_cpuid_hvm_policy doesn't enable those features, and the guest ends up with a very restrictive cpuid policy. Signed-off-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/traps.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 677074b..71be2ae 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -803,12 +803,16 @@ void pv_cpuid(struct cpu_user_regs *regs) if ( (regs->eax & 0x7fffffff) =3D=3D 0x00000001 ) { /* Modify Feature Information. */ - __clear_bit(X86_FEATURE_VME, &d); if ( !cpu_has_apic ) __clear_bit(X86_FEATURE_APIC, &d); - __clear_bit(X86_FEATURE_PSE, &d); - __clear_bit(X86_FEATURE_PGE, &d); - __clear_bit(X86_FEATURE_PSE36, &d); + + if ( !is_pvh_vcpu(curr) ) + { + __clear_bit(X86_FEATURE_PSE, &d); + __clear_bit(X86_FEATURE_PGE, &d); + __clear_bit(X86_FEATURE_PSE36, &d); + __clear_bit(X86_FEATURE_VME, &d); + } } switch ( (uint32_t)regs->eax ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7500540676909882822== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7500540676909882822==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJk-0001Af-CT; Tue, 12 Aug 2014 19:01:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJi-0001AD-V7 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:07 +0000 Content-Length: 2360 Received: from [193.109.254.147:2593] by server-6.bemta-14.messagelabs.com id E1/57-31278-2746AE35; Tue, 12 Aug 2014 19:01:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1407870064!12101095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31066 invoked from network); 12 Aug 2014 19:01:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJd-0008V9-KH for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJd-0003EQ-H9 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:01 +0000 Date: Tue, 12 Aug 2014 19:01:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix cpuid reporting on PVH Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7500540676909882822==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7500540676909882822== Content-Length: 1959 Content-Transfer-Encoding: quoted-printable commit 41220bb7d5946d3a693863d364a089e69b968ec7 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Aug 4 13:46:54 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 4 13:46:54 2014 +0200 x86: fix cpuid reporting on PVH Dom0 dab11417d also caused some problems regarding HVM guest creation on PVH Dom0, mainly the CR4 mask returned by hvm_cr4_guest_reserved_bits changed from 0xfffffffffffff800 to 0xfffffffffffff893, which means HVM guests created from a PVH Dom0 are unable to set VME, PVI, PSE or PGE CR4 flags. This is because cpuid on PVH guests mask PSE, PGE, PSE36 and VME flags, so the white listing done in xc_cpuid_hvm_policy doesn't enable those features, and the guest ends up with a very restrictive cpuid policy. Signed-off-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/traps.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 677074b..71be2ae 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -803,12 +803,16 @@ void pv_cpuid(struct cpu_user_regs *regs) if ( (regs->eax & 0x7fffffff) =3D=3D 0x00000001 ) { /* Modify Feature Information. */ - __clear_bit(X86_FEATURE_VME, &d); if ( !cpu_has_apic ) __clear_bit(X86_FEATURE_APIC, &d); - __clear_bit(X86_FEATURE_PSE, &d); - __clear_bit(X86_FEATURE_PGE, &d); - __clear_bit(X86_FEATURE_PSE36, &d); + + if ( !is_pvh_vcpu(curr) ) + { + __clear_bit(X86_FEATURE_PSE, &d); + __clear_bit(X86_FEATURE_PGE, &d); + __clear_bit(X86_FEATURE_PSE36, &d); + __clear_bit(X86_FEATURE_VME, &d); + } } switch ( (uint32_t)regs->eax ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7500540676909882822== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7500540676909882822==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJu-0001Cv-Fb; Tue, 12 Aug 2014 19:01:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJs-0001Cb-TE for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:17 +0000 Received: from [85.158.139.211:13363] by server-8.bemta-5.messagelabs.com id DB/D3-22440-C746AE35; Tue, 12 Aug 2014 19:01:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1407870074!5652698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13383 invoked from network); 12 Aug 2014 19:01:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJq-0008Vk-MV for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJq-0003FO-Ku for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:14 +0000 Date: Tue, 12 Aug 2014 19:01:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correct comment in arm32 head.S X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47087e8d067b0f7f72128d02e37bbf1dcfc8b843 Author: Ian Campbell AuthorDate: Fri Jul 25 10:32:12 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 13:58:35 2014 +0100 xen: arm: Correct comment in arm32 head.S Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index ec57974..16d76f4 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -378,7 +378,7 @@ paging: 1: /* Map fixmap into boot_second */ - ldr r1, =boot_second /* r1 := vaddr (xen_fixmap) */ + ldr r1, =boot_second /* r1 := vaddr (boot_second) */ ldr r2, =xen_fixmap add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ orr r2, r2, #PT_UPPER(PT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJu-0001Cv-Fb; Tue, 12 Aug 2014 19:01:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJs-0001Cb-TE for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:17 +0000 Received: from [85.158.139.211:13363] by server-8.bemta-5.messagelabs.com id DB/D3-22440-C746AE35; Tue, 12 Aug 2014 19:01:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1407870074!5652698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13383 invoked from network); 12 Aug 2014 19:01:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHJq-0008Vk-MV for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHJq-0003FO-Ku for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:14 +0000 Date: Tue, 12 Aug 2014 19:01:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correct comment in arm32 head.S X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47087e8d067b0f7f72128d02e37bbf1dcfc8b843 Author: Ian Campbell AuthorDate: Fri Jul 25 10:32:12 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 13:58:35 2014 +0100 xen: arm: Correct comment in arm32 head.S Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm32/head.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index ec57974..16d76f4 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -378,7 +378,7 @@ paging: 1: /* Map fixmap into boot_second */ - ldr r1, =boot_second /* r1 := vaddr (xen_fixmap) */ + ldr r1, =boot_second /* r1 := vaddr (boot_second) */ ldr r2, =xen_fixmap add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ orr r2, r2, #PT_UPPER(PT) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHK4-0001Ez-IM; Tue, 12 Aug 2014 19:01:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHK3-0001Ee-4x for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:27 +0000 Received: from [85.158.139.211:13988] by server-2.bemta-5.messagelabs.com id 24/3F-31832-6846AE35; Tue, 12 Aug 2014 19:01:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1407870085!10967665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24130 invoked from network); 12 Aug 2014 19:01:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHK0-0008Vq-Sj for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHK0-0003Fo-QZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:24 +0000 Date: Tue, 12 Aug 2014 19:01:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Write to the correct PT when mapping the DTB on boot on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 159e504e77bdf683779b898b881584f34aedb46a Author: Ian Campbell AuthorDate: Fri Jul 25 10:32:06 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 14:00:45 2014 +0100 xen: arm: Write to the correct PT when mapping the DTB on boot on arm64 We currently get away with this because when debug=y and earlyprintk is enabled the previous block of (conditional) code would have set this up. Historically we mostly got away with it even without those options because the pre paging code would normally (at least on h/w we test) leave x4 set to the paddr of boot_second. This latent bug has always been present but was exposed by ca59618967fe "xen: arm: Handle 4K aligned hypervisor load address" (or one of the related patches) since now x4 is quite likely to point to boot_third not boot_second. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/head.S | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index dcb7071..43b5e72 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -428,6 +428,7 @@ paging: /* Map the DTB in the boot misc slot */ cbnz x22, 1f /* Only on boot CPU */ + ldr x4, =boot_second /* x4 := vaddr (boot_second) */ lsr x2, x21, #SECOND_SHIFT lsl x2, x2, #SECOND_SHIFT /* x2 := 2MB-aligned paddr of DTB */ mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHK4-0001Ez-IM; Tue, 12 Aug 2014 19:01:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHK3-0001Ee-4x for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:27 +0000 Received: from [85.158.139.211:13988] by server-2.bemta-5.messagelabs.com id 24/3F-31832-6846AE35; Tue, 12 Aug 2014 19:01:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1407870085!10967665!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24130 invoked from network); 12 Aug 2014 19:01:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHK0-0008Vq-Sj for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHK0-0003Fo-QZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:24 +0000 Date: Tue, 12 Aug 2014 19:01:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Write to the correct PT when mapping the DTB on boot on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 159e504e77bdf683779b898b881584f34aedb46a Author: Ian Campbell AuthorDate: Fri Jul 25 10:32:06 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 14:00:45 2014 +0100 xen: arm: Write to the correct PT when mapping the DTB on boot on arm64 We currently get away with this because when debug=y and earlyprintk is enabled the previous block of (conditional) code would have set this up. Historically we mostly got away with it even without those options because the pre paging code would normally (at least on h/w we test) leave x4 set to the paddr of boot_second. This latent bug has always been present but was exposed by ca59618967fe "xen: arm: Handle 4K aligned hypervisor load address" (or one of the related patches) since now x4 is quite likely to point to boot_third not boot_second. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/arm64/head.S | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index dcb7071..43b5e72 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -428,6 +428,7 @@ paging: /* Map the DTB in the boot misc slot */ cbnz x22, 1f /* Only on boot CPU */ + ldr x4, =boot_second /* x4 := vaddr (boot_second) */ lsr x2, x21, #SECOND_SHIFT lsl x2, x2, #SECOND_SHIFT /* x2 := 2MB-aligned paddr of DTB */ mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKF-0001HS-P6; Tue, 12 Aug 2014 19:01:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKD-0001H1-QD for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:37 +0000 Content-Length: 4496 Received: from [85.158.137.68:25502] by server-7.bemta-3.messagelabs.com id 04/E0-01084-1946AE35; Tue, 12 Aug 2014 19:01:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1407870095!13225142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23119 invoked from network); 12 Aug 2014 19:01:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKB-0008Vy-2I for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKB-0003GM-0d for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:35 +0000 Date: Tue, 12 Aug 2014 19:01:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: expand cpuid features exposed to PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5655270493506400426==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5655270493506400426== Content-Length: 4148 Content-Transfer-Encoding: quoted-printable commit 807999107bbf6401f37b550c7d156e13765e0f5b Author: Roger Pau Monne AuthorDate: Wed Jul 23 17:59:48 2014 +0200 Commit: Ian Campbell CommitDate: Mon Aug 4 14:17:07 2014 +0100 libxc: expand cpuid features exposed to PVH guests Expand the cpuid features exposed to PVH guests, this includes exposing PSE, PGE and 1GB pages (which will be masked by the hypervisor if not supported by the hardware). Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Cc: Ian Jackson Cc: Ian Campbell Cc: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_cpuid_x86.c | 14 +++++++++----- tools/libxc/xc_domain.c | 1 + tools/libxc/xenctrl.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 8acb9fb..6b81641 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -21,6 +21,7 @@ */ #include +#include #include "xc_private.h" #include "xc_cpufeature.h" #include @@ -437,7 +438,7 @@ static void xc_cpuid_hvm_policy( static void xc_cpuid_pv_policy( xc_interface *xch, domid_t domid, - const unsigned int *input, unsigned int *regs) + const unsigned int *input, unsigned int *regs, bool pvh) { DECLARE_DOMCTL; unsigned int guest_width; @@ -460,8 +461,10 @@ static void xc_cpuid_pv_policy( if ( (input[0] & 0x7fffffff) =3D=3D 0x00000001 ) { clear_bit(X86_FEATURE_VME, regs[3]); - clear_bit(X86_FEATURE_PSE, regs[3]); - clear_bit(X86_FEATURE_PGE, regs[3]); + if ( !pvh ) { + clear_bit(X86_FEATURE_PSE, regs[3]); + clear_bit(X86_FEATURE_PGE, regs[3]); + } clear_bit(X86_FEATURE_MCE, regs[3]); clear_bit(X86_FEATURE_MCA, regs[3]); clear_bit(X86_FEATURE_MTRR, regs[3]); @@ -530,7 +533,8 @@ static void xc_cpuid_pv_policy( { set_bit(X86_FEATURE_SYSCALL, regs[3]); } - clear_bit(X86_FEATURE_PAGE1GB, regs[3]); + if ( !pvh ) + clear_bit(X86_FEATURE_PAGE1GB, regs[3]); clear_bit(X86_FEATURE_RDTSCP, regs[3]); clear_bit(X86_FEATURE_SVM, regs[2]); @@ -578,7 +582,7 @@ static int xc_cpuid_policy( if ( info.hvm ) xc_cpuid_hvm_policy(xch, domid, input, regs); else - xc_cpuid_pv_policy(xch, domid, input, regs); + xc_cpuid_pv_policy(xch, domid, input, regs, info.pvh); return 0; } diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 0230c6c..c67ac9a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -348,6 +348,7 @@ int xc_domain_getinfo(xc_interface *xch, info->running =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_running); info->hvm =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_hvm_guest); info->debugged =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_debugged); + info->pvh =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_pvh_guest); info->shutdown_reason =3D (domctl.u.getdomaininfo.flags>>XEN_DOMINF_shutdownshift) & diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 5beb846..1c5d0db 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -432,7 +432,7 @@ typedef struct xc_dominfo { uint32_t ssidref; unsigned int dying:1, crashed:1, shutdown:1, paused:1, blocked:1, running:1, - hvm:1, debugged:1; + hvm:1, debugged:1, pvh:1; unsigned int shutdown_reason; /* only meaningful if shutdown=3D=3D1 */ unsigned long nr_pages; /* current number, not maximum */ unsigned long nr_outstanding_pages; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5655270493506400426== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5655270493506400426==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKF-0001HS-P6; Tue, 12 Aug 2014 19:01:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKD-0001H1-QD for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:37 +0000 Content-Length: 4496 Received: from [85.158.137.68:25502] by server-7.bemta-3.messagelabs.com id 04/E0-01084-1946AE35; Tue, 12 Aug 2014 19:01:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1407870095!13225142!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23119 invoked from network); 12 Aug 2014 19:01:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKB-0008Vy-2I for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKB-0003GM-0d for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:35 +0000 Date: Tue, 12 Aug 2014 19:01:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: expand cpuid features exposed to PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5655270493506400426==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5655270493506400426== Content-Length: 4148 Content-Transfer-Encoding: quoted-printable commit 807999107bbf6401f37b550c7d156e13765e0f5b Author: Roger Pau Monne AuthorDate: Wed Jul 23 17:59:48 2014 +0200 Commit: Ian Campbell CommitDate: Mon Aug 4 14:17:07 2014 +0100 libxc: expand cpuid features exposed to PVH guests Expand the cpuid features exposed to PVH guests, this includes exposing PSE, PGE and 1GB pages (which will be masked by the hypervisor if not supported by the hardware). Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Cc: Ian Jackson Cc: Ian Campbell Cc: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_cpuid_x86.c | 14 +++++++++----- tools/libxc/xc_domain.c | 1 + tools/libxc/xenctrl.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 8acb9fb..6b81641 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -21,6 +21,7 @@ */ #include +#include #include "xc_private.h" #include "xc_cpufeature.h" #include @@ -437,7 +438,7 @@ static void xc_cpuid_hvm_policy( static void xc_cpuid_pv_policy( xc_interface *xch, domid_t domid, - const unsigned int *input, unsigned int *regs) + const unsigned int *input, unsigned int *regs, bool pvh) { DECLARE_DOMCTL; unsigned int guest_width; @@ -460,8 +461,10 @@ static void xc_cpuid_pv_policy( if ( (input[0] & 0x7fffffff) =3D=3D 0x00000001 ) { clear_bit(X86_FEATURE_VME, regs[3]); - clear_bit(X86_FEATURE_PSE, regs[3]); - clear_bit(X86_FEATURE_PGE, regs[3]); + if ( !pvh ) { + clear_bit(X86_FEATURE_PSE, regs[3]); + clear_bit(X86_FEATURE_PGE, regs[3]); + } clear_bit(X86_FEATURE_MCE, regs[3]); clear_bit(X86_FEATURE_MCA, regs[3]); clear_bit(X86_FEATURE_MTRR, regs[3]); @@ -530,7 +533,8 @@ static void xc_cpuid_pv_policy( { set_bit(X86_FEATURE_SYSCALL, regs[3]); } - clear_bit(X86_FEATURE_PAGE1GB, regs[3]); + if ( !pvh ) + clear_bit(X86_FEATURE_PAGE1GB, regs[3]); clear_bit(X86_FEATURE_RDTSCP, regs[3]); clear_bit(X86_FEATURE_SVM, regs[2]); @@ -578,7 +582,7 @@ static int xc_cpuid_policy( if ( info.hvm ) xc_cpuid_hvm_policy(xch, domid, input, regs); else - xc_cpuid_pv_policy(xch, domid, input, regs); + xc_cpuid_pv_policy(xch, domid, input, regs, info.pvh); return 0; } diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 0230c6c..c67ac9a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -348,6 +348,7 @@ int xc_domain_getinfo(xc_interface *xch, info->running =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_running); info->hvm =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_hvm_guest); info->debugged =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_debugged); + info->pvh =3D !!(domctl.u.getdomaininfo.flags&XEN_DOMINF_pvh_guest); info->shutdown_reason =3D (domctl.u.getdomaininfo.flags>>XEN_DOMINF_shutdownshift) & diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 5beb846..1c5d0db 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -432,7 +432,7 @@ typedef struct xc_dominfo { uint32_t ssidref; unsigned int dying:1, crashed:1, shutdown:1, paused:1, blocked:1, running:1, - hvm:1, debugged:1; + hvm:1, debugged:1, pvh:1; unsigned int shutdown_reason; /* only meaningful if shutdown=3D=3D1 */ unsigned long nr_pages; /* current number, not maximum */ unsigned long nr_outstanding_pages; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5655270493506400426== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5655270493506400426==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKP-0001JW-Tc; Tue, 12 Aug 2014 19:01:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKO-0001JC-It for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:48 +0000 Received: from [85.158.139.211:15155] by server-16.bemta-5.messagelabs.com id 7B/5E-01029-B946AE35; Tue, 12 Aug 2014 19:01:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1407870105!8069282!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8431 invoked from network); 12 Aug 2014 19:01:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKL-0008W4-7g for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKL-0003Gi-60 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:45 +0000 Date: Tue, 12 Aug 2014 19:01:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xencommons: move module list into a generic place X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fafbc2926c3ef2c9270fc765a4b3c36d868651a5 Author: Luis R. Rodriguez AuthorDate: Wed Jul 30 09:40:01 2014 -0700 Commit: Ian Campbell CommitDate: Mon Aug 4 14:58:23 2014 +0100 xencommons: move module list into a generic place This will allow us to share the same module list with systemd, and lets us upkeep it in one place. Document this while at it on the top level README and expand on the wiki: http://wiki.xen.org/wiki/Category:Host_Configuration#Kernel_modules In order to upkeep parallelism builds be explicit about the requirement to complete all actions before any installation targets. Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- README | 12 ++ config/Linux.modules | 20 ++++ tools/hotplug/Linux/Makefile | 14 ++- tools/hotplug/Linux/init.d/xencommons | 167 ------------------------------ tools/hotplug/Linux/init.d/xencommons.in | 153 +++++++++++++++++++++++++++ tools/hotplug/Linux/update-modules.sh | 36 +++++++ 6 files changed, 231 insertions(+), 171 deletions(-) diff --git a/README b/README index 9bbe734..0c8c7aa 100644 --- a/README +++ b/README @@ -183,3 +183,15 @@ There are optional targets as part of Xen's top-level makefile that will download and build tboot: install-tboot, build-tboot, dist-tboot, clean-tboot. These will download the latest tar file from the SourceForge site using wget, then build/install/dist according to Xen's settings. + +Required Kernel modules +====================== + +Xen has a set of Kernel modules which the init scripts ensure to load before +before starting Xen guests. The list of modules are maintained in one place: + + * config/$(XEN_OS).modules + +For more details refer to: + +http://wiki.xen.org/wiki/Category:Host_Configuration#Kernel_modules diff --git a/config/Linux.modules b/config/Linux.modules new file mode 100644 index 0000000..8a764df --- /dev/null +++ b/config/Linux.modules @@ -0,0 +1,20 @@ +# The file supports a simple language, comments are ignored, and if you there +# are module replacements this can be listed by using a pipe to show preference +# for the first module, followed by the older module. + +xen-evtchn +xen-gntdev +xen-gntalloc +xen-blkback +xen-netback +xen-pciback +evtchn +gntdev +netbk +blkbk +xen-scsibk +usbbk +pciback +xen-acpi-processor +# Prefer to load blktap2 if found, otherwise load blktap +blktap2|blktap diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index d5de9e6..3d2d344 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -33,17 +33,23 @@ UDEV_RULES_DIR = $(CONFIG_DIR)/udev UDEV_RULES = xen-backend.rules $(UDEV_RULES-y) .PHONY: all -all: +all: $(XENCOMMONS_INITD) + +$(XENCOMMONS_INITD): $(XEN_ROOT)/config/$(XEN_OS).modules $(XENCOMMONS_INITD).in + $(XEN_ROOT)/tools/hotplug/Linux/update-modules.sh \ + $(XEN_ROOT) \ + $(XEN_OS) \ + $(XENCOMMONS_INITD) > $@ .PHONY: build -build: +build: all .PHONY: install install: all install-initd install-scripts install-udev # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd -install-initd: +install-initd: all [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) [ -d $(DESTDIR)$(LIBEXEC) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC) @@ -55,7 +61,7 @@ install-initd: $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR) .PHONY: install-scripts -install-scripts: +install-scripts: all [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \ $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons deleted file mode 100644 index 4ebd636..0000000 --- a/tools/hotplug/Linux/init.d/xencommons +++ /dev/null @@ -1,167 +0,0 @@ -#!/bin/bash -# -# xencommons Script to start and stop xenstored and xenconsoled -# -# Author: Ian Jackson -# -# chkconfig: 2345 70 10 -# description: Starts and stops xenstored and xenconsoled -### BEGIN INIT INFO -# Provides: xenstored xenconsoled -# Required-Start: $syslog $remote_fs -# Should-Start: -# Required-Stop: $syslog $remote_fs -# Should-Stop: -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/stop xenstored and xenconsoled -# Description: Starts and stops the daemons neeeded for xl/xend -### END INIT INFO - -. /etc/xen/scripts/hotplugpath.sh - -if [ -d /etc/sysconfig ]; then - xencommons_config=/etc/sysconfig -else - xencommons_config=/etc/default -fi - -test -f $xencommons_config/xencommons && . $xencommons_config/xencommons - -XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid -QEMU_PIDFILE=/var/run/qemu-dom0.pid -shopt -s extglob - -# not running in Xen dom0 or domU -if ! test -d /proc/xen ; then - exit 0 -fi - -# mount xenfs in dom0 or domU with a pv_ops kernel -if test "x$1" = xstart && \ - ! test -f /proc/xen/capabilities && \ - ! grep '^xenfs ' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen -fi - -# run this script only in dom0: -# no capabilities file in xenlinux domU kernel -# empty capabilities file in pv_ops domU kernel -if test -f /proc/xen/capabilities && \ - ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 -fi - -do_start () { - local time=0 - local timeout=30 - - modprobe xen-evtchn 2>/dev/null - modprobe xen-gntdev 2>/dev/null - modprobe xen-gntalloc 2>/dev/null - modprobe xen-blkback 2>/dev/null - modprobe xen-netback 2>/dev/null - modprobe xen-pciback 2>/dev/null - modprobe evtchn 2>/dev/null - modprobe gntdev 2>/dev/null - modprobe netbk 2>/dev/null - modprobe blkbk 2>/dev/null - modprobe xen-scsibk 2>/dev/null - modprobe usbbk 2>/dev/null - modprobe pciback 2>/dev/null - modprobe xen-acpi-processor 2>/dev/null - modprobe blktap2 2>/dev/null || modprobe blktap 2>/dev/null - mkdir -p /var/run/xen - - if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` - then - test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" - rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null - test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" - - if [ -n "$XENSTORED" ] ; then - echo -n Starting $XENSTORED... - $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/oxenstored ] ; then - echo -n Starting oxenstored... - ${SBINDIR}/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/xenstored ] ; then - echo -n Starting C xenstored... - ${SBINDIR}/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - else - echo "No xenstored found" - exit 1 - fi - - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do - echo -n . - time=$(($time+1)) - sleep 1 - done - echo - - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo Could not start xenstored - exit 1 - fi - - echo Setting domain 0 name and domid... - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 - fi - - echo Starting xenconsoled... - test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS - echo Starting QEMU as disk backend for dom0 - test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" - $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ - -monitor /dev/null -serial /dev/null -parallel /dev/null \ - -pidfile $QEMU_PIDFILE -} -do_stop () { - echo Stopping xenconsoled - if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $XENCONSOLED_PIDFILE - fi - - echo Stopping QEMU - if read 2>/dev/null <$QEMU_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $QEMU_PIDFILE - fi - - echo WARNING: Not stopping xenstored, as it cannot be restarted. -} - -case "$1" in - start) - do_start - ;; - status) - ${BINDIR}/xenstore-read -s / - ;; - stop) - do_stop - ;; - reload) - echo >&2 'Reload not available; use force-reload'; exit 1 - ;; - force-reload|restart) - do_stop - do_start - ;; - *) - # do not advertise unreasonable commands that there is no reason - # to use with this device - echo $"Usage: $0 {start|stop|status|restart|force-reload}" - exit 1 -esac - -exit $? diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in new file mode 100644 index 0000000..3939bcc --- /dev/null +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -0,0 +1,153 @@ +#!/bin/bash +# +# xencommons Script to start and stop xenstored and xenconsoled +# +# Author: Ian Jackson +# +# chkconfig: 2345 70 10 +# description: Starts and stops xenstored and xenconsoled +### BEGIN INIT INFO +# Provides: xenstored xenconsoled +# Required-Start: $syslog $remote_fs +# Should-Start: +# Required-Stop: $syslog $remote_fs +# Should-Stop: +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop xenstored and xenconsoled +# Description: Starts and stops the daemons neeeded for xl/xend +### END INIT INFO + +. /etc/xen/scripts/hotplugpath.sh + +if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig +else + xencommons_config=/etc/default +fi + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid +QEMU_PIDFILE=/var/run/qemu-dom0.pid +shopt -s extglob + +# not running in Xen dom0 or domU +if ! test -d /proc/xen ; then + exit 0 +fi + +# mount xenfs in dom0 or domU with a pv_ops kernel +if test "x$1" = xstart && \ + ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; +then + mount -t xenfs xenfs /proc/xen +fi + +# run this script only in dom0: +# no capabilities file in xenlinux domU kernel +# empty capabilities file in pv_ops domU kernel +if test -f /proc/xen/capabilities && \ + ! grep -q "control_d" /proc/xen/capabilities ; then + exit 0 +fi + +do_start () { + local time=0 + local timeout=30 + + @LOAD_MODULES@ + mkdir -p /var/run/xen + + if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` + then + test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" + + if [ -n "$XENSTORED" ] ; then + echo -n Starting $XENSTORED... + $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + elif [ -x ${SBINDIR}/oxenstored ] ; then + echo -n Starting oxenstored... + ${SBINDIR}/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + elif [ -x ${SBINDIR}/xenstored ] ; then + echo -n Starting C xenstored... + ${SBINDIR}/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + else + echo "No xenstored found" + exit 1 + fi + + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + echo -n . + time=$(($time+1)) + sleep 1 + done + echo + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo Could not start xenstored + exit 1 + fi + + echo Setting domain 0 name and domid... + ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + fi + + echo Starting xenconsoled... + test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" + ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + echo Starting QEMU as disk backend for dom0 + test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" + $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile $QEMU_PIDFILE +} +do_stop () { + echo Stopping xenconsoled + if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $XENCONSOLED_PIDFILE + fi + + echo Stopping QEMU + if read 2>/dev/null <$QEMU_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $QEMU_PIDFILE + fi + + echo WARNING: Not stopping xenstored, as it cannot be restarted. +} + +case "$1" in + start) + do_start + ;; + status) + ${BINDIR}/xenstore-read -s / + ;; + stop) + do_stop + ;; + reload) + echo >&2 'Reload not available; use force-reload'; exit 1 + ;; + force-reload|restart) + do_stop + do_start + ;; + *) + # do not advertise unreasonable commands that there is no reason + # to use with this device + echo $"Usage: $0 {start|stop|status|restart|force-reload}" + exit 1 +esac + +exit $? diff --git a/tools/hotplug/Linux/update-modules.sh b/tools/hotplug/Linux/update-modules.sh new file mode 100755 index 0000000..692d220 --- /dev/null +++ b/tools/hotplug/Linux/update-modules.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -e + +IFS='' + +XEN_ROOT=$1 +XEN_OS=$2 +XENCOMMONS_INITD=$3 + +cat $XEN_ROOT/config/${XEN_OS}.modules | ( + while read l ; do + if echo $l | egrep -q "^#" ; then + continue + fi + if echo "$l" | egrep -q "\|" ; then + m1=${l%%|*} + m2=${l#*|} + echo " modprobe $m1 2>/dev/null || modprobe $m2 2>/dev/null" + else + echo " modprobe $l 2>/dev/null" + fi + done +) > ${XENCOMMONS_INITD}.modules + +cat ${XENCOMMONS_INITD}.in | ( + while read l ; do + if echo "$l" | egrep -q "@LOAD_MODULES@" ; then + cat ${XENCOMMONS_INITD}.modules + else + echo $l + fi + done +) + +rm -f ${XENCOMMONS_INITD}.modules -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:01:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:01:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKP-0001JW-Tc; Tue, 12 Aug 2014 19:01:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKO-0001JC-It for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:48 +0000 Received: from [85.158.139.211:15155] by server-16.bemta-5.messagelabs.com id 7B/5E-01029-B946AE35; Tue, 12 Aug 2014 19:01:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1407870105!8069282!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8431 invoked from network); 12 Aug 2014 19:01:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKL-0008W4-7g for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKL-0003Gi-60 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:45 +0000 Date: Tue, 12 Aug 2014 19:01:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xencommons: move module list into a generic place X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fafbc2926c3ef2c9270fc765a4b3c36d868651a5 Author: Luis R. Rodriguez AuthorDate: Wed Jul 30 09:40:01 2014 -0700 Commit: Ian Campbell CommitDate: Mon Aug 4 14:58:23 2014 +0100 xencommons: move module list into a generic place This will allow us to share the same module list with systemd, and lets us upkeep it in one place. Document this while at it on the top level README and expand on the wiki: http://wiki.xen.org/wiki/Category:Host_Configuration#Kernel_modules In order to upkeep parallelism builds be explicit about the requirement to complete all actions before any installation targets. Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell --- README | 12 ++ config/Linux.modules | 20 ++++ tools/hotplug/Linux/Makefile | 14 ++- tools/hotplug/Linux/init.d/xencommons | 167 ------------------------------ tools/hotplug/Linux/init.d/xencommons.in | 153 +++++++++++++++++++++++++++ tools/hotplug/Linux/update-modules.sh | 36 +++++++ 6 files changed, 231 insertions(+), 171 deletions(-) diff --git a/README b/README index 9bbe734..0c8c7aa 100644 --- a/README +++ b/README @@ -183,3 +183,15 @@ There are optional targets as part of Xen's top-level makefile that will download and build tboot: install-tboot, build-tboot, dist-tboot, clean-tboot. These will download the latest tar file from the SourceForge site using wget, then build/install/dist according to Xen's settings. + +Required Kernel modules +====================== + +Xen has a set of Kernel modules which the init scripts ensure to load before +before starting Xen guests. The list of modules are maintained in one place: + + * config/$(XEN_OS).modules + +For more details refer to: + +http://wiki.xen.org/wiki/Category:Host_Configuration#Kernel_modules diff --git a/config/Linux.modules b/config/Linux.modules new file mode 100644 index 0000000..8a764df --- /dev/null +++ b/config/Linux.modules @@ -0,0 +1,20 @@ +# The file supports a simple language, comments are ignored, and if you there +# are module replacements this can be listed by using a pipe to show preference +# for the first module, followed by the older module. + +xen-evtchn +xen-gntdev +xen-gntalloc +xen-blkback +xen-netback +xen-pciback +evtchn +gntdev +netbk +blkbk +xen-scsibk +usbbk +pciback +xen-acpi-processor +# Prefer to load blktap2 if found, otherwise load blktap +blktap2|blktap diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index d5de9e6..3d2d344 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -33,17 +33,23 @@ UDEV_RULES_DIR = $(CONFIG_DIR)/udev UDEV_RULES = xen-backend.rules $(UDEV_RULES-y) .PHONY: all -all: +all: $(XENCOMMONS_INITD) + +$(XENCOMMONS_INITD): $(XEN_ROOT)/config/$(XEN_OS).modules $(XENCOMMONS_INITD).in + $(XEN_ROOT)/tools/hotplug/Linux/update-modules.sh \ + $(XEN_ROOT) \ + $(XEN_OS) \ + $(XENCOMMONS_INITD) > $@ .PHONY: build -build: +build: all .PHONY: install install: all install-initd install-scripts install-udev # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd -install-initd: +install-initd: all [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) [ -d $(DESTDIR)$(LIBEXEC) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC) @@ -55,7 +61,7 @@ install-initd: $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR) .PHONY: install-scripts -install-scripts: +install-scripts: all [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \ $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons deleted file mode 100644 index 4ebd636..0000000 --- a/tools/hotplug/Linux/init.d/xencommons +++ /dev/null @@ -1,167 +0,0 @@ -#!/bin/bash -# -# xencommons Script to start and stop xenstored and xenconsoled -# -# Author: Ian Jackson -# -# chkconfig: 2345 70 10 -# description: Starts and stops xenstored and xenconsoled -### BEGIN INIT INFO -# Provides: xenstored xenconsoled -# Required-Start: $syslog $remote_fs -# Should-Start: -# Required-Stop: $syslog $remote_fs -# Should-Stop: -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/stop xenstored and xenconsoled -# Description: Starts and stops the daemons neeeded for xl/xend -### END INIT INFO - -. /etc/xen/scripts/hotplugpath.sh - -if [ -d /etc/sysconfig ]; then - xencommons_config=/etc/sysconfig -else - xencommons_config=/etc/default -fi - -test -f $xencommons_config/xencommons && . $xencommons_config/xencommons - -XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid -QEMU_PIDFILE=/var/run/qemu-dom0.pid -shopt -s extglob - -# not running in Xen dom0 or domU -if ! test -d /proc/xen ; then - exit 0 -fi - -# mount xenfs in dom0 or domU with a pv_ops kernel -if test "x$1" = xstart && \ - ! test -f /proc/xen/capabilities && \ - ! grep '^xenfs ' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen -fi - -# run this script only in dom0: -# no capabilities file in xenlinux domU kernel -# empty capabilities file in pv_ops domU kernel -if test -f /proc/xen/capabilities && \ - ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 -fi - -do_start () { - local time=0 - local timeout=30 - - modprobe xen-evtchn 2>/dev/null - modprobe xen-gntdev 2>/dev/null - modprobe xen-gntalloc 2>/dev/null - modprobe xen-blkback 2>/dev/null - modprobe xen-netback 2>/dev/null - modprobe xen-pciback 2>/dev/null - modprobe evtchn 2>/dev/null - modprobe gntdev 2>/dev/null - modprobe netbk 2>/dev/null - modprobe blkbk 2>/dev/null - modprobe xen-scsibk 2>/dev/null - modprobe usbbk 2>/dev/null - modprobe pciback 2>/dev/null - modprobe xen-acpi-processor 2>/dev/null - modprobe blktap2 2>/dev/null || modprobe blktap 2>/dev/null - mkdir -p /var/run/xen - - if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` - then - test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" - rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null - test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" - - if [ -n "$XENSTORED" ] ; then - echo -n Starting $XENSTORED... - $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/oxenstored ] ; then - echo -n Starting oxenstored... - ${SBINDIR}/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/xenstored ] ; then - echo -n Starting C xenstored... - ${SBINDIR}/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - else - echo "No xenstored found" - exit 1 - fi - - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do - echo -n . - time=$(($time+1)) - sleep 1 - done - echo - - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo Could not start xenstored - exit 1 - fi - - echo Setting domain 0 name and domid... - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 - fi - - echo Starting xenconsoled... - test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS - echo Starting QEMU as disk backend for dom0 - test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" - $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ - -monitor /dev/null -serial /dev/null -parallel /dev/null \ - -pidfile $QEMU_PIDFILE -} -do_stop () { - echo Stopping xenconsoled - if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $XENCONSOLED_PIDFILE - fi - - echo Stopping QEMU - if read 2>/dev/null <$QEMU_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $QEMU_PIDFILE - fi - - echo WARNING: Not stopping xenstored, as it cannot be restarted. -} - -case "$1" in - start) - do_start - ;; - status) - ${BINDIR}/xenstore-read -s / - ;; - stop) - do_stop - ;; - reload) - echo >&2 'Reload not available; use force-reload'; exit 1 - ;; - force-reload|restart) - do_stop - do_start - ;; - *) - # do not advertise unreasonable commands that there is no reason - # to use with this device - echo $"Usage: $0 {start|stop|status|restart|force-reload}" - exit 1 -esac - -exit $? diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in new file mode 100644 index 0000000..3939bcc --- /dev/null +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -0,0 +1,153 @@ +#!/bin/bash +# +# xencommons Script to start and stop xenstored and xenconsoled +# +# Author: Ian Jackson +# +# chkconfig: 2345 70 10 +# description: Starts and stops xenstored and xenconsoled +### BEGIN INIT INFO +# Provides: xenstored xenconsoled +# Required-Start: $syslog $remote_fs +# Should-Start: +# Required-Stop: $syslog $remote_fs +# Should-Stop: +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop xenstored and xenconsoled +# Description: Starts and stops the daemons neeeded for xl/xend +### END INIT INFO + +. /etc/xen/scripts/hotplugpath.sh + +if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig +else + xencommons_config=/etc/default +fi + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid +QEMU_PIDFILE=/var/run/qemu-dom0.pid +shopt -s extglob + +# not running in Xen dom0 or domU +if ! test -d /proc/xen ; then + exit 0 +fi + +# mount xenfs in dom0 or domU with a pv_ops kernel +if test "x$1" = xstart && \ + ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; +then + mount -t xenfs xenfs /proc/xen +fi + +# run this script only in dom0: +# no capabilities file in xenlinux domU kernel +# empty capabilities file in pv_ops domU kernel +if test -f /proc/xen/capabilities && \ + ! grep -q "control_d" /proc/xen/capabilities ; then + exit 0 +fi + +do_start () { + local time=0 + local timeout=30 + + @LOAD_MODULES@ + mkdir -p /var/run/xen + + if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` + then + test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" + + if [ -n "$XENSTORED" ] ; then + echo -n Starting $XENSTORED... + $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + elif [ -x ${SBINDIR}/oxenstored ] ; then + echo -n Starting oxenstored... + ${SBINDIR}/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + elif [ -x ${SBINDIR}/xenstored ] ; then + echo -n Starting C xenstored... + ${SBINDIR}/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + else + echo "No xenstored found" + exit 1 + fi + + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + echo -n . + time=$(($time+1)) + sleep 1 + done + echo + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo Could not start xenstored + exit 1 + fi + + echo Setting domain 0 name and domid... + ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + fi + + echo Starting xenconsoled... + test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" + ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + echo Starting QEMU as disk backend for dom0 + test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" + $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile $QEMU_PIDFILE +} +do_stop () { + echo Stopping xenconsoled + if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $XENCONSOLED_PIDFILE + fi + + echo Stopping QEMU + if read 2>/dev/null <$QEMU_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $QEMU_PIDFILE + fi + + echo WARNING: Not stopping xenstored, as it cannot be restarted. +} + +case "$1" in + start) + do_start + ;; + status) + ${BINDIR}/xenstore-read -s / + ;; + stop) + do_stop + ;; + reload) + echo >&2 'Reload not available; use force-reload'; exit 1 + ;; + force-reload|restart) + do_stop + do_start + ;; + *) + # do not advertise unreasonable commands that there is no reason + # to use with this device + echo $"Usage: $0 {start|stop|status|restart|force-reload}" + exit 1 +esac + +exit $? diff --git a/tools/hotplug/Linux/update-modules.sh b/tools/hotplug/Linux/update-modules.sh new file mode 100755 index 0000000..692d220 --- /dev/null +++ b/tools/hotplug/Linux/update-modules.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -e + +IFS='' + +XEN_ROOT=$1 +XEN_OS=$2 +XENCOMMONS_INITD=$3 + +cat $XEN_ROOT/config/${XEN_OS}.modules | ( + while read l ; do + if echo $l | egrep -q "^#" ; then + continue + fi + if echo "$l" | egrep -q "\|" ; then + m1=${l%%|*} + m2=${l#*|} + echo " modprobe $m1 2>/dev/null || modprobe $m2 2>/dev/null" + else + echo " modprobe $l 2>/dev/null" + fi + done +) > ${XENCOMMONS_INITD}.modules + +cat ${XENCOMMONS_INITD}.in | ( + while read l ; do + if echo "$l" | egrep -q "@LOAD_MODULES@" ; then + cat ${XENCOMMONS_INITD}.modules + else + echo $l + fi + done +) + +rm -f ${XENCOMMONS_INITD}.modules -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKa-0001LG-1g; Tue, 12 Aug 2014 19:02:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKZ-0001L0-4b for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:59 +0000 Received: from [85.158.139.211:8126] by server-6.bemta-5.messagelabs.com id 13/31-06284-6A46AE35; Tue, 12 Aug 2014 19:01:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1407870115!10947077!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18480 invoked from network); 12 Aug 2014 19:01:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKV-0008WA-Er for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKV-0003H5-DC for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:55 +0000 Date: Tue, 12 Aug 2014 19:01:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: xen: enable explicit preference option for xenstored preference X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff4c31163804a4262b5fcbe0dd57d167474fee0 Author: Luis R. Rodriguez AuthorDate: Wed Jul 30 09:40:02 2014 -0700 Commit: Ian Campbell CommitDate: Mon Aug 4 14:58:24 2014 +0100 autoconf: xen: enable explicit preference option for xenstored preference As it stands oxenstored will be used by default if ocaml tools are found, the init system will also try to use oxenstored first if its found otherwise the cxenstored will be used. Lets simplify the init script and let users be explicit about the preference through configure. This adds support to let you be explicit about the xenstored preference, you can only use one of these two options: ./configure --with-xenstored=xenstored ./configure --with-xenstored=oxenstored We continue with the old behaviour and default oxenstored will be used but only if you have ocaml dependencies. Since the xenstored preference is explicit now and since we require configure substitutions for it we make use of the AX_XEN_EXPAND_CONFIG() helpers as otherwise substitution for SBINDIR is not propagated from the top level configuration. All this allows us to simplify the init script to use the configured xenstore from the start. We update the sysconfig/default xencommons file with the paths for the different options though, this can be used by users to override the default xenstored, this follows the old behaviour but we now just explicitly provide the full configured paths for users. As before, changing the xenstore requires a reboot. In order to help with documentation we update the README with some details on configure usage refer to the wiki [0] [1] [2] for more elaborate details. Since we are now parsing an entry within Paths.mk.in on tools we let the move the parsing of the file to be the tool's configure. [0] http://wiki.xen.org/wiki/Xenstored [1] http://wiki.xen.org/wiki/XenStore [2] http://wiki.xen.org/wiki/XenStoreReference Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- README | 32 +++ m4/xenstored.m4 | 56 +++++ tools/configure | 254 ++++++++++++++++---- tools/configure.ac | 19 ++- tools/hotplug/Linux/init.d/sysconfig.xencommons | 33 --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 42 ++++ tools/hotplug/Linux/init.d/xencommons.in | 153 ------------ tools/hotplug/Linux/init.d/xencommons.in.in | 149 ++++++++++++ 8 files changed, 504 insertions(+), 234 deletions(-) diff --git a/README b/README index 0c8c7aa..7c27fbb 100644 --- a/README +++ b/README @@ -129,6 +129,38 @@ performed with root privileges.] versions of those scripts, so that you can copy the dist directory to another machine and install from that distribution. +xenstore: xenstored and oxenstored +==================================== + +Xen uses a configuration database called xenstore [0] to maintain configuration +and status information shared between domains. A daemon is implemented as part +of xenstore to act as an interface for access to the database for dom0 and +guests. Two xenstored daemons are supported, one written in C which we refer +to as the xenstored (sometimes referred to as cxenstored), and another written +in Ocaml called oxenstored. Details for xenstore and the different +implementations can be found on the wiki's xenstore reference guide [1] and +the xenstored [2] page. You can choose which xenstore you want to enable as +default on a system through configure: + + ./configure --with-xenstored=xenstored + ./configure --with-xenstored=oxenstored + +By default oxenstored will be used if the ocaml development tools are found. +If you enable oxenstored the xenstored will still be built and installed, +the xenstored used can be changed through the configuration file: + +/etc/sysconfig/xencommons +or +/etc/default/xencommons + +You can change the preferred xenstored you want to use in the configuration +but since we cannot stop the daemon a reboot will be required to make the +change take effect. + +[0] http://wiki.xen.org/wiki/XenStore +[1] http://wiki.xen.org/wiki/XenStoreReference +[2] http://wiki.xen.org/wiki/Xenstored + Python Runtime Libraries ======================== diff --git a/m4/xenstored.m4 b/m4/xenstored.m4 new file mode 100644 index 0000000..30b44c9 --- /dev/null +++ b/m4/xenstored.m4 @@ -0,0 +1,56 @@ +AC_DEFUN([AX_XEN_OCAML_XENSTORE_CHECK], [ + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ + AC_MSG_ERROR([Missing ocaml dependencies for oxenstored, try installing ocaml ocaml-compiler-libs ocaml-runtime ocaml-findlib]) + ]) +]) + +AC_DEFUN([AX_XEN_OCAML_XENSTORE_DEFAULTS], [ + xenstore="oxenstored" + xenstored=$SBINDIR/oxenstored + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ + xenstore="xenstored" + xenstored=$SBINDIR/xenstored + ]) +]) + +AC_DEFUN([AX_XENSTORE_OPTIONS], [ +AS_IF([test "x$XENSTORE" = "x"], [ +AC_ARG_WITH([xenstored], + AS_HELP_STRING([--with-xenstored@<:@=oxenstored|xenstored@:>@], + [This lets you choose which xenstore daemon you want, you have + two options: the original xenstored written in C (xenstored) + or the newer and robust one written in Ocaml (oxenstored). + The oxenstored daemon is the default but will but can only + be used if you have ocaml library / build dependencies solved, + if you have not specified a preference and do not have ocaml + dependencies resolved we'll enable the C xenstored for you. If + you ask for oxenstored we'll complain until you resolve those + dependencies]), + [ + AS_IF([test "x$withval" = "xxenstored"], [ + xenstore=$withval + xenstored=$SBINDIR/xenstored + ]) + AS_IF([test "x$withval" = "xoxenstored"], [ + xenstore=$withval + xenstored=$SBINDIR/oxenstored + AX_XEN_OCAML_XENSTORE_CHECK() + ]) + AS_IF([test "x$withval" != "xoxenstored" && test "x$withval" != "xxenstored"], [ + AC_MSG_ERROR([Unsupported xenstored specified, supported types: oxenstored xenstored]) + ]) + ], + [ + AX_XEN_OCAML_XENSTORE_DEFAULTS() + ]) +]) +]) + +AC_DEFUN([AX_XENSTORE_SET], [ + XENSTORE=$xenstore + + AS_IF([test "x$XENSTORED" = "x"], [ + XENSTORED=$xenstored + ]) + AC_SUBST(XENSTORED) +]) diff --git a/tools/configure b/tools/configure index a4aa8f1..08d6a05 100755 --- a/tools/configure +++ b/tools/configure @@ -649,6 +649,7 @@ pyconfig PYTHONPATH CHECKPOLICY AWK +XENSTORED OCAMLFIND OCAMLBUILD OCAMLDOC @@ -698,6 +699,23 @@ xsmpolicy ocamltools monitors githttp +XEN_PAGING_DIR +XEN_LOCK_DIR +XEN_SCRIPT_DIR +XEN_CONFIG_DIR +CONFIG_DIR +XENFIRMWAREDIR +PRIVATE_BINDIR +PKG_XEN_PREFIX +PRIVATE_PREFIX +SHAREDIR +XEN_LIB_STORED +XEN_LOG_DIR +XEN_RUN_DIR +LIBDIR +LIBEXEC +SBINDIR +BINDIR FILE_OFFSET_BITS OBJEXT EXEEXT @@ -772,6 +790,7 @@ with_system_qemu with_system_seabios with_system_ovmf with_extra_qemuu_configure_args +with_xenstored ' ac_precious_vars='build_alias host_alias @@ -1451,6 +1470,17 @@ Optional Packages: --with-extra-qemuu-configure-args[="--ARG1 ..."] List of additional configure options for upstream qemu + --with-xenstored[=oxenstored|xenstored] + This lets you choose which xenstore daemon you want, + you have two options: the original xenstored written + in C (xenstored) or the newer and robust one written + in Ocaml (oxenstored). The oxenstored daemon is the + default but will but can only be used if you have + ocaml library / build dependencies solved, if you + have not specified a preference and do not have + ocaml dependencies resolved we'll enable the C + xenstored for you. If you ask for oxenstored we'll + complain until you resolve those dependencies Some influential environment variables: CC C compiler command @@ -2205,7 +2235,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons" ac_config_headers="$ac_config_headers config.h" @@ -3587,6 +3617,75 @@ esac + + + + + + + + + + + +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix + +BINDIR=$prefix/bin + + +SBINDIR=$prefix/sbin + + +LIBEXEC=$prefix/lib/xen/bin + + +LIBDIR=`eval echo $libdir` + + +XEN_RUN_DIR=/var/run/xen + + +XEN_LOG_DIR=/var/log/xen + + +XEN_LIB_STORED=/var/lib/xenstored + + +SHAREDIR=$prefix/share + + +PRIVATE_PREFIX=$LIBDIR/xen + + +PKG_XEN_PREFIX=$LIBDIR/xen + + +PRIVATE_BINDIR=$PRIVATE_PREFIX/bin + + +XENFIRMWAREDIR=$prefix/lib/xen/boot + + +CONFIG_DIR=/etc + + +XEN_CONFIG_DIR=$CONFIG_DIR/xen + + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts + + +XEN_LOCK_DIR=/var/lock + + +XEN_RUN_DIR=/var/run/xen + + +XEN_PAGING_DIR=/var/lib/xen/xenpaging + + + # Enable/disable options # Check whether --enable-githttp was given. @@ -4757,51 +4856,8 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -if test "x$ocamltools" = "xy"; then : - # checking for ocamlc + # checking for ocamlc if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ocamlc", so it can be a program name with args. set dummy ${ac_tool_prefix}ocamlc; ac_word=$2 @@ -5895,6 +5951,112 @@ fi + + +if test "x$XENSTORE" = "x"; then : + + +# Check whether --with-xenstored was given. +if test "${with_xenstored+set}" = set; then : + withval=$with_xenstored; + if test "x$withval" = "xxenstored"; then : + + xenstore=$withval + xenstored=$SBINDIR/xenstored + +fi + if test "x$withval" = "xoxenstored"; then : + + xenstore=$withval + xenstored=$SBINDIR/oxenstored + + if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : + + as_fn_error $? "Missing ocaml dependencies for oxenstored, try installing ocaml ocaml-compiler-libs ocaml-runtime ocaml-findlib" "$LINENO" 5 + +fi + + +fi + if test "x$withval" != "xoxenstored" && test "x$withval" != "xxenstored"; then : + + as_fn_error $? "Unsupported xenstored specified, supported types: oxenstored xenstored" "$LINENO" 5 + +fi + +else + + + xenstore="oxenstored" + xenstored=$SBINDIR/oxenstored + if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : + + xenstore="xenstored" + xenstored=$SBINDIR/xenstored + +fi + + +fi + + +fi + + + XENSTORE=$xenstore + + if test "x$XENSTORED" = "x"; then : + + XENSTORED=$xenstored + +fi + + + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +if test "x$ocamltools" = "xy"; then : + if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : if test "x$enable_ocamltools" = "xyes"; then : @@ -8864,6 +9026,8 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;; + "hotplug/Linux/init.d/xencommons.in") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;; + "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/tools/configure.ac b/tools/configure.ac index 629d6a0..e74fe4b 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -5,7 +5,11 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([libxl/libxl.c]) -AC_CONFIG_FILES([../config/Tools.mk]) +AC_CONFIG_FILES([ +../config/Tools.mk +hotplug/Linux/init.d/xencommons.in +hotplug/Linux/init.d/sysconfig.xencommons +]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) @@ -53,6 +57,10 @@ m4_include([../m4/ptyfuncs.m4]) m4_include([../m4/extfs.m4]) m4_include([../m4/fetcher.m4]) m4_include([../m4/ax_compare_version.m4]) +m4_include([../m4/paths.m4]) +m4_include([../m4/xenstored.m4]) + +AX_XEN_EXPAND_CONFIG() # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) @@ -203,9 +211,14 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) + +AC_PROG_OCAML +AC_PROG_FINDLIB + +AX_XENSTORE_OPTIONS +AX_XENSTORE_SET + AS_IF([test "x$ocamltools" = "xy"], [ - AC_PROG_OCAML - AC_PROG_FINDLIB AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])]) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons b/tools/hotplug/Linux/init.d/sysconfig.xencommons deleted file mode 100644 index 25f7f00..0000000 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons +++ /dev/null @@ -1,33 +0,0 @@ -## Path: System/Virtualization -## Type: string -## Default: "none" -# -# Log xenconsoled messages (cf xl dmesg) -#XENCONSOLED_TRACE=[none|guest|hv|all] - -## Type: string -## Default: xenstored -# -# Select xenstored implementation -#XENSTORED=[oxenstored|xenstored] - -## Type: string -## Default: Not defined, tracing off -# -# Log xenstored messages -#XENSTORED_TRACE=[yes|on|1] - -## Type: string -## Default: "/var/lib/xenstored" -# -# Running xenstored on XENSTORED_ROOTDIR -#XENSTORED_ROOTDIR=/var/lib/xenstored - -## Type: string -## Default: Not defined, xenbackendd debug mode off -# -# Running xenbackendd in debug mode -#XENBACKENDD_DEBUG=[yes|on|1] - -# qemu path -#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386 diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in new file mode 100644 index 0000000..d423ff8 --- /dev/null +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -0,0 +1,42 @@ +## Path: System/Virtualization +## Type: string +## Default: "none" +# +# Log xenconsoled messages (cf xl dmesg) +#XENCONSOLED_TRACE=[none|guest|hv|all] + +## Type: string +## Default: xenstored +# +# Select xenstore implementation, this can be either +# of these below. If using systemd it's preferred that you +# just edit the xenstored.service unit file and change +# the XENSTORED variable there. +# +# This can be either of: +# * @SBINDIR@/oxenstored +# * @SBINDIR@/xenstored +# +# Changing this requires a reboot to take effect. +#XENSTORED=@XENSTORED@ + +## Type: string +## Default: Not defined, tracing off +# +# Log xenstored messages +#XENSTORED_TRACE=[yes|on|1] + +## Type: string +## Default: "/var/lib/xenstored" +# +# Running xenstored on XENSTORED_ROOTDIR +#XENSTORED_ROOTDIR=/var/lib/xenstored + +## Type: string +## Default: Not defined, xenbackendd debug mode off +# +# Running xenbackendd in debug mode +#XENBACKENDD_DEBUG=[yes|on|1] + +# qemu path +#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386 diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in deleted file mode 100644 index 3939bcc..0000000 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/bash -# -# xencommons Script to start and stop xenstored and xenconsoled -# -# Author: Ian Jackson -# -# chkconfig: 2345 70 10 -# description: Starts and stops xenstored and xenconsoled -### BEGIN INIT INFO -# Provides: xenstored xenconsoled -# Required-Start: $syslog $remote_fs -# Should-Start: -# Required-Stop: $syslog $remote_fs -# Should-Stop: -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/stop xenstored and xenconsoled -# Description: Starts and stops the daemons neeeded for xl/xend -### END INIT INFO - -. /etc/xen/scripts/hotplugpath.sh - -if [ -d /etc/sysconfig ]; then - xencommons_config=/etc/sysconfig -else - xencommons_config=/etc/default -fi - -test -f $xencommons_config/xencommons && . $xencommons_config/xencommons - -XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid -QEMU_PIDFILE=/var/run/qemu-dom0.pid -shopt -s extglob - -# not running in Xen dom0 or domU -if ! test -d /proc/xen ; then - exit 0 -fi - -# mount xenfs in dom0 or domU with a pv_ops kernel -if test "x$1" = xstart && \ - ! test -f /proc/xen/capabilities && \ - ! grep '^xenfs ' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen -fi - -# run this script only in dom0: -# no capabilities file in xenlinux domU kernel -# empty capabilities file in pv_ops domU kernel -if test -f /proc/xen/capabilities && \ - ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 -fi - -do_start () { - local time=0 - local timeout=30 - - @LOAD_MODULES@ - mkdir -p /var/run/xen - - if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` - then - test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" - rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null - test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" - - if [ -n "$XENSTORED" ] ; then - echo -n Starting $XENSTORED... - $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/oxenstored ] ; then - echo -n Starting oxenstored... - ${SBINDIR}/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/xenstored ] ; then - echo -n Starting C xenstored... - ${SBINDIR}/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - else - echo "No xenstored found" - exit 1 - fi - - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do - echo -n . - time=$(($time+1)) - sleep 1 - done - echo - - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo Could not start xenstored - exit 1 - fi - - echo Setting domain 0 name and domid... - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 - fi - - echo Starting xenconsoled... - test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS - echo Starting QEMU as disk backend for dom0 - test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" - $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ - -monitor /dev/null -serial /dev/null -parallel /dev/null \ - -pidfile $QEMU_PIDFILE -} -do_stop () { - echo Stopping xenconsoled - if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $XENCONSOLED_PIDFILE - fi - - echo Stopping QEMU - if read 2>/dev/null <$QEMU_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $QEMU_PIDFILE - fi - - echo WARNING: Not stopping xenstored, as it cannot be restarted. -} - -case "$1" in - start) - do_start - ;; - status) - ${BINDIR}/xenstore-read -s / - ;; - stop) - do_stop - ;; - reload) - echo >&2 'Reload not available; use force-reload'; exit 1 - ;; - force-reload|restart) - do_stop - do_start - ;; - *) - # do not advertise unreasonable commands that there is no reason - # to use with this device - echo $"Usage: $0 {start|stop|status|restart|force-reload}" - exit 1 -esac - -exit $? diff --git a/tools/hotplug/Linux/init.d/xencommons.in.in b/tools/hotplug/Linux/init.d/xencommons.in.in new file mode 100644 index 0000000..b311bb8 --- /dev/null +++ b/tools/hotplug/Linux/init.d/xencommons.in.in @@ -0,0 +1,149 @@ +#!/bin/bash +# +# xencommons Script to start and stop xenstored and xenconsoled +# +# Author: Ian Jackson +# +# chkconfig: 2345 70 10 +# description: Starts and stops xenstored and xenconsoled +### BEGIN INIT INFO +# Provides: xenstored xenconsoled +# Required-Start: $syslog $remote_fs +# Should-Start: +# Required-Stop: $syslog $remote_fs +# Should-Stop: +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop xenstored and xenconsoled +# Description: Starts and stops the daemons neeeded for xl/xend +### END INIT INFO + +XENSTORED=@XENSTORED@ + +. /etc/xen/scripts/hotplugpath.sh + +if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig +else + xencommons_config=/etc/default +fi + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid +QEMU_PIDFILE=/var/run/qemu-dom0.pid +shopt -s extglob + +# not running in Xen dom0 or domU +if ! test -d /proc/xen ; then + exit 0 +fi + +# mount xenfs in dom0 or domU with a pv_ops kernel +if test "x$1" = xstart && \ + ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; +then + mount -t xenfs xenfs /proc/xen +fi + +# run this script only in dom0: +# no capabilities file in xenlinux domU kernel +# empty capabilities file in pv_ops domU kernel +if test -f /proc/xen/capabilities && \ + ! grep -q "control_d" /proc/xen/capabilities ; then + exit 0 +fi + +do_start () { + local time=0 + local timeout=30 + + @LOAD_MODULES@ + mkdir -p /var/run/xen + + if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` + then + test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" + + if [ -n "$XENSTORED" ] ; then + echo -n Starting $XENSTORED... + $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + else + echo "No xenstored found" + exit 1 + fi + + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + echo -n . + time=$(($time+1)) + sleep 1 + done + echo + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo Could not start xenstored + exit 1 + fi + + echo Setting domain 0 name and domid... + ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + fi + + echo Starting xenconsoled... + test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" + ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + echo Starting QEMU as disk backend for dom0 + test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" + $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile $QEMU_PIDFILE +} +do_stop () { + echo Stopping xenconsoled + if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $XENCONSOLED_PIDFILE + fi + + echo Stopping QEMU + if read 2>/dev/null <$QEMU_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $QEMU_PIDFILE + fi + + echo WARNING: Not stopping xenstored, as it cannot be restarted. +} + +case "$1" in + start) + do_start + ;; + status) + ${BINDIR}/xenstore-read -s / + ;; + stop) + do_stop + ;; + reload) + echo >&2 'Reload not available; use force-reload'; exit 1 + ;; + force-reload|restart) + do_stop + do_start + ;; + *) + # do not advertise unreasonable commands that there is no reason + # to use with this device + echo $"Usage: $0 {start|stop|status|restart|force-reload}" + exit 1 +esac + +exit $? -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKa-0001LG-1g; Tue, 12 Aug 2014 19:02:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKZ-0001L0-4b for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:59 +0000 Received: from [85.158.139.211:8126] by server-6.bemta-5.messagelabs.com id 13/31-06284-6A46AE35; Tue, 12 Aug 2014 19:01:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1407870115!10947077!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18480 invoked from network); 12 Aug 2014 19:01:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:01:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKV-0008WA-Er for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKV-0003H5-DC for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:01:55 +0000 Date: Tue, 12 Aug 2014 19:01:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: xen: enable explicit preference option for xenstored preference X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff4c31163804a4262b5fcbe0dd57d167474fee0 Author: Luis R. Rodriguez AuthorDate: Wed Jul 30 09:40:02 2014 -0700 Commit: Ian Campbell CommitDate: Mon Aug 4 14:58:24 2014 +0100 autoconf: xen: enable explicit preference option for xenstored preference As it stands oxenstored will be used by default if ocaml tools are found, the init system will also try to use oxenstored first if its found otherwise the cxenstored will be used. Lets simplify the init script and let users be explicit about the preference through configure. This adds support to let you be explicit about the xenstored preference, you can only use one of these two options: ./configure --with-xenstored=xenstored ./configure --with-xenstored=oxenstored We continue with the old behaviour and default oxenstored will be used but only if you have ocaml dependencies. Since the xenstored preference is explicit now and since we require configure substitutions for it we make use of the AX_XEN_EXPAND_CONFIG() helpers as otherwise substitution for SBINDIR is not propagated from the top level configuration. All this allows us to simplify the init script to use the configured xenstore from the start. We update the sysconfig/default xencommons file with the paths for the different options though, this can be used by users to override the default xenstored, this follows the old behaviour but we now just explicitly provide the full configured paths for users. As before, changing the xenstore requires a reboot. In order to help with documentation we update the README with some details on configure usage refer to the wiki [0] [1] [2] for more elaborate details. Since we are now parsing an entry within Paths.mk.in on tools we let the move the parsing of the file to be the tool's configure. [0] http://wiki.xen.org/wiki/Xenstored [1] http://wiki.xen.org/wiki/XenStore [2] http://wiki.xen.org/wiki/XenStoreReference Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- README | 32 +++ m4/xenstored.m4 | 56 +++++ tools/configure | 254 ++++++++++++++++---- tools/configure.ac | 19 ++- tools/hotplug/Linux/init.d/sysconfig.xencommons | 33 --- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 42 ++++ tools/hotplug/Linux/init.d/xencommons.in | 153 ------------ tools/hotplug/Linux/init.d/xencommons.in.in | 149 ++++++++++++ 8 files changed, 504 insertions(+), 234 deletions(-) diff --git a/README b/README index 0c8c7aa..7c27fbb 100644 --- a/README +++ b/README @@ -129,6 +129,38 @@ performed with root privileges.] versions of those scripts, so that you can copy the dist directory to another machine and install from that distribution. +xenstore: xenstored and oxenstored +==================================== + +Xen uses a configuration database called xenstore [0] to maintain configuration +and status information shared between domains. A daemon is implemented as part +of xenstore to act as an interface for access to the database for dom0 and +guests. Two xenstored daemons are supported, one written in C which we refer +to as the xenstored (sometimes referred to as cxenstored), and another written +in Ocaml called oxenstored. Details for xenstore and the different +implementations can be found on the wiki's xenstore reference guide [1] and +the xenstored [2] page. You can choose which xenstore you want to enable as +default on a system through configure: + + ./configure --with-xenstored=xenstored + ./configure --with-xenstored=oxenstored + +By default oxenstored will be used if the ocaml development tools are found. +If you enable oxenstored the xenstored will still be built and installed, +the xenstored used can be changed through the configuration file: + +/etc/sysconfig/xencommons +or +/etc/default/xencommons + +You can change the preferred xenstored you want to use in the configuration +but since we cannot stop the daemon a reboot will be required to make the +change take effect. + +[0] http://wiki.xen.org/wiki/XenStore +[1] http://wiki.xen.org/wiki/XenStoreReference +[2] http://wiki.xen.org/wiki/Xenstored + Python Runtime Libraries ======================== diff --git a/m4/xenstored.m4 b/m4/xenstored.m4 new file mode 100644 index 0000000..30b44c9 --- /dev/null +++ b/m4/xenstored.m4 @@ -0,0 +1,56 @@ +AC_DEFUN([AX_XEN_OCAML_XENSTORE_CHECK], [ + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ + AC_MSG_ERROR([Missing ocaml dependencies for oxenstored, try installing ocaml ocaml-compiler-libs ocaml-runtime ocaml-findlib]) + ]) +]) + +AC_DEFUN([AX_XEN_OCAML_XENSTORE_DEFAULTS], [ + xenstore="oxenstored" + xenstored=$SBINDIR/oxenstored + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ + xenstore="xenstored" + xenstored=$SBINDIR/xenstored + ]) +]) + +AC_DEFUN([AX_XENSTORE_OPTIONS], [ +AS_IF([test "x$XENSTORE" = "x"], [ +AC_ARG_WITH([xenstored], + AS_HELP_STRING([--with-xenstored@<:@=oxenstored|xenstored@:>@], + [This lets you choose which xenstore daemon you want, you have + two options: the original xenstored written in C (xenstored) + or the newer and robust one written in Ocaml (oxenstored). + The oxenstored daemon is the default but will but can only + be used if you have ocaml library / build dependencies solved, + if you have not specified a preference and do not have ocaml + dependencies resolved we'll enable the C xenstored for you. If + you ask for oxenstored we'll complain until you resolve those + dependencies]), + [ + AS_IF([test "x$withval" = "xxenstored"], [ + xenstore=$withval + xenstored=$SBINDIR/xenstored + ]) + AS_IF([test "x$withval" = "xoxenstored"], [ + xenstore=$withval + xenstored=$SBINDIR/oxenstored + AX_XEN_OCAML_XENSTORE_CHECK() + ]) + AS_IF([test "x$withval" != "xoxenstored" && test "x$withval" != "xxenstored"], [ + AC_MSG_ERROR([Unsupported xenstored specified, supported types: oxenstored xenstored]) + ]) + ], + [ + AX_XEN_OCAML_XENSTORE_DEFAULTS() + ]) +]) +]) + +AC_DEFUN([AX_XENSTORE_SET], [ + XENSTORE=$xenstore + + AS_IF([test "x$XENSTORED" = "x"], [ + XENSTORED=$xenstored + ]) + AC_SUBST(XENSTORED) +]) diff --git a/tools/configure b/tools/configure index a4aa8f1..08d6a05 100755 --- a/tools/configure +++ b/tools/configure @@ -649,6 +649,7 @@ pyconfig PYTHONPATH CHECKPOLICY AWK +XENSTORED OCAMLFIND OCAMLBUILD OCAMLDOC @@ -698,6 +699,23 @@ xsmpolicy ocamltools monitors githttp +XEN_PAGING_DIR +XEN_LOCK_DIR +XEN_SCRIPT_DIR +XEN_CONFIG_DIR +CONFIG_DIR +XENFIRMWAREDIR +PRIVATE_BINDIR +PKG_XEN_PREFIX +PRIVATE_PREFIX +SHAREDIR +XEN_LIB_STORED +XEN_LOG_DIR +XEN_RUN_DIR +LIBDIR +LIBEXEC +SBINDIR +BINDIR FILE_OFFSET_BITS OBJEXT EXEEXT @@ -772,6 +790,7 @@ with_system_qemu with_system_seabios with_system_ovmf with_extra_qemuu_configure_args +with_xenstored ' ac_precious_vars='build_alias host_alias @@ -1451,6 +1470,17 @@ Optional Packages: --with-extra-qemuu-configure-args[="--ARG1 ..."] List of additional configure options for upstream qemu + --with-xenstored[=oxenstored|xenstored] + This lets you choose which xenstore daemon you want, + you have two options: the original xenstored written + in C (xenstored) or the newer and robust one written + in Ocaml (oxenstored). The oxenstored daemon is the + default but will but can only be used if you have + ocaml library / build dependencies solved, if you + have not specified a preference and do not have + ocaml dependencies resolved we'll enable the C + xenstored for you. If you ask for oxenstored we'll + complain until you resolve those dependencies Some influential environment variables: CC C compiler command @@ -2205,7 +2235,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons" ac_config_headers="$ac_config_headers config.h" @@ -3587,6 +3617,75 @@ esac + + + + + + + + + + + +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix + +BINDIR=$prefix/bin + + +SBINDIR=$prefix/sbin + + +LIBEXEC=$prefix/lib/xen/bin + + +LIBDIR=`eval echo $libdir` + + +XEN_RUN_DIR=/var/run/xen + + +XEN_LOG_DIR=/var/log/xen + + +XEN_LIB_STORED=/var/lib/xenstored + + +SHAREDIR=$prefix/share + + +PRIVATE_PREFIX=$LIBDIR/xen + + +PKG_XEN_PREFIX=$LIBDIR/xen + + +PRIVATE_BINDIR=$PRIVATE_PREFIX/bin + + +XENFIRMWAREDIR=$prefix/lib/xen/boot + + +CONFIG_DIR=/etc + + +XEN_CONFIG_DIR=$CONFIG_DIR/xen + + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts + + +XEN_LOCK_DIR=/var/lock + + +XEN_RUN_DIR=/var/run/xen + + +XEN_PAGING_DIR=/var/lib/xen/xenpaging + + + # Enable/disable options # Check whether --enable-githttp was given. @@ -4757,51 +4856,8 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -if test "x$ocamltools" = "xy"; then : - # checking for ocamlc + # checking for ocamlc if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ocamlc", so it can be a program name with args. set dummy ${ac_tool_prefix}ocamlc; ac_word=$2 @@ -5895,6 +5951,112 @@ fi + + +if test "x$XENSTORE" = "x"; then : + + +# Check whether --with-xenstored was given. +if test "${with_xenstored+set}" = set; then : + withval=$with_xenstored; + if test "x$withval" = "xxenstored"; then : + + xenstore=$withval + xenstored=$SBINDIR/xenstored + +fi + if test "x$withval" = "xoxenstored"; then : + + xenstore=$withval + xenstored=$SBINDIR/oxenstored + + if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : + + as_fn_error $? "Missing ocaml dependencies for oxenstored, try installing ocaml ocaml-compiler-libs ocaml-runtime ocaml-findlib" "$LINENO" 5 + +fi + + +fi + if test "x$withval" != "xoxenstored" && test "x$withval" != "xxenstored"; then : + + as_fn_error $? "Unsupported xenstored specified, supported types: oxenstored xenstored" "$LINENO" 5 + +fi + +else + + + xenstore="oxenstored" + xenstored=$SBINDIR/oxenstored + if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : + + xenstore="xenstored" + xenstored=$SBINDIR/xenstored + +fi + + +fi + + +fi + + + XENSTORE=$xenstore + + if test "x$XENSTORED" = "x"; then : + + XENSTORED=$xenstored + +fi + + + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +if test "x$ocamltools" = "xy"; then : + if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : if test "x$enable_ocamltools" = "xyes"; then : @@ -8864,6 +9026,8 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;; + "hotplug/Linux/init.d/xencommons.in") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;; + "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/tools/configure.ac b/tools/configure.ac index 629d6a0..e74fe4b 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -5,7 +5,11 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([libxl/libxl.c]) -AC_CONFIG_FILES([../config/Tools.mk]) +AC_CONFIG_FILES([ +../config/Tools.mk +hotplug/Linux/init.d/xencommons.in +hotplug/Linux/init.d/sysconfig.xencommons +]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) @@ -53,6 +57,10 @@ m4_include([../m4/ptyfuncs.m4]) m4_include([../m4/extfs.m4]) m4_include([../m4/fetcher.m4]) m4_include([../m4/ax_compare_version.m4]) +m4_include([../m4/paths.m4]) +m4_include([../m4/xenstored.m4]) + +AX_XEN_EXPAND_CONFIG() # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) @@ -203,9 +211,14 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) + +AC_PROG_OCAML +AC_PROG_FINDLIB + +AX_XENSTORE_OPTIONS +AX_XENSTORE_SET + AS_IF([test "x$ocamltools" = "xy"], [ - AC_PROG_OCAML - AC_PROG_FINDLIB AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ AS_IF([test "x$enable_ocamltools" = "xyes"], [ AC_MSG_ERROR([Ocaml tools enabled, but unable to find Ocaml])]) diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons b/tools/hotplug/Linux/init.d/sysconfig.xencommons deleted file mode 100644 index 25f7f00..0000000 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons +++ /dev/null @@ -1,33 +0,0 @@ -## Path: System/Virtualization -## Type: string -## Default: "none" -# -# Log xenconsoled messages (cf xl dmesg) -#XENCONSOLED_TRACE=[none|guest|hv|all] - -## Type: string -## Default: xenstored -# -# Select xenstored implementation -#XENSTORED=[oxenstored|xenstored] - -## Type: string -## Default: Not defined, tracing off -# -# Log xenstored messages -#XENSTORED_TRACE=[yes|on|1] - -## Type: string -## Default: "/var/lib/xenstored" -# -# Running xenstored on XENSTORED_ROOTDIR -#XENSTORED_ROOTDIR=/var/lib/xenstored - -## Type: string -## Default: Not defined, xenbackendd debug mode off -# -# Running xenbackendd in debug mode -#XENBACKENDD_DEBUG=[yes|on|1] - -# qemu path -#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386 diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in new file mode 100644 index 0000000..d423ff8 --- /dev/null +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -0,0 +1,42 @@ +## Path: System/Virtualization +## Type: string +## Default: "none" +# +# Log xenconsoled messages (cf xl dmesg) +#XENCONSOLED_TRACE=[none|guest|hv|all] + +## Type: string +## Default: xenstored +# +# Select xenstore implementation, this can be either +# of these below. If using systemd it's preferred that you +# just edit the xenstored.service unit file and change +# the XENSTORED variable there. +# +# This can be either of: +# * @SBINDIR@/oxenstored +# * @SBINDIR@/xenstored +# +# Changing this requires a reboot to take effect. +#XENSTORED=@XENSTORED@ + +## Type: string +## Default: Not defined, tracing off +# +# Log xenstored messages +#XENSTORED_TRACE=[yes|on|1] + +## Type: string +## Default: "/var/lib/xenstored" +# +# Running xenstored on XENSTORED_ROOTDIR +#XENSTORED_ROOTDIR=/var/lib/xenstored + +## Type: string +## Default: Not defined, xenbackendd debug mode off +# +# Running xenbackendd in debug mode +#XENBACKENDD_DEBUG=[yes|on|1] + +# qemu path +#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386 diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in deleted file mode 100644 index 3939bcc..0000000 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/bash -# -# xencommons Script to start and stop xenstored and xenconsoled -# -# Author: Ian Jackson -# -# chkconfig: 2345 70 10 -# description: Starts and stops xenstored and xenconsoled -### BEGIN INIT INFO -# Provides: xenstored xenconsoled -# Required-Start: $syslog $remote_fs -# Should-Start: -# Required-Stop: $syslog $remote_fs -# Should-Stop: -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/stop xenstored and xenconsoled -# Description: Starts and stops the daemons neeeded for xl/xend -### END INIT INFO - -. /etc/xen/scripts/hotplugpath.sh - -if [ -d /etc/sysconfig ]; then - xencommons_config=/etc/sysconfig -else - xencommons_config=/etc/default -fi - -test -f $xencommons_config/xencommons && . $xencommons_config/xencommons - -XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid -QEMU_PIDFILE=/var/run/qemu-dom0.pid -shopt -s extglob - -# not running in Xen dom0 or domU -if ! test -d /proc/xen ; then - exit 0 -fi - -# mount xenfs in dom0 or domU with a pv_ops kernel -if test "x$1" = xstart && \ - ! test -f /proc/xen/capabilities && \ - ! grep '^xenfs ' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen -fi - -# run this script only in dom0: -# no capabilities file in xenlinux domU kernel -# empty capabilities file in pv_ops domU kernel -if test -f /proc/xen/capabilities && \ - ! grep -q "control_d" /proc/xen/capabilities ; then - exit 0 -fi - -do_start () { - local time=0 - local timeout=30 - - @LOAD_MODULES@ - mkdir -p /var/run/xen - - if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` - then - test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" - rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null - test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" - - if [ -n "$XENSTORED" ] ; then - echo -n Starting $XENSTORED... - $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/oxenstored ] ; then - echo -n Starting oxenstored... - ${SBINDIR}/oxenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - elif [ -x ${SBINDIR}/xenstored ] ; then - echo -n Starting C xenstored... - ${SBINDIR}/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS - else - echo "No xenstored found" - exit 1 - fi - - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do - echo -n . - time=$(($time+1)) - sleep 1 - done - echo - - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo Could not start xenstored - exit 1 - fi - - echo Setting domain 0 name and domid... - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 - fi - - echo Starting xenconsoled... - test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS - echo Starting QEMU as disk backend for dom0 - test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" - $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ - -monitor /dev/null -serial /dev/null -parallel /dev/null \ - -pidfile $QEMU_PIDFILE -} -do_stop () { - echo Stopping xenconsoled - if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $XENCONSOLED_PIDFILE - fi - - echo Stopping QEMU - if read 2>/dev/null <$QEMU_PIDFILE pid; then - kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done - rm -f $QEMU_PIDFILE - fi - - echo WARNING: Not stopping xenstored, as it cannot be restarted. -} - -case "$1" in - start) - do_start - ;; - status) - ${BINDIR}/xenstore-read -s / - ;; - stop) - do_stop - ;; - reload) - echo >&2 'Reload not available; use force-reload'; exit 1 - ;; - force-reload|restart) - do_stop - do_start - ;; - *) - # do not advertise unreasonable commands that there is no reason - # to use with this device - echo $"Usage: $0 {start|stop|status|restart|force-reload}" - exit 1 -esac - -exit $? diff --git a/tools/hotplug/Linux/init.d/xencommons.in.in b/tools/hotplug/Linux/init.d/xencommons.in.in new file mode 100644 index 0000000..b311bb8 --- /dev/null +++ b/tools/hotplug/Linux/init.d/xencommons.in.in @@ -0,0 +1,149 @@ +#!/bin/bash +# +# xencommons Script to start and stop xenstored and xenconsoled +# +# Author: Ian Jackson +# +# chkconfig: 2345 70 10 +# description: Starts and stops xenstored and xenconsoled +### BEGIN INIT INFO +# Provides: xenstored xenconsoled +# Required-Start: $syslog $remote_fs +# Should-Start: +# Required-Stop: $syslog $remote_fs +# Should-Stop: +# Default-Start: 2 3 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop xenstored and xenconsoled +# Description: Starts and stops the daemons neeeded for xl/xend +### END INIT INFO + +XENSTORED=@XENSTORED@ + +. /etc/xen/scripts/hotplugpath.sh + +if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig +else + xencommons_config=/etc/default +fi + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid +QEMU_PIDFILE=/var/run/qemu-dom0.pid +shopt -s extglob + +# not running in Xen dom0 or domU +if ! test -d /proc/xen ; then + exit 0 +fi + +# mount xenfs in dom0 or domU with a pv_ops kernel +if test "x$1" = xstart && \ + ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; +then + mount -t xenfs xenfs /proc/xen +fi + +# run this script only in dom0: +# no capabilities file in xenlinux domU kernel +# empty capabilities file in pv_ops domU kernel +if test -f /proc/xen/capabilities && \ + ! grep -q "control_d" /proc/xen/capabilities ; then + exit 0 +fi + +do_start () { + local time=0 + local timeout=30 + + @LOAD_MODULES@ + mkdir -p /var/run/xen + + if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` + then + test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" + + if [ -n "$XENSTORED" ] ; then + echo -n Starting $XENSTORED... + $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + else + echo "No xenstored found" + exit 1 + fi + + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + echo -n . + time=$(($time+1)) + sleep 1 + done + echo + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo Could not start xenstored + exit 1 + fi + + echo Setting domain 0 name and domid... + ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" + ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + fi + + echo Starting xenconsoled... + test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" + ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + echo Starting QEMU as disk backend for dom0 + test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386" + $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile $QEMU_PIDFILE +} +do_stop () { + echo Stopping xenconsoled + if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $XENCONSOLED_PIDFILE + fi + + echo Stopping QEMU + if read 2>/dev/null <$QEMU_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $QEMU_PIDFILE + fi + + echo WARNING: Not stopping xenstored, as it cannot be restarted. +} + +case "$1" in + start) + do_start + ;; + status) + ${BINDIR}/xenstore-read -s / + ;; + stop) + do_stop + ;; + reload) + echo >&2 'Reload not available; use force-reload'; exit 1 + ;; + force-reload|restart) + do_stop + do_start + ;; + *) + # do not advertise unreasonable commands that there is no reason + # to use with this device + echo $"Usage: $0 {start|stop|status|restart|force-reload}" + exit 1 +esac + +exit $? -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKl-0001NT-AY; Tue, 12 Aug 2014 19:02:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKk-0001N4-3H for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:10 +0000 Content-Length: 43362 Received: from [85.158.137.68:57725] by server-12.bemta-3.messagelabs.com id D9/5D-02460-1B46AE35; Tue, 12 Aug 2014 19:02:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407870125!9559212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_23,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2680 invoked from network); 12 Aug 2014 19:02:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKf-000053-Mi for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKf-0003Hc-KO for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:05 +0000 Date: Tue, 12 Aug 2014 19:02:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] systemd: add xen systemd service and module files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6490996193720369296==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6490996193720369296== Content-Length: 44110 Content-Transfer-Encoding: quoted-printable commit 015330004ec6f6658aa454aec301cad6083a87df Author: Luis R. Rodriguez AuthorDate: Wed Jul 30 09:40:03 2014 -0700 Commit: Ian Campbell CommitDate: Mon Aug 4 14:58:24 2014 +0100 systemd: add xen systemd service and module files This adds the systemd xen service / module files and integrates support into the build system. This goes in with AX_AVAILABLE_SYSTEMD() which will enable systemd if development libraries have been found on your build system. If you don't have systemd on target systems for binaries built with systemd then the binary will not work, you must explicitly disable systemd support if you do not want to build systemd support. When systemd libraries are present only systems that have booted into systemd go through the systemd initialization, otherwise the SysVinit is used. These are originally based on the Fedora systemd files. Changes made from Fedora's systemd files: * split sockets into two files to claim different permissions * Use /bin/sh -c exec to for a simple launcher implementation * enables systemd socket activation for C xenstored and Ocaml oxenstored * use sd_notify(), so change the service to Type=3Dnotify, because of this we remove the PIDFile specification as we don't care for it, and let systemd do its magic for us, this also means we don't have to fork so we use --no-fork with systemd * defines a modules-load.d, its original source file will be shared between systemd and old init systems * simplify service files with ConditionVirtualization=3Dxen which uses the built in systemd virtualization backend detection, these service files will not be available to start on systems that do not boot with xen as a hypervisor * use autoconf to replace @variable@ paths for us which piggy backs on top of the latest autoconf changes to xen * removes oxenstored service file in favor of a system variable which controls which which xentored to use at run time, we avoid multiple service files this way. * simplifies startup to not require polling on the sockets as initial socket management is handled by systemd, we just take on the socket later once anything pokes at it, a simple nc -U (as root) on any of the sockets files can activate the service for example. Anything queued up will be sent to us once we start. Socket activation should in theory also let us dynamically switch between xenstores but more importantly we could upgrade xenstored while keeping all active socket communication queued up, but in order to take advantage of this we eventually would need to remove the requirement of not being able to bring down the xenstored. Even though active sockets are supported since most libxl communication doesn't triggger a check on the unix socket first administrators are encouraged to enable the xenstored.service to triggger an initialization of the xenstored upon bring up. Some systems also never use unix sockets for communication with the xenstored and as such active sockets will not be used there. * allow for xenstored configuration through *either* of these configuration files: - /etc/sysconfig/xenstored - /etc/default/xenstored The /etc/default/xenstored will let debian based systems do the same, while SUSE/OpenSUSE/Fedora/RedHat can keep on chugging with sysconfig. We leave these files all commented out by default though given that for systemd we want to encourage not using them. * ensures we create the run directory as most systems will likely be using a tmpfs for run dirs for the pid files * Some systems define the selinux context in the systemd Option for the /var/lib/xenstored tmpfs: Options=3Dmode=3D755,context=3D"system_u:object_r:xenstored_var_lib_t:s0" For the upstream version we remove that and let systems specify the context on their system /etc/default/xenstored or /etc/sysconfig/xenstored $XENSTORED_MOUNT_CTX variable, with a default to none. * takes advantage of the shared xendomains helper for the xendomains service * Add the new dom0 that gets kicked off for disk backend access into its own systemd service associated to xen We end up with these systemd files: General requirements: * proc-xen.mount * var-lib-xenstored.mount xenstored: * xenstored.service * xenstored.socket * xenstored_ro.socket * xenconsoled.service * xen-qemu-dom0-disk-backend.service.in Optional: * xendomains.service * xen-watchdog.service As for integration with xen, we house keep all the systemd files under a new directory tools/hotplug/Linux/systemd/ and will be targeted by default when building on Linux systems if systemd development libraries are present at build time. The systemd files will be sanitized for meta @VARIABLES@ upon configuration and installed upon the install target. Systems that do not use systemd can still get systemd service unit files installed if the build system enabled systemd support, this however does not mandate a requirement of having systemd libraries present. Old init scripts are always installed. If you don't specify a prefix you will end up with the services files under /usr/local/lib/systemd/system/ by default, and systemd modules-load.d conf files under /usr/local/lib/modules-load.d/ which systemd does look for (although it seems this is not documented). Distributions are expected to provide their /usr/ prefix to end up in the more generic location upon distribution install at /usr/lib/systemd/system/ and /usr/lib/modules-load.d/ respectively. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- .gitignore | 5 + Makefile | 6 +- README | 16 + config/Tools.mk.in | 6 + m4/README.source | 8 + m4/systemd.m4 | 123 +++++++ tools/config.h.in | 3 + tools/configure | 352 +++++++++++++++++++- tools/configure.ac | 11 + tools/hotplug/Linux/Makefile | 8 +- tools/hotplug/Linux/systemd/Makefile | 67 ++++ tools/hotplug/Linux/systemd/proc-xen.mount.in | 9 + .../Linux/systemd/var-lib-xenstored.mount.in | 13 + .../systemd/xen-qemu-dom0-disk-backend.service.in | 22 ++ .../hotplug/Linux/systemd/xen-watchdog.service.in | 13 + tools/hotplug/Linux/systemd/xenconsoled.service.in | 20 ++ tools/hotplug/Linux/systemd/xendomains.service.in | 16 + tools/hotplug/Linux/systemd/xenstored.service.in | 27 ++ tools/hotplug/Linux/systemd/xenstored.socket.in | 11 + tools/hotplug/Linux/systemd/xenstored_ro.socket.in | 11 + tools/ocaml/xenstored/Makefile | 5 + tools/xenstore/Makefile | 6 + 22 files changed, 752 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f1d1b9c..6d725aa 100644 --- a/.gitignore +++ b/.gitignore @@ -353,3 +353,8 @@ tools/xenstore/xenstore-watch docs/txt/misc/*.txt docs/txt/man/*.txt docs/figs/*.png + +tools/hotplug/Linux/systemd/*.conf +tools/hotplug/Linux/systemd/*.mount +tools/hotplug/Linux/systemd/*.socket +tools/hotplug/Linux/systemd/*.service diff --git a/Makefile b/Makefile index 41dabbf..580df64 100644 --- a/Makefile +++ b/Makefile @@ -216,8 +216,12 @@ uninstall: rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains + rm -f $(D)$(SBINDIR)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons - rm -rf $(D)/var/run/xen* $(D)/var/lib/xen* + rm -f $(D)$(XEN_SYSTEMD_DIR)/*.service + rm -f $(D)$(XEN_SYSTEMD_DIR)/*.mount + rm -f $(D)$(XEN_SYSTEMD_MODULES_LOAD)/*.conf + rm -rf $(D)$(XEN_RUN_DIR)* $(D)/var/lib/xen* make -C tools uninstall rm -rf $(D)/boot/tboot* diff --git a/README b/README index 7c27fbb..81bf938 100644 --- a/README +++ b/README @@ -72,6 +72,7 @@ disabled at compile time: * cmake (if building vtpm stub domains) * markdown * figlet (for generating the traditional Xen start of day banner) + * systemd daemon development files Second, you need to acquire a suitable kernel for use in domain 0. If possible you should use a kernel provided by your OS distributor. If @@ -161,6 +162,21 @@ change take effect. [1] http://wiki.xen.org/wiki/XenStoreReference [2] http://wiki.xen.org/wiki/Xenstored +Systemd support +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +If you have systemd development packages installed you can build binaries +with systemd support. Systemd support is enabled by default if you have +systemd development libraries present. If you want to force enable systemd to +ensure you build binaries with systemd support you can use the --enable-systemd +flag. Likewise if you want to force disable systemd you can use: + + ./configure --disable-systemd + +For more details refer to the xen xenstored systemd wiki page [3]. + +[3] http://wiki.xen.org/wiki/Xenstored#xenstored_systemd_support + Python Runtime Libraries =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 748cc69..974e28e 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -63,6 +63,12 @@ CONFIG_BLKTAP2 :=3D @blktap2@ CONFIG_VTPM :=3D @vtpm@ CONFIG_QEMUU_EXTRA_ARGS:=3D @EXTRA_QEMUU_CONFIGURE_ARGS@ +CONFIG_SYSTEMD :=3D @systemd@ +SYSTEMD_CFLAGS :=3D @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS :=3D @SYSTEMD_LIBS@ +XEN_SYSTEMD_DIR :=3D @SYSTEMD_DIR@ +XEN_SYSTEMD_MODULES_LOAD :=3D @SYSTEMD_MODULES_LOAD@ + #System options ZLIB :=3D @zlib@ CONFIG_LIBICONV :=3D @libiconv@ diff --git a/m4/README.source b/m4/README.source index 8922ea0..21850a6 100644 --- a/m4/README.source +++ b/m4/README.source @@ -26,3 +26,11 @@ Date: Mon Feb 3 15:59:18 2014 -0800 With the newly added glib.mk, some of the noinst_* variables need to use +=3D in the evaluation to avoid multiple definition warnings from automake. + +systemd.m4 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +systemd.m4 was contributed to by Luis R. Rodriguez , +its current home project can be found at: + +https://github.com/mcgrof/funk-systemd diff --git a/m4/systemd.m4 b/m4/systemd.m4 new file mode 100644 index 0000000..760bbad --- /dev/null +++ b/m4/systemd.m4 @@ -0,0 +1,123 @@ +# systemd.m4 - Macros to check for and enable systemd -*- Autoconf -*- +# +# Copyright (C) 2014 Luis R. Rodriguez +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +dnl Some optional path options +AC_DEFUN([AX_SYSTEMD_OPTIONS], [ + AC_ARG_WITH(systemd, [ --with-systemd set directory for systemd service files], + SYSTEMD_DIR=3D"$withval", SYSTEMD_DIR=3D"") + AC_SUBST(SYSTEMD_DIR) + + AC_ARG_WITH(systemd, [ --with-systemd-modules-load set directory for systemd modules load files], + SYSTEMD_MODULES_LOAD=3D"$withval", SYSTEMD_MODULES_LOAD=3D"") + AC_SUBST(SYSTEMD_MODULES_LOAD) +]) + +AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [ + AX_ARG_DEFAULT_ENABLE([systemd], [Disable systemd support]) + AX_SYSTEMD_OPTIONS() +]) + +AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ + AX_ARG_DEFAULT_DISABLE([systemd], [Enable systemd support]) + AX_SYSTEMD_OPTIONS() +]) + +AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ + AC_CHECK_HEADER([systemd/sd-daemon.h], [ + AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [libsystemddaemon=3D"y"]) + ]) + AS_IF([test "x$libsystemddaemon" =3D x], [ + AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) + ]) + + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + dnl pkg-config older than 0.24 does not set these for + dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 + dnl of systemd pkg-config --cflags currently yields no extra flags yet. + AC_SUBST([SYSTEMD_CFLAGS]) + AC_SUBST([SYSTEMD_LIBS]) + + AS_IF([test "x$SYSTEMD_DIR" =3D x], [ + dnl In order to use the line below we need to fix upstream systemd + dnl to properly ${prefix} for child variables in + dnl src/core/systemd.pc.in but this is a bit complex at the + dnl moment as they depend on another rootprefix, which can vary + dnl from prefix in practice. We provide our own definition as we + dnl *know* where systemd will dump this to, but this does limit + dnl us to stick to a non custom systemdsystemunitdir, to work + dnl around this we provide the additional configure option + dnl --with-systemd where you can specify the directory for the unit + dnl files. It would also be best to just extend the upstream + dnl pkg-config pkg.m4 with an AC_DEFUN() to do this neatly. + dnl SYSTEMD_DIR=3D"`$PKG_CONFIG --define-variable=3Dprefix=3D$PREFIX --variable=3Dsystemdsystemunitdir systemd`" + SYSTEMD_DIR=3D"\$(prefix)/lib/systemd/system/" + ], []) + + AS_IF([test "x$SYSTEMD_DIR" =3D x], [ + AC_MSG_ERROR([SYSTEMD_DIR is unset]) + ], []) + + dnl There is no variable for this yet for some reason + AS_IF([test "x$SYSTEMD_MODULES_LOAD" =3D x], [ + SYSTEMD_MODULES_LOAD=3D"\$(prefix)/lib/modules-load.d/" + ], []) + + AS_IF([test "x$SYSTEMD_MODULES_LOAD" =3D x], [ + AC_MSG_ERROR([SYSTEMD_MODULES_LOAD is unset]) + ], []) +]) + +AC_DEFUN([AX_CHECK_SYSTEMD], [ + dnl Respect user override to disable + AS_IF([test "x$enable_systemd" !=3D "xno"], [ + AS_IF([test "x$systemd" =3D "xy" ], [ + AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) + systemd=3Dy + AX_CHECK_SYSTEMD_LIBS() + ],[systemd=3Dn]) + ],[systemd=3Dn]) +]) + +AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ + AC_CHECK_HEADER([systemd/sd-daemon.h], [ + AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [systemd=3D"y"]) + ]) +]) + +dnl Enables systemd by default and requires a --disable-systemd option flag +dnl to configure if you want to disable. +AC_DEFUN([AX_ENABLE_SYSTEMD], [ + AX_ENABLE_SYSTEMD_OPTS() + AX_CHECK_SYSTEMD() +]) + +dnl Systemd will be disabled by default and requires you to run configure with +dnl --enable-systemd to look for and enable systemd. +AC_DEFUN([AX_ALLOW_SYSTEMD], [ + AX_ALLOW_SYSTEMD_OPTS() + AX_CHECK_SYSTEMD() +]) + +dnl Systemd will be disabled by default but if your build system is detected +dnl to have systemd build libraries it will be enabled. You can always force +dnl disable with --disable-systemd +AC_DEFUN([AX_AVAILABLE_SYSTEMD], [ + AX_ALLOW_SYSTEMD_OPTS() + AX_CHECK_SYSTEMD_ENABLE_AVAILABLE() + AX_CHECK_SYSTEMD() +]) diff --git a/tools/config.h.in b/tools/config.h.in index 40f3d1c..2a0ae48 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -42,6 +42,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Systemd available and enabled */ +#undef HAVE_SYSTEMD + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EVENTFD_H diff --git a/tools/configure b/tools/configure index 08d6a05..7c9bbca 100755 --- a/tools/configure +++ b/tools/configure @@ -624,6 +624,11 @@ ac_includes_default=3D"\ ac_subst_vars=3D'LTLIBOBJS LIBOBJS +SYSTEMD_LIBS +SYSTEMD_CFLAGS +SYSTEMD_MODULES_LOAD +SYSTEMD_DIR +systemd libiconv PTYFUNCS_LIBS PTHREAD_LIBS @@ -791,6 +796,8 @@ with_system_seabios with_system_ovmf with_extra_qemuu_configure_args with_xenstored +enable_systemd +with_systemd ' ac_precious_vars=3D'build_alias host_alias @@ -821,7 +828,9 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR glib_CFLAGS -glib_LIBS' +glib_LIBS +SYSTEMD_CFLAGS +SYSTEMD_LIBS' # Initialize some variables set by options. @@ -1453,6 +1462,7 @@ Optional Features: for Linux or NetBSD x86, otherwise off) --enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-traditional is enabled, otherwise off) + --enable-systemd Enable systemd support (default is DISABLED) Optional Packages: --with-PACKAGE[=3DARG] use PACKAGE [ARG=3Dyes] @@ -1481,6 +1491,8 @@ Optional Packages: ocaml dependencies resolved we'll enable the C xenstored for you. If you ask for oxenstored we'll complain until you resolve those dependencies + --with-systemd set directory for systemd service files + --with-systemd-modules-load set directory for systemd modules load files Some influential environment variables: CC C compiler command @@ -1516,6 +1528,10 @@ Some influential environment variables: path overriding pkg-config's built-in search path glib_CFLAGS C compiler flags for glib, overriding pkg-config glib_LIBS linker flags for glib, overriding pkg-config + SYSTEMD_CFLAGS + C compiler flags for SYSTEMD, overriding pkg-config + SYSTEMD_LIBS + linker flags for SYSTEMD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2235,7 +2251,7 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu -ac_config_files=3D"$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons" +ac_config_files=3D"$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xen-watchdog.service" ac_config_headers=3D"$ac_config_headers config.h" @@ -3626,6 +3642,42 @@ esac +# systemd.m4 - Macros to check for and enable systemd -*- Autoconf -*- +# +# Copyright (C) 2014 Luis R. Rodriguez +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + + + + + + + + + + + + + + + + + test "x$prefix" =3D "xNONE" && prefix=3D$ac_default_prefix @@ -8333,6 +8385,293 @@ done fi # ! $rump + + + +# Check whether --enable-systemd was given. +if test "${enable_systemd+set}" =3D set; then : + enableval=3D$enable_systemd; +fi + + +if test "x$enable_systemd" =3D "xno"; then : + + ax_cv_systemd=3D"n" + +elif test "x$enable_systemd" =3D "xyes"; then : + + ax_cv_systemd=3D"y" + +elif test -z $ax_cv_systemd; then : + + ax_cv_systemd=3D"n" + +fi +systemd=3D$ax_cv_systemd + + + + +# Check whether --with-systemd was given. +if test "${with_systemd+set}" =3D set; then : + withval=3D$with_systemd; SYSTEMD_DIR=3D"$withval" +else + SYSTEMD_DIR=3D"" +fi + + + + +# Check whether --with-systemd was given. +if test "${with_systemd+set}" =3D set; then : + withval=3D$with_systemd; SYSTEMD_MODULES_LOAD=3D"$withval" +else + SYSTEMD_MODULES_LOAD=3D"" +fi + + + + + + ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" +if test "x$ac_cv_header_systemd_sd_daemon_h" =3D xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 +$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } +if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=3D$LIBS +LIBS=3D"-lsystemd-daemon $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sd_listen_fds (); +int +main () +{ +return sd_listen_fds (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dyes +else + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=3D$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 +$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } +if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" =3D xyes; then : + systemd=3D"y" +fi + + +fi + + + + + if test "x$enable_systemd" !=3D "xno"; then : + + if test "x$systemd" =3D "xy" ; then : + + +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h + + systemd=3Dy + + ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" +if test "x$ac_cv_header_systemd_sd_daemon_h" =3D xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 +$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } +if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=3D$LIBS +LIBS=3D"-lsystemd-daemon $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sd_listen_fds (); +int +main () +{ +return sd_listen_fds (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dyes +else + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=3D$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 +$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } +if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" =3D xyes; then : + libsystemddaemon=3D"y" +fi + + +fi + + + if test "x$libsystemddaemon" =3D x; then : + + as_fn_error $=3F "Unable to find a suitable libsystemd-daemon library" "$LINENO" 5 + +fi + + +pkg_failed=3Dno +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 +$as_echo_n "checking for SYSTEMD... " >&6; } + +if test -n "$SYSTEMD_CFLAGS"; then + pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=3D$=3F + $as_echo "$as_me:${as_lineno-$LINENO}: \$=3F =3D $ac_status" >&5 + test $ac_status =3D 0; }; then + pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` + test "x$=3F" !=3D "x0" && pkg_failed=3Dyes +else + pkg_failed=3Dyes +fi + else + pkg_failed=3Duntried +fi +if test -n "$SYSTEMD_LIBS"; then + pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=3D$=3F + $as_echo "$as_me:${as_lineno-$LINENO}: \$=3F =3D $ac_status" >&5 + test $ac_status =3D 0; }; then + pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` + test "x$=3F" !=3D "x0" && pkg_failed=3Dyes +else + pkg_failed=3Dyes +fi + else + pkg_failed=3Duntried +fi + + + +if test $pkg_failed =3D yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=3Dyes +else + _pkg_short_errors_supported=3Dno +fi + if test $_pkg_short_errors_supported =3D yes; then + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + else + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_PKG_ERRORS" >&5 + + as_fn_error $=3F "Package requirements (libsystemd-daemon) were not met: + +$SYSTEMD_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables SYSTEMD_CFLAGS +and SYSTEMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed =3D untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $=3F "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables SYSTEMD_CFLAGS +and SYSTEMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS + SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + + if test "x$SYSTEMD_DIR" =3D x; then : + + SYSTEMD_DIR=3D"\$(prefix)/lib/systemd/system/" + +fi + + if test "x$SYSTEMD_DIR" =3D x; then : + + as_fn_error $=3F "SYSTEMD_DIR is unset" "$LINENO" 5 + +fi + + if test "x$SYSTEMD_MODULES_LOAD" =3D x; then : + + SYSTEMD_MODULES_LOAD=3D"\$(prefix)/lib/modules-load.d/" + +fi + + if test "x$SYSTEMD_MODULES_LOAD" =3D x; then : + + as_fn_error $=3F "SYSTEMD_MODULES_LOAD is unset" "$LINENO" 5 + +fi + + +else + systemd=3Dn +fi + +else + systemd=3Dn +fi + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9028,6 +9367,15 @@ do "../config/Tools.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/Tools.mk" ;; "hotplug/Linux/init.d/xencommons.in") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;; "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; + "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;; + "hotplug/Linux/systemd/var-lib-xenstored.mount") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/var-lib-xenstored.mount" ;; + "hotplug/Linux/systemd/xenstored.socket") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenstored.socket" ;; + "hotplug/Linux/systemd/xenstored_ro.socket") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenstored_ro.socket" ;; + "hotplug/Linux/systemd/xenstored.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenstored.service" ;; + "hotplug/Linux/systemd/xenconsoled.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenconsoled.service" ;; + "hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service" ;; + "hotplug/Linux/systemd/xendomains.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xendomains.service" ;; + "hotplug/Linux/systemd/xen-watchdog.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xen-watchdog.service" ;; "config.h") CONFIG_HEADERS=3D"$CONFIG_HEADERS config.h" ;; *) as_fn_error $=3F "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/tools/configure.ac b/tools/configure.ac index e74fe4b..f44b9f3 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -9,6 +9,15 @@ AC_CONFIG_FILES([ ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons +hotplug/Linux/systemd/proc-xen.mount +hotplug/Linux/systemd/var-lib-xenstored.mount +hotplug/Linux/systemd/xenstored.socket +hotplug/Linux/systemd/xenstored_ro.socket +hotplug/Linux/systemd/xenstored.service +hotplug/Linux/systemd/xenconsoled.service +hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service +hotplug/Linux/systemd/xendomains.service +hotplug/Linux/systemd/xen-watchdog.service ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) @@ -59,6 +68,7 @@ m4_include([../m4/fetcher.m4]) m4_include([../m4/ax_compare_version.m4]) m4_include([../m4/paths.m4]) m4_include([../m4/xenstored.m4]) +m4_include([../m4/systemd.m4]) AX_XEN_EXPAND_CONFIG() @@ -310,5 +320,6 @@ AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h valgrind/memcheck.h utmp.h]) fi # ! $rump +AX_AVAILABLE_SYSTEMD() AC_OUTPUT() diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 3d2d344..d5a9ed2 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -25,6 +25,8 @@ XEN_SCRIPTS +=3D vscsi XEN_SCRIPTS +=3D block-iscsi XEN_SCRIPTS +=3D $(XEN_SCRIPTS-y) +SUBDIRS-$(CONFIG_SYSTEMD) +=3D systemd + XEN_SCRIPT_DATA =3D xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA +=3D xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA +=3D block-common.sh @@ -33,7 +35,7 @@ UDEV_RULES_DIR =3D $(CONFIG_DIR)/udev UDEV_RULES =3D xen-backend.rules $(UDEV_RULES-y) .PHONY: all -all: $(XENCOMMONS_INITD) +all: $(XENCOMMONS_INITD) subdirs-all $(XENCOMMONS_INITD): $(XEN_ROOT)/config/$(XEN_OS).modules $(XENCOMMONS_INITD).in $(XEN_ROOT)/tools/hotplug/Linux/update-modules.sh \ @@ -45,7 +47,7 @@ $(XENCOMMONS_INITD): $(XEN_ROOT)/config/$(XEN_OS).modules $(XENCOMMONS_INITD).in build: all .PHONY: install -install: all install-initd install-scripts install-udev +install: all install-initd install-scripts install-udev subdirs-install # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd @@ -83,4 +85,4 @@ install-udev: done .PHONY: clean -clean: +clean: subdirs-clean diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile new file mode 100644 index 0000000..dc98b67 --- /dev/null +++ b/tools/hotplug/Linux/systemd/Makefile @@ -0,0 +1,67 @@ +XEN_ROOT =3D $(CURDIR)/../../../.. +include $(XEN_ROOT)/tools/Rules.mk + +XEN_SYSTEMD_MODULES =3D xen.conf + +XEN_SYSTEMD_MOUNT =3D proc-xen.mount +XEN_SYSTEMD_MOUNT +=3D var-lib-xenstored.mount + +XEN_SYSTEMD_SOCKET =3D xenstored.socket +XEN_SYSTEMD_SOCKET +=3D xenstored_ro.socket + +XEN_SYSTEMD_SERVICE =3D xenstored.service +XEN_SYSTEMD_SERVICE +=3D xenconsoled.service +XEN_SYSTEMD_SERVICE +=3D xen-qemu-dom0-disk-backend.service +XEN_SYSTEMD_SERVICE +=3D xendomains.service +XEN_SYSTEMD_SERVICE +=3D xen-watchdog.service + +ALL_XEN_SYSTEMD =3D $(XEN_SYSTEMD_MODULES) \ + $(XEN_SYSTEMD_MOUNT) \ + $(XEN_SYSTEMD_SOCKET) \ + $(XEN_SYSTEMD_SERVICE) + +.PHONY: all +all: $(ALL_XEN_SYSTEMD) + +.PHONY: clean +clean: + +.PHONY: install +install: $(ALL_XEN_SYSTEMD) + [ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) + [ -d $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_DATA) *.socket $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + +$(XEN_SYSTEMD_MODULES): $(XEN_ROOT)/config/$(XEN_OS).modules + @set -e ; \ + IFS=3D'' ;\ + cat $(XEN_ROOT)/config/$(XEN_OS).modules | ( \ + while read l ; do \ + if echo $${l} | egrep -q "^#" ; then \ + continue ;\ + fi ;\ + if echo "$${l}" | egrep -q "\|" ; then \ + m1=3D$${l%%|*} ;\ + m2=3D$${l#*|} ;\ + # Systemd modules-load.d lacks support ;\ + # for module replacement options, we ;\ + # need to add that support upstream but ;\ + # its best instead to ensure this file ;\ + # is no longer needed. Some folks ;\ + # however have reported issues with ;\ + # some modules automatically loading ;\ + # so we just load all necessary xen ;\ + # modules and for replacements we load ;\ + # the latest module ;\ + echo "$$m1" ;\ + echo "$$m2" ;\ + else \ + echo "$$l" ;\ + fi ;\ + done \ + ) > $@ diff --git a/tools/hotplug/Linux/systemd/proc-xen.mount.in b/tools/hotplug/Linux/systemd/proc-xen.mount.in new file mode 100644 index 0000000..f0c4f3a --- /dev/null +++ b/tools/hotplug/Linux/systemd/proc-xen.mount.in @@ -0,0 +1,9 @@ +[Unit] +Description=3DMount /proc/xen files +ConditionVirtualization=3Dxen +RefuseManualStop=3Dtrue + +[Mount] +What=3Dxenfs +Where=3D/proc/xen +Type=3Dxenfs diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in new file mode 100644 index 0000000..44dfce8 --- /dev/null +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -0,0 +1,13 @@ +[Unit] +Description=3Dmount xenstore file system +ConditionVirtualization=3Dxen +RefuseManualStop=3Dtrue + +[Mount] +Environment=3DXENSTORED_MOUNT_CTX=3Dnone +EnvironmentFile=3D-/etc/sysconfig/xenstored +EnvironmentFile=3D-/etc/default/xenstored +What=3Dxenstore +Where=3D@XEN_LIB_STORED@ +Type=3Dtmpfs +Options=3Dmode=3D755,context=3D"$XENSTORED_MOUNT_CTX" diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in new file mode 100644 index 0000000..8dbd110 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -0,0 +1,22 @@ +[Unit] +Description=3Dqemu for xen dom0 disk backend +Requires=3Dproc-xen.mount var-lib-xenstored.mount xenstored.socket +After=3Dxenstored.service xenconsoled.service +Before=3Dxendomains.service libvirtd.service libvirt-guests.service +RefuseManualStop=3Dtrue +ConditionVirtualization=3Dxen + +[Service] +Type=3Dsimple +EnvironmentFile=3D-/etc/default/xenstored +EnvironmentFile=3D-/etc/sysconfig/xenstored +PIDFile=3D@XEN_RUN_DIR@/qemu-dom0.pid +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStartPre=3D/bin/mkdir -p /var/run/xen +ExecStart=3D@LIBEXEC@/qemu-system-i386 -xen-domid 0 \ + -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile @XEN_RUN_DIR@/qemu-dom0.pid + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xen-watchdog.service.in b/tools/hotplug/Linux/systemd/xen-watchdog.service.in new file mode 100644 index 0000000..acb2b77 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xen-watchdog.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=3DXen-watchdog - run xen watchdog daemon +Requires=3Dproc-xen.mount +After=3Dproc-xen.mount xendomains.service +ConditionVirtualization=3Dxen + +[Service] +Type=3Dforking +ExecStart=3D@SBINDIR@/xenwatchdogd 30 15 +KillSignal=3DUSR1 + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in new file mode 100644 index 0000000..15fad35 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -0,0 +1,20 @@ +[Unit] +Description=3DXenconsoled - handles logging from guest consoles and hypervisor +Requires=3Dxenstored.socket +After=3Dxenstored.service +ConditionVirtualization=3Dxen + +[Service] +Type=3Dsimple +Environment=3DXENCONSOLED_ARGS=3D +Environment=3DXENCONSOLED_LOG=3Dnone +Environment=3DXENCONSOLED_LOG_DIR=3D@XEN_LOG_DIR@/console +EnvironmentFile=3D-/etc/default/xenconsoled +EnvironmentFile=3D-/etc/sysconfig/xenconsoled +PIDFile=3D@XEN_RUN_DIR@/xenconsoled.pid +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStartPre=3D/bin/mkdir -p ${XENCONSOLED_LOG_DIR} +ExecStart=3D@SBINDIR@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=3D${XENCONSOLED_LOG} --log-dir=3D${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in new file mode 100644 index 0000000..70ce7c0 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -0,0 +1,16 @@ +[Unit] +Description=3DXendomains - start and stop guests on boot and shutdown +Requires=3Dxenstored.socket +After=3Dxenstored.service xenconsoled.service +ConditionVirtualization=3Dxen + +[Service] +Type=3Doneshot +RemainAfterExit=3Dtrue +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStart=3D-@LIBEXEC@/xendomains start +ExecStop=3D@LIBEXEC@/xendomains stop +ExecReload=3D@LIBEXEC@/xendomains restart + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in new file mode 100644 index 0000000..4a9fcee --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -0,0 +1,27 @@ +[Unit] +Description=3DThe Xen xenstore +Requires=3Dxenstored_ro.socket xenstored.socket proc-xen.mount var-lib-xenstored.mount +After=3Dproc-xen.mount var-lib-xenstored.mount +Before=3Dlibvirtd.service libvirt-guests.service +RefuseManualStop=3Dtrue +ConditionVirtualization=3Dxen + +[Service] +Type=3Dnotify +Environment=3DXENSTORED_ARGS=3D +Environment=3DXENSTORED_ROOTDIR=3D@XEN_LIB_STORED@ +Environment=3DXENSTORED=3D@XENSTORED@ +EnvironmentFile=3D-/etc/default/xencommons +EnvironmentFile=3D-/etc/sysconfig/xencommons +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStartPre=3D-/bin/rm -f @XEN_LIB_STORED@/tdb* +ExecStartPre=3D/bin/mkdir -p @XEN_RUN_DIR@ +ExecStart=3D/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS" +ExecStartPost=3D-@BINDIR@/xenstore-write "/local/domain/0/name" "Domain-0" +ExecStartPost=3D-@BINDIR@/xenstore-write "/local/domain/0/domid" 0 + +[Install] +WantedBy=3Dmulti-user.target +Also=3Dxenstored_ro.socket xenstored.socket +Also=3Dproc-xen.mount +Also=3Dvar-lib-xenstored.mount diff --git a/tools/hotplug/Linux/systemd/xenstored.socket.in b/tools/hotplug/Linux/systemd/xenstored.socket.in new file mode 100644 index 0000000..461e4f4 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenstored.socket.in @@ -0,0 +1,11 @@ +[Unit] +Description=3Dxenstore socket +ConditionVirtualization=3Dxen + +[Socket] +ListenStream=3D/var/run/xenstored/socket +SocketMode=3D0600 +Service=3Dxenstored.service + +[Install] +WantedBy=3Dsockets.target diff --git a/tools/hotplug/Linux/systemd/xenstored_ro.socket.in b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in new file mode 100644 index 0000000..6ab5c28 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in @@ -0,0 +1,11 @@ +[Unit] +Description=3Dxenstore ro socket +ConditionVirtualization=3Dxen + +[Socket] +ListenStream=3D/var/run/xenstored/socket_ro +SocketMode=3D0660 +Service=3Dxenstored.service + +[Install] +WantedBy=3Dsockets.target diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 382a813..068e04a 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -3,6 +3,11 @@ OCAML_TOPLEVEL =3D $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make CFLAGS +=3D -I$(XEN_ROOT)/tools/ +CFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_CFLAGS) +LDFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_LIBS) + +CFLAGS +=3D $(CFLAGS-y) +LDFLAGS +=3D $(LDFLAGS-y) OCAMLINCLUDE +=3D \ -I $(OCAML_TOPLEVEL)/libs/xb \ diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 08460c8..48f1e96 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -9,6 +9,12 @@ CFLAGS +=3D -I. CFLAGS +=3D -I$(XEN_ROOT)/tools/ CFLAGS +=3D $(CFLAGS_libxenctrl) +CFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_CFLAGS) +LDFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_LIBS) + +CFLAGS +=3D $(CFLAGS-y) +LDFLAGS +=3D $(LDFLAGS-y) + CLIENTS :=3D xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS +=3D xenstore-write xenstore-ls xenstore-watch -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6490996193720369296== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============6490996193720369296==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKl-0001NT-AY; Tue, 12 Aug 2014 19:02:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKk-0001N4-3H for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:10 +0000 Content-Length: 43362 Received: from [85.158.137.68:57725] by server-12.bemta-3.messagelabs.com id D9/5D-02460-1B46AE35; Tue, 12 Aug 2014 19:02:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407870125!9559212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_23,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2680 invoked from network); 12 Aug 2014 19:02:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKf-000053-Mi for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKf-0003Hc-KO for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:05 +0000 Date: Tue, 12 Aug 2014 19:02:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] systemd: add xen systemd service and module files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6490996193720369296==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6490996193720369296== Content-Length: 44110 Content-Transfer-Encoding: quoted-printable commit 015330004ec6f6658aa454aec301cad6083a87df Author: Luis R. Rodriguez AuthorDate: Wed Jul 30 09:40:03 2014 -0700 Commit: Ian Campbell CommitDate: Mon Aug 4 14:58:24 2014 +0100 systemd: add xen systemd service and module files This adds the systemd xen service / module files and integrates support into the build system. This goes in with AX_AVAILABLE_SYSTEMD() which will enable systemd if development libraries have been found on your build system. If you don't have systemd on target systems for binaries built with systemd then the binary will not work, you must explicitly disable systemd support if you do not want to build systemd support. When systemd libraries are present only systems that have booted into systemd go through the systemd initialization, otherwise the SysVinit is used. These are originally based on the Fedora systemd files. Changes made from Fedora's systemd files: * split sockets into two files to claim different permissions * Use /bin/sh -c exec to for a simple launcher implementation * enables systemd socket activation for C xenstored and Ocaml oxenstored * use sd_notify(), so change the service to Type=3Dnotify, because of this we remove the PIDFile specification as we don't care for it, and let systemd do its magic for us, this also means we don't have to fork so we use --no-fork with systemd * defines a modules-load.d, its original source file will be shared between systemd and old init systems * simplify service files with ConditionVirtualization=3Dxen which uses the built in systemd virtualization backend detection, these service files will not be available to start on systems that do not boot with xen as a hypervisor * use autoconf to replace @variable@ paths for us which piggy backs on top of the latest autoconf changes to xen * removes oxenstored service file in favor of a system variable which controls which which xentored to use at run time, we avoid multiple service files this way. * simplifies startup to not require polling on the sockets as initial socket management is handled by systemd, we just take on the socket later once anything pokes at it, a simple nc -U (as root) on any of the sockets files can activate the service for example. Anything queued up will be sent to us once we start. Socket activation should in theory also let us dynamically switch between xenstores but more importantly we could upgrade xenstored while keeping all active socket communication queued up, but in order to take advantage of this we eventually would need to remove the requirement of not being able to bring down the xenstored. Even though active sockets are supported since most libxl communication doesn't triggger a check on the unix socket first administrators are encouraged to enable the xenstored.service to triggger an initialization of the xenstored upon bring up. Some systems also never use unix sockets for communication with the xenstored and as such active sockets will not be used there. * allow for xenstored configuration through *either* of these configuration files: - /etc/sysconfig/xenstored - /etc/default/xenstored The /etc/default/xenstored will let debian based systems do the same, while SUSE/OpenSUSE/Fedora/RedHat can keep on chugging with sysconfig. We leave these files all commented out by default though given that for systemd we want to encourage not using them. * ensures we create the run directory as most systems will likely be using a tmpfs for run dirs for the pid files * Some systems define the selinux context in the systemd Option for the /var/lib/xenstored tmpfs: Options=3Dmode=3D755,context=3D"system_u:object_r:xenstored_var_lib_t:s0" For the upstream version we remove that and let systems specify the context on their system /etc/default/xenstored or /etc/sysconfig/xenstored $XENSTORED_MOUNT_CTX variable, with a default to none. * takes advantage of the shared xendomains helper for the xendomains service * Add the new dom0 that gets kicked off for disk backend access into its own systemd service associated to xen We end up with these systemd files: General requirements: * proc-xen.mount * var-lib-xenstored.mount xenstored: * xenstored.service * xenstored.socket * xenstored_ro.socket * xenconsoled.service * xen-qemu-dom0-disk-backend.service.in Optional: * xendomains.service * xen-watchdog.service As for integration with xen, we house keep all the systemd files under a new directory tools/hotplug/Linux/systemd/ and will be targeted by default when building on Linux systems if systemd development libraries are present at build time. The systemd files will be sanitized for meta @VARIABLES@ upon configuration and installed upon the install target. Systems that do not use systemd can still get systemd service unit files installed if the build system enabled systemd support, this however does not mandate a requirement of having systemd libraries present. Old init scripts are always installed. If you don't specify a prefix you will end up with the services files under /usr/local/lib/systemd/system/ by default, and systemd modules-load.d conf files under /usr/local/lib/modules-load.d/ which systemd does look for (although it seems this is not documented). Distributions are expected to provide their /usr/ prefix to end up in the more generic location upon distribution install at /usr/lib/systemd/system/ and /usr/lib/modules-load.d/ respectively. Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Jan R=C4=99korajski Cc: M A Young Cc: Jacek Konieczny Cc: xen-devel@lists.xenproject.org Signed-off-by: Luis R. Rodriguez Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- .gitignore | 5 + Makefile | 6 +- README | 16 + config/Tools.mk.in | 6 + m4/README.source | 8 + m4/systemd.m4 | 123 +++++++ tools/config.h.in | 3 + tools/configure | 352 +++++++++++++++++++- tools/configure.ac | 11 + tools/hotplug/Linux/Makefile | 8 +- tools/hotplug/Linux/systemd/Makefile | 67 ++++ tools/hotplug/Linux/systemd/proc-xen.mount.in | 9 + .../Linux/systemd/var-lib-xenstored.mount.in | 13 + .../systemd/xen-qemu-dom0-disk-backend.service.in | 22 ++ .../hotplug/Linux/systemd/xen-watchdog.service.in | 13 + tools/hotplug/Linux/systemd/xenconsoled.service.in | 20 ++ tools/hotplug/Linux/systemd/xendomains.service.in | 16 + tools/hotplug/Linux/systemd/xenstored.service.in | 27 ++ tools/hotplug/Linux/systemd/xenstored.socket.in | 11 + tools/hotplug/Linux/systemd/xenstored_ro.socket.in | 11 + tools/ocaml/xenstored/Makefile | 5 + tools/xenstore/Makefile | 6 + 22 files changed, 752 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f1d1b9c..6d725aa 100644 --- a/.gitignore +++ b/.gitignore @@ -353,3 +353,8 @@ tools/xenstore/xenstore-watch docs/txt/misc/*.txt docs/txt/man/*.txt docs/figs/*.png + +tools/hotplug/Linux/systemd/*.conf +tools/hotplug/Linux/systemd/*.mount +tools/hotplug/Linux/systemd/*.socket +tools/hotplug/Linux/systemd/*.service diff --git a/Makefile b/Makefile index 41dabbf..580df64 100644 --- a/Makefile +++ b/Makefile @@ -216,8 +216,12 @@ uninstall: rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains + rm -f $(D)$(SBINDIR)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons - rm -rf $(D)/var/run/xen* $(D)/var/lib/xen* + rm -f $(D)$(XEN_SYSTEMD_DIR)/*.service + rm -f $(D)$(XEN_SYSTEMD_DIR)/*.mount + rm -f $(D)$(XEN_SYSTEMD_MODULES_LOAD)/*.conf + rm -rf $(D)$(XEN_RUN_DIR)* $(D)/var/lib/xen* make -C tools uninstall rm -rf $(D)/boot/tboot* diff --git a/README b/README index 7c27fbb..81bf938 100644 --- a/README +++ b/README @@ -72,6 +72,7 @@ disabled at compile time: * cmake (if building vtpm stub domains) * markdown * figlet (for generating the traditional Xen start of day banner) + * systemd daemon development files Second, you need to acquire a suitable kernel for use in domain 0. If possible you should use a kernel provided by your OS distributor. If @@ -161,6 +162,21 @@ change take effect. [1] http://wiki.xen.org/wiki/XenStoreReference [2] http://wiki.xen.org/wiki/Xenstored +Systemd support +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +If you have systemd development packages installed you can build binaries +with systemd support. Systemd support is enabled by default if you have +systemd development libraries present. If you want to force enable systemd to +ensure you build binaries with systemd support you can use the --enable-systemd +flag. Likewise if you want to force disable systemd you can use: + + ./configure --disable-systemd + +For more details refer to the xen xenstored systemd wiki page [3]. + +[3] http://wiki.xen.org/wiki/Xenstored#xenstored_systemd_support + Python Runtime Libraries =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 748cc69..974e28e 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -63,6 +63,12 @@ CONFIG_BLKTAP2 :=3D @blktap2@ CONFIG_VTPM :=3D @vtpm@ CONFIG_QEMUU_EXTRA_ARGS:=3D @EXTRA_QEMUU_CONFIGURE_ARGS@ +CONFIG_SYSTEMD :=3D @systemd@ +SYSTEMD_CFLAGS :=3D @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS :=3D @SYSTEMD_LIBS@ +XEN_SYSTEMD_DIR :=3D @SYSTEMD_DIR@ +XEN_SYSTEMD_MODULES_LOAD :=3D @SYSTEMD_MODULES_LOAD@ + #System options ZLIB :=3D @zlib@ CONFIG_LIBICONV :=3D @libiconv@ diff --git a/m4/README.source b/m4/README.source index 8922ea0..21850a6 100644 --- a/m4/README.source +++ b/m4/README.source @@ -26,3 +26,11 @@ Date: Mon Feb 3 15:59:18 2014 -0800 With the newly added glib.mk, some of the noinst_* variables need to use +=3D in the evaluation to avoid multiple definition warnings from automake. + +systemd.m4 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +systemd.m4 was contributed to by Luis R. Rodriguez , +its current home project can be found at: + +https://github.com/mcgrof/funk-systemd diff --git a/m4/systemd.m4 b/m4/systemd.m4 new file mode 100644 index 0000000..760bbad --- /dev/null +++ b/m4/systemd.m4 @@ -0,0 +1,123 @@ +# systemd.m4 - Macros to check for and enable systemd -*- Autoconf -*- +# +# Copyright (C) 2014 Luis R. Rodriguez +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +dnl Some optional path options +AC_DEFUN([AX_SYSTEMD_OPTIONS], [ + AC_ARG_WITH(systemd, [ --with-systemd set directory for systemd service files], + SYSTEMD_DIR=3D"$withval", SYSTEMD_DIR=3D"") + AC_SUBST(SYSTEMD_DIR) + + AC_ARG_WITH(systemd, [ --with-systemd-modules-load set directory for systemd modules load files], + SYSTEMD_MODULES_LOAD=3D"$withval", SYSTEMD_MODULES_LOAD=3D"") + AC_SUBST(SYSTEMD_MODULES_LOAD) +]) + +AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [ + AX_ARG_DEFAULT_ENABLE([systemd], [Disable systemd support]) + AX_SYSTEMD_OPTIONS() +]) + +AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ + AX_ARG_DEFAULT_DISABLE([systemd], [Enable systemd support]) + AX_SYSTEMD_OPTIONS() +]) + +AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ + AC_CHECK_HEADER([systemd/sd-daemon.h], [ + AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [libsystemddaemon=3D"y"]) + ]) + AS_IF([test "x$libsystemddaemon" =3D x], [ + AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) + ]) + + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + dnl pkg-config older than 0.24 does not set these for + dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 + dnl of systemd pkg-config --cflags currently yields no extra flags yet. + AC_SUBST([SYSTEMD_CFLAGS]) + AC_SUBST([SYSTEMD_LIBS]) + + AS_IF([test "x$SYSTEMD_DIR" =3D x], [ + dnl In order to use the line below we need to fix upstream systemd + dnl to properly ${prefix} for child variables in + dnl src/core/systemd.pc.in but this is a bit complex at the + dnl moment as they depend on another rootprefix, which can vary + dnl from prefix in practice. We provide our own definition as we + dnl *know* where systemd will dump this to, but this does limit + dnl us to stick to a non custom systemdsystemunitdir, to work + dnl around this we provide the additional configure option + dnl --with-systemd where you can specify the directory for the unit + dnl files. It would also be best to just extend the upstream + dnl pkg-config pkg.m4 with an AC_DEFUN() to do this neatly. + dnl SYSTEMD_DIR=3D"`$PKG_CONFIG --define-variable=3Dprefix=3D$PREFIX --variable=3Dsystemdsystemunitdir systemd`" + SYSTEMD_DIR=3D"\$(prefix)/lib/systemd/system/" + ], []) + + AS_IF([test "x$SYSTEMD_DIR" =3D x], [ + AC_MSG_ERROR([SYSTEMD_DIR is unset]) + ], []) + + dnl There is no variable for this yet for some reason + AS_IF([test "x$SYSTEMD_MODULES_LOAD" =3D x], [ + SYSTEMD_MODULES_LOAD=3D"\$(prefix)/lib/modules-load.d/" + ], []) + + AS_IF([test "x$SYSTEMD_MODULES_LOAD" =3D x], [ + AC_MSG_ERROR([SYSTEMD_MODULES_LOAD is unset]) + ], []) +]) + +AC_DEFUN([AX_CHECK_SYSTEMD], [ + dnl Respect user override to disable + AS_IF([test "x$enable_systemd" !=3D "xno"], [ + AS_IF([test "x$systemd" =3D "xy" ], [ + AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) + systemd=3Dy + AX_CHECK_SYSTEMD_LIBS() + ],[systemd=3Dn]) + ],[systemd=3Dn]) +]) + +AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ + AC_CHECK_HEADER([systemd/sd-daemon.h], [ + AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [systemd=3D"y"]) + ]) +]) + +dnl Enables systemd by default and requires a --disable-systemd option flag +dnl to configure if you want to disable. +AC_DEFUN([AX_ENABLE_SYSTEMD], [ + AX_ENABLE_SYSTEMD_OPTS() + AX_CHECK_SYSTEMD() +]) + +dnl Systemd will be disabled by default and requires you to run configure with +dnl --enable-systemd to look for and enable systemd. +AC_DEFUN([AX_ALLOW_SYSTEMD], [ + AX_ALLOW_SYSTEMD_OPTS() + AX_CHECK_SYSTEMD() +]) + +dnl Systemd will be disabled by default but if your build system is detected +dnl to have systemd build libraries it will be enabled. You can always force +dnl disable with --disable-systemd +AC_DEFUN([AX_AVAILABLE_SYSTEMD], [ + AX_ALLOW_SYSTEMD_OPTS() + AX_CHECK_SYSTEMD_ENABLE_AVAILABLE() + AX_CHECK_SYSTEMD() +]) diff --git a/tools/config.h.in b/tools/config.h.in index 40f3d1c..2a0ae48 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -42,6 +42,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Systemd available and enabled */ +#undef HAVE_SYSTEMD + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_EVENTFD_H diff --git a/tools/configure b/tools/configure index 08d6a05..7c9bbca 100755 --- a/tools/configure +++ b/tools/configure @@ -624,6 +624,11 @@ ac_includes_default=3D"\ ac_subst_vars=3D'LTLIBOBJS LIBOBJS +SYSTEMD_LIBS +SYSTEMD_CFLAGS +SYSTEMD_MODULES_LOAD +SYSTEMD_DIR +systemd libiconv PTYFUNCS_LIBS PTHREAD_LIBS @@ -791,6 +796,8 @@ with_system_seabios with_system_ovmf with_extra_qemuu_configure_args with_xenstored +enable_systemd +with_systemd ' ac_precious_vars=3D'build_alias host_alias @@ -821,7 +828,9 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR glib_CFLAGS -glib_LIBS' +glib_LIBS +SYSTEMD_CFLAGS +SYSTEMD_LIBS' # Initialize some variables set by options. @@ -1453,6 +1462,7 @@ Optional Features: for Linux or NetBSD x86, otherwise off) --enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-traditional is enabled, otherwise off) + --enable-systemd Enable systemd support (default is DISABLED) Optional Packages: --with-PACKAGE[=3DARG] use PACKAGE [ARG=3Dyes] @@ -1481,6 +1491,8 @@ Optional Packages: ocaml dependencies resolved we'll enable the C xenstored for you. If you ask for oxenstored we'll complain until you resolve those dependencies + --with-systemd set directory for systemd service files + --with-systemd-modules-load set directory for systemd modules load files Some influential environment variables: CC C compiler command @@ -1516,6 +1528,10 @@ Some influential environment variables: path overriding pkg-config's built-in search path glib_CFLAGS C compiler flags for glib, overriding pkg-config glib_LIBS linker flags for glib, overriding pkg-config + SYSTEMD_CFLAGS + C compiler flags for SYSTEMD, overriding pkg-config + SYSTEMD_LIBS + linker flags for SYSTEMD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2235,7 +2251,7 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu -ac_config_files=3D"$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons" +ac_config_files=3D"$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xen-watchdog.service" ac_config_headers=3D"$ac_config_headers config.h" @@ -3626,6 +3642,42 @@ esac +# systemd.m4 - Macros to check for and enable systemd -*- Autoconf -*- +# +# Copyright (C) 2014 Luis R. Rodriguez +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + + + + + + + + + + + + + + + + + test "x$prefix" =3D "xNONE" && prefix=3D$ac_default_prefix @@ -8333,6 +8385,293 @@ done fi # ! $rump + + + +# Check whether --enable-systemd was given. +if test "${enable_systemd+set}" =3D set; then : + enableval=3D$enable_systemd; +fi + + +if test "x$enable_systemd" =3D "xno"; then : + + ax_cv_systemd=3D"n" + +elif test "x$enable_systemd" =3D "xyes"; then : + + ax_cv_systemd=3D"y" + +elif test -z $ax_cv_systemd; then : + + ax_cv_systemd=3D"n" + +fi +systemd=3D$ax_cv_systemd + + + + +# Check whether --with-systemd was given. +if test "${with_systemd+set}" =3D set; then : + withval=3D$with_systemd; SYSTEMD_DIR=3D"$withval" +else + SYSTEMD_DIR=3D"" +fi + + + + +# Check whether --with-systemd was given. +if test "${with_systemd+set}" =3D set; then : + withval=3D$with_systemd; SYSTEMD_MODULES_LOAD=3D"$withval" +else + SYSTEMD_MODULES_LOAD=3D"" +fi + + + + + + ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" +if test "x$ac_cv_header_systemd_sd_daemon_h" =3D xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 +$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } +if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=3D$LIBS +LIBS=3D"-lsystemd-daemon $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sd_listen_fds (); +int +main () +{ +return sd_listen_fds (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dyes +else + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=3D$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 +$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } +if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" =3D xyes; then : + systemd=3D"y" +fi + + +fi + + + + + if test "x$enable_systemd" !=3D "xno"; then : + + if test "x$systemd" =3D "xy" ; then : + + +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h + + systemd=3Dy + + ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" +if test "x$ac_cv_header_systemd_sd_daemon_h" =3D xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 +$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } +if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=3D$LIBS +LIBS=3D"-lsystemd-daemon $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sd_listen_fds (); +int +main () +{ +return sd_listen_fds (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dyes +else + ac_cv_lib_systemd_daemon_sd_listen_fds=3Dno +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=3D$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 +$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } +if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" =3D xyes; then : + libsystemddaemon=3D"y" +fi + + +fi + + + if test "x$libsystemddaemon" =3D x; then : + + as_fn_error $=3F "Unable to find a suitable libsystemd-daemon library" "$LINENO" 5 + +fi + + +pkg_failed=3Dno +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 +$as_echo_n "checking for SYSTEMD... " >&6; } + +if test -n "$SYSTEMD_CFLAGS"; then + pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=3D$=3F + $as_echo "$as_me:${as_lineno-$LINENO}: \$=3F =3D $ac_status" >&5 + test $ac_status =3D 0; }; then + pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` + test "x$=3F" !=3D "x0" && pkg_failed=3Dyes +else + pkg_failed=3Dyes +fi + else + pkg_failed=3Duntried +fi +if test -n "$SYSTEMD_LIBS"; then + pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=3D$=3F + $as_echo "$as_me:${as_lineno-$LINENO}: \$=3F =3D $ac_status" >&5 + test $ac_status =3D 0; }; then + pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` + test "x$=3F" !=3D "x0" && pkg_failed=3Dyes +else + pkg_failed=3Dyes +fi + else + pkg_failed=3Duntried +fi + + + +if test $pkg_failed =3D yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=3Dyes +else + _pkg_short_errors_supported=3Dno +fi + if test $_pkg_short_errors_supported =3D yes; then + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + else + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_PKG_ERRORS" >&5 + + as_fn_error $=3F "Package requirements (libsystemd-daemon) were not met: + +$SYSTEMD_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables SYSTEMD_CFLAGS +and SYSTEMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed =3D untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $=3F "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables SYSTEMD_CFLAGS +and SYSTEMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + SYSTEMD_CFLAGS=3D$pkg_cv_SYSTEMD_CFLAGS + SYSTEMD_LIBS=3D$pkg_cv_SYSTEMD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + + if test "x$SYSTEMD_DIR" =3D x; then : + + SYSTEMD_DIR=3D"\$(prefix)/lib/systemd/system/" + +fi + + if test "x$SYSTEMD_DIR" =3D x; then : + + as_fn_error $=3F "SYSTEMD_DIR is unset" "$LINENO" 5 + +fi + + if test "x$SYSTEMD_MODULES_LOAD" =3D x; then : + + SYSTEMD_MODULES_LOAD=3D"\$(prefix)/lib/modules-load.d/" + +fi + + if test "x$SYSTEMD_MODULES_LOAD" =3D x; then : + + as_fn_error $=3F "SYSTEMD_MODULES_LOAD is unset" "$LINENO" 5 + +fi + + +else + systemd=3Dn +fi + +else + systemd=3Dn +fi + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9028,6 +9367,15 @@ do "../config/Tools.mk") CONFIG_FILES=3D"$CONFIG_FILES ../config/Tools.mk" ;; "hotplug/Linux/init.d/xencommons.in") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;; "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; + "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;; + "hotplug/Linux/systemd/var-lib-xenstored.mount") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/var-lib-xenstored.mount" ;; + "hotplug/Linux/systemd/xenstored.socket") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenstored.socket" ;; + "hotplug/Linux/systemd/xenstored_ro.socket") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenstored_ro.socket" ;; + "hotplug/Linux/systemd/xenstored.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenstored.service" ;; + "hotplug/Linux/systemd/xenconsoled.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xenconsoled.service" ;; + "hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service" ;; + "hotplug/Linux/systemd/xendomains.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xendomains.service" ;; + "hotplug/Linux/systemd/xen-watchdog.service") CONFIG_FILES=3D"$CONFIG_FILES hotplug/Linux/systemd/xen-watchdog.service" ;; "config.h") CONFIG_HEADERS=3D"$CONFIG_HEADERS config.h" ;; *) as_fn_error $=3F "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/tools/configure.ac b/tools/configure.ac index e74fe4b..f44b9f3 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -9,6 +9,15 @@ AC_CONFIG_FILES([ ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons +hotplug/Linux/systemd/proc-xen.mount +hotplug/Linux/systemd/var-lib-xenstored.mount +hotplug/Linux/systemd/xenstored.socket +hotplug/Linux/systemd/xenstored_ro.socket +hotplug/Linux/systemd/xenstored.service +hotplug/Linux/systemd/xenconsoled.service +hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service +hotplug/Linux/systemd/xendomains.service +hotplug/Linux/systemd/xen-watchdog.service ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) @@ -59,6 +68,7 @@ m4_include([../m4/fetcher.m4]) m4_include([../m4/ax_compare_version.m4]) m4_include([../m4/paths.m4]) m4_include([../m4/xenstored.m4]) +m4_include([../m4/systemd.m4]) AX_XEN_EXPAND_CONFIG() @@ -310,5 +320,6 @@ AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h valgrind/memcheck.h utmp.h]) fi # ! $rump +AX_AVAILABLE_SYSTEMD() AC_OUTPUT() diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 3d2d344..d5a9ed2 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -25,6 +25,8 @@ XEN_SCRIPTS +=3D vscsi XEN_SCRIPTS +=3D block-iscsi XEN_SCRIPTS +=3D $(XEN_SCRIPTS-y) +SUBDIRS-$(CONFIG_SYSTEMD) +=3D systemd + XEN_SCRIPT_DATA =3D xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA +=3D xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA +=3D block-common.sh @@ -33,7 +35,7 @@ UDEV_RULES_DIR =3D $(CONFIG_DIR)/udev UDEV_RULES =3D xen-backend.rules $(UDEV_RULES-y) .PHONY: all -all: $(XENCOMMONS_INITD) +all: $(XENCOMMONS_INITD) subdirs-all $(XENCOMMONS_INITD): $(XEN_ROOT)/config/$(XEN_OS).modules $(XENCOMMONS_INITD).in $(XEN_ROOT)/tools/hotplug/Linux/update-modules.sh \ @@ -45,7 +47,7 @@ $(XENCOMMONS_INITD): $(XEN_ROOT)/config/$(XEN_OS).modules $(XENCOMMONS_INITD).in build: all .PHONY: install -install: all install-initd install-scripts install-udev +install: all install-initd install-scripts install-udev subdirs-install # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd @@ -83,4 +85,4 @@ install-udev: done .PHONY: clean -clean: +clean: subdirs-clean diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile new file mode 100644 index 0000000..dc98b67 --- /dev/null +++ b/tools/hotplug/Linux/systemd/Makefile @@ -0,0 +1,67 @@ +XEN_ROOT =3D $(CURDIR)/../../../.. +include $(XEN_ROOT)/tools/Rules.mk + +XEN_SYSTEMD_MODULES =3D xen.conf + +XEN_SYSTEMD_MOUNT =3D proc-xen.mount +XEN_SYSTEMD_MOUNT +=3D var-lib-xenstored.mount + +XEN_SYSTEMD_SOCKET =3D xenstored.socket +XEN_SYSTEMD_SOCKET +=3D xenstored_ro.socket + +XEN_SYSTEMD_SERVICE =3D xenstored.service +XEN_SYSTEMD_SERVICE +=3D xenconsoled.service +XEN_SYSTEMD_SERVICE +=3D xen-qemu-dom0-disk-backend.service +XEN_SYSTEMD_SERVICE +=3D xendomains.service +XEN_SYSTEMD_SERVICE +=3D xen-watchdog.service + +ALL_XEN_SYSTEMD =3D $(XEN_SYSTEMD_MODULES) \ + $(XEN_SYSTEMD_MOUNT) \ + $(XEN_SYSTEMD_SOCKET) \ + $(XEN_SYSTEMD_SERVICE) + +.PHONY: all +all: $(ALL_XEN_SYSTEMD) + +.PHONY: clean +clean: + +.PHONY: install +install: $(ALL_XEN_SYSTEMD) + [ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) + [ -d $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_DATA) *.socket $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + +$(XEN_SYSTEMD_MODULES): $(XEN_ROOT)/config/$(XEN_OS).modules + @set -e ; \ + IFS=3D'' ;\ + cat $(XEN_ROOT)/config/$(XEN_OS).modules | ( \ + while read l ; do \ + if echo $${l} | egrep -q "^#" ; then \ + continue ;\ + fi ;\ + if echo "$${l}" | egrep -q "\|" ; then \ + m1=3D$${l%%|*} ;\ + m2=3D$${l#*|} ;\ + # Systemd modules-load.d lacks support ;\ + # for module replacement options, we ;\ + # need to add that support upstream but ;\ + # its best instead to ensure this file ;\ + # is no longer needed. Some folks ;\ + # however have reported issues with ;\ + # some modules automatically loading ;\ + # so we just load all necessary xen ;\ + # modules and for replacements we load ;\ + # the latest module ;\ + echo "$$m1" ;\ + echo "$$m2" ;\ + else \ + echo "$$l" ;\ + fi ;\ + done \ + ) > $@ diff --git a/tools/hotplug/Linux/systemd/proc-xen.mount.in b/tools/hotplug/Linux/systemd/proc-xen.mount.in new file mode 100644 index 0000000..f0c4f3a --- /dev/null +++ b/tools/hotplug/Linux/systemd/proc-xen.mount.in @@ -0,0 +1,9 @@ +[Unit] +Description=3DMount /proc/xen files +ConditionVirtualization=3Dxen +RefuseManualStop=3Dtrue + +[Mount] +What=3Dxenfs +Where=3D/proc/xen +Type=3Dxenfs diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in new file mode 100644 index 0000000..44dfce8 --- /dev/null +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -0,0 +1,13 @@ +[Unit] +Description=3Dmount xenstore file system +ConditionVirtualization=3Dxen +RefuseManualStop=3Dtrue + +[Mount] +Environment=3DXENSTORED_MOUNT_CTX=3Dnone +EnvironmentFile=3D-/etc/sysconfig/xenstored +EnvironmentFile=3D-/etc/default/xenstored +What=3Dxenstore +Where=3D@XEN_LIB_STORED@ +Type=3Dtmpfs +Options=3Dmode=3D755,context=3D"$XENSTORED_MOUNT_CTX" diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in new file mode 100644 index 0000000..8dbd110 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -0,0 +1,22 @@ +[Unit] +Description=3Dqemu for xen dom0 disk backend +Requires=3Dproc-xen.mount var-lib-xenstored.mount xenstored.socket +After=3Dxenstored.service xenconsoled.service +Before=3Dxendomains.service libvirtd.service libvirt-guests.service +RefuseManualStop=3Dtrue +ConditionVirtualization=3Dxen + +[Service] +Type=3Dsimple +EnvironmentFile=3D-/etc/default/xenstored +EnvironmentFile=3D-/etc/sysconfig/xenstored +PIDFile=3D@XEN_RUN_DIR@/qemu-dom0.pid +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStartPre=3D/bin/mkdir -p /var/run/xen +ExecStart=3D@LIBEXEC@/qemu-system-i386 -xen-domid 0 \ + -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile @XEN_RUN_DIR@/qemu-dom0.pid + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xen-watchdog.service.in b/tools/hotplug/Linux/systemd/xen-watchdog.service.in new file mode 100644 index 0000000..acb2b77 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xen-watchdog.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=3DXen-watchdog - run xen watchdog daemon +Requires=3Dproc-xen.mount +After=3Dproc-xen.mount xendomains.service +ConditionVirtualization=3Dxen + +[Service] +Type=3Dforking +ExecStart=3D@SBINDIR@/xenwatchdogd 30 15 +KillSignal=3DUSR1 + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in new file mode 100644 index 0000000..15fad35 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -0,0 +1,20 @@ +[Unit] +Description=3DXenconsoled - handles logging from guest consoles and hypervisor +Requires=3Dxenstored.socket +After=3Dxenstored.service +ConditionVirtualization=3Dxen + +[Service] +Type=3Dsimple +Environment=3DXENCONSOLED_ARGS=3D +Environment=3DXENCONSOLED_LOG=3Dnone +Environment=3DXENCONSOLED_LOG_DIR=3D@XEN_LOG_DIR@/console +EnvironmentFile=3D-/etc/default/xenconsoled +EnvironmentFile=3D-/etc/sysconfig/xenconsoled +PIDFile=3D@XEN_RUN_DIR@/xenconsoled.pid +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStartPre=3D/bin/mkdir -p ${XENCONSOLED_LOG_DIR} +ExecStart=3D@SBINDIR@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=3D${XENCONSOLED_LOG} --log-dir=3D${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in new file mode 100644 index 0000000..70ce7c0 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -0,0 +1,16 @@ +[Unit] +Description=3DXendomains - start and stop guests on boot and shutdown +Requires=3Dxenstored.socket +After=3Dxenstored.service xenconsoled.service +ConditionVirtualization=3Dxen + +[Service] +Type=3Doneshot +RemainAfterExit=3Dtrue +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStart=3D-@LIBEXEC@/xendomains start +ExecStop=3D@LIBEXEC@/xendomains stop +ExecReload=3D@LIBEXEC@/xendomains restart + +[Install] +WantedBy=3Dmulti-user.target diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in new file mode 100644 index 0000000..4a9fcee --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -0,0 +1,27 @@ +[Unit] +Description=3DThe Xen xenstore +Requires=3Dxenstored_ro.socket xenstored.socket proc-xen.mount var-lib-xenstored.mount +After=3Dproc-xen.mount var-lib-xenstored.mount +Before=3Dlibvirtd.service libvirt-guests.service +RefuseManualStop=3Dtrue +ConditionVirtualization=3Dxen + +[Service] +Type=3Dnotify +Environment=3DXENSTORED_ARGS=3D +Environment=3DXENSTORED_ROOTDIR=3D@XEN_LIB_STORED@ +Environment=3DXENSTORED=3D@XENSTORED@ +EnvironmentFile=3D-/etc/default/xencommons +EnvironmentFile=3D-/etc/sysconfig/xencommons +ExecStartPre=3D/bin/grep -q control_d /proc/xen/capabilities +ExecStartPre=3D-/bin/rm -f @XEN_LIB_STORED@/tdb* +ExecStartPre=3D/bin/mkdir -p @XEN_RUN_DIR@ +ExecStart=3D/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS" +ExecStartPost=3D-@BINDIR@/xenstore-write "/local/domain/0/name" "Domain-0" +ExecStartPost=3D-@BINDIR@/xenstore-write "/local/domain/0/domid" 0 + +[Install] +WantedBy=3Dmulti-user.target +Also=3Dxenstored_ro.socket xenstored.socket +Also=3Dproc-xen.mount +Also=3Dvar-lib-xenstored.mount diff --git a/tools/hotplug/Linux/systemd/xenstored.socket.in b/tools/hotplug/Linux/systemd/xenstored.socket.in new file mode 100644 index 0000000..461e4f4 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenstored.socket.in @@ -0,0 +1,11 @@ +[Unit] +Description=3Dxenstore socket +ConditionVirtualization=3Dxen + +[Socket] +ListenStream=3D/var/run/xenstored/socket +SocketMode=3D0600 +Service=3Dxenstored.service + +[Install] +WantedBy=3Dsockets.target diff --git a/tools/hotplug/Linux/systemd/xenstored_ro.socket.in b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in new file mode 100644 index 0000000..6ab5c28 --- /dev/null +++ b/tools/hotplug/Linux/systemd/xenstored_ro.socket.in @@ -0,0 +1,11 @@ +[Unit] +Description=3Dxenstore ro socket +ConditionVirtualization=3Dxen + +[Socket] +ListenStream=3D/var/run/xenstored/socket_ro +SocketMode=3D0660 +Service=3Dxenstored.service + +[Install] +WantedBy=3Dsockets.target diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 382a813..068e04a 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -3,6 +3,11 @@ OCAML_TOPLEVEL =3D $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make CFLAGS +=3D -I$(XEN_ROOT)/tools/ +CFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_CFLAGS) +LDFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_LIBS) + +CFLAGS +=3D $(CFLAGS-y) +LDFLAGS +=3D $(LDFLAGS-y) OCAMLINCLUDE +=3D \ -I $(OCAML_TOPLEVEL)/libs/xb \ diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 08460c8..48f1e96 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -9,6 +9,12 @@ CFLAGS +=3D -I. CFLAGS +=3D -I$(XEN_ROOT)/tools/ CFLAGS +=3D $(CFLAGS_libxenctrl) +CFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_CFLAGS) +LDFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_LIBS) + +CFLAGS +=3D $(CFLAGS-y) +LDFLAGS +=3D $(LDFLAGS-y) + CLIENTS :=3D xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod CLIENTS +=3D xenstore-write xenstore-ls xenstore-watch -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6490996193720369296== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============6490996193720369296==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKv-0001PE-GV; Tue, 12 Aug 2014 19:02:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKu-0001P2-1U for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:20 +0000 Received: from [85.158.143.35:45279] by server-1.bemta-4.messagelabs.com id 67/60-05872-BB46AE35; Tue, 12 Aug 2014 19:02:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1407870136!12563978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30623 invoked from network); 12 Aug 2014 19:02:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKp-00005C-So for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKp-0003Ij-Qt for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:15 +0000 Date: Tue, 12 Aug 2014 19:02:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: update arm64 assembly primitives to Linux v3.16-rc6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a04ef51e4cd10e72d70d0fe983a476201127f6fa Author: Ian Campbell AuthorDate: Fri Jul 25 16:22:51 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 16:53:12 2014 +0100 xen: arm: update arm64 assembly primitives to Linux v3.16-rc6 The only really interesting changes here are the updates to mem* which update to actually optimised versions and introduce an optimised memcmp. bitops: No change to the bits we import. Record new baseline. cmpxchg: Import: 60010e5 arm64: cmpxchg: update macros to prevent warnings Author: Mark Hambleton Signed-off-by: Mark Hambleton Signed-off-by: Mark Brown Signed-off-by: Catalin Marinas e1dfda9 arm64: xchg: prevent warning if return value is unused Author: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas e1dfda9 resolves the warning which previous caused us to skip 60010e508111. Since arm32 and arm64 now differ (as do Linux arm and arm64) here the existing definition in asm/system.h gets moved to asm/arm32/cmpxchg.h. Previously this was shadowing the arm64 one but they happened to be identical. atomics: Import: 8715466 arch,arm64: Convert smp_mb__*() Author: Peter Zijlstra Signed-off-by: Peter Zijlstra This just drops some unused (by us) smp_mb__*_atomic_*. spinlocks: No change. Record new baseline. mem*: Import: 808dbac arm64: lib: Implement optimized memcpy routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas 280adc1 arm64: lib: Implement optimized memmove routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas b29a51f arm64: lib: Implement optimized memset routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas d875c9b arm64: lib: Implement optimized memcmp routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas These import various routines from Linaro's Cortex Strings library. Added assembler.h similar to on arm32 to define the various magic symbols which these imported routines depend on (e.g. CPU_LE() and CPU_BE()) str*: No changes. Record new baseline. Correct the paths in the README. *_page: No changes. Record new baseline. README previous said clear_page was unused while clear page was, which was backwards. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 36 +++--- xen/arch/arm/arm64/lib/Makefile | 2 +- xen/arch/arm/arm64/lib/assembler.h | 12 ++ xen/arch/arm/arm64/lib/memchr.S | 1 + xen/arch/arm/arm64/lib/memcmp.S | 258 +++++++++++++++++++++++++++++++++++ xen/arch/arm/arm64/lib/memcpy.S | 193 +++++++++++++++++++++++--- xen/arch/arm/arm64/lib/memmove.S | 191 ++++++++++++++++++++++---- xen/arch/arm/arm64/lib/memset.S | 208 +++++++++++++++++++++++++--- xen/include/asm-arm/arm32/cmpxchg.h | 3 + xen/include/asm-arm/arm64/atomic.h | 5 - xen/include/asm-arm/arm64/cmpxchg.h | 35 +++-- xen/include/asm-arm/string.h | 5 + xen/include/asm-arm/system.h | 3 - 13 files changed, 843 insertions(+), 109 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 6cd03ca..69eeb70 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -6,29 +6,26 @@ were last updated. arm64: ===================================================================== -bitops: last sync @ v3.14-rc7 (last commit: 8e86f0b) +bitops: last sync @ v3.16-rc6 (last commit: 8715466b6027) linux/arch/arm64/lib/bitops.S xen/arch/arm/arm64/lib/bitops.S linux/arch/arm64/include/asm/bitops.h xen/include/asm-arm/arm64/bitops.h --------------------------------------------------------------------- -cmpxchg: last sync @ v3.14-rc7 (last commit: 95c4189) +cmpxchg: last sync @ v3.16-rc6 (last commit: e1dfda9ced9b) linux/arch/arm64/include/asm/cmpxchg.h xen/include/asm-arm/arm64/cmpxchg.h -Skipped: - 60010e5 arm64: cmpxchg: update macros to prevent warnings - --------------------------------------------------------------------- -atomics: last sync @ v3.14-rc7 (last commit: 95c4189) +atomics: last sync @ v3.16-rc6 (last commit: 8715466b6027) linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- -spinlocks: last sync @ v3.14-rc7 (last commit: 95c4189) +spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h @@ -38,30 +35,31 @@ Skipped: --------------------------------------------------------------------- -mem*: last sync @ v3.14-rc7 (last commit: 4a89922) +mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) -linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S -linux/arch/arm64/lib/memcpy.S xen/arch/arm/arm64/lib/memcpy.S -linux/arch/arm64/lib/memmove.S xen/arch/arm/arm64/lib/memmove.S -linux/arch/arm64/lib/memset.S xen/arch/arm/arm64/lib/memset.S +linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S +linux/arch/arm64/lib/memcmp.S xen/arch/arm/arm64/lib/memcmp.S +linux/arch/arm64/lib/memcpy.S xen/arch/arm/arm64/lib/memcpy.S +linux/arch/arm64/lib/memmove.S xen/arch/arm/arm64/lib/memmove.S +linux/arch/arm64/lib/memset.S xen/arch/arm/arm64/lib/memset.S -for i in memchr.S memcpy.S memmove.S memset.S ; do +for i in memchr.S memcmp.S memcpy.S memmove.S memset.S ; do diff -u linux/arch/arm64/lib/$i xen/arch/arm/arm64/lib/$i done --------------------------------------------------------------------- -str*: last sync @ v3.14-rc7 (last commit: 2b8cac8) +str*: last sync @ v3.16-rc6 (last commit: 2b8cac814cd5) -linux/arch/arm/lib/strchr.S xen/arch/arm/arm64/lib/strchr.S -linux/arch/arm/lib/strrchr.S xen/arch/arm/arm64/lib/strrchr.S +linux/arch/arm64/lib/strchr.S xen/arch/arm/arm64/lib/strchr.S +linux/arch/arm64/lib/strrchr.S xen/arch/arm/arm64/lib/strrchr.S --------------------------------------------------------------------- -{clear,copy}_page: last sync @ v3.14-rc7 (last commit: f27bb13) +{clear,copy}_page: last sync @ v3.16-rc6 (last commit: f27bb139c387) -linux/arch/arm64/lib/clear_page.S unused in Xen -linux/arch/arm64/lib/copy_page.S xen/arch/arm/arm64/lib/copy_page.S +linux/arch/arm64/lib/clear_page.S xen/arch/arm/arm64/lib/clear_page.S +linux/arch/arm64/lib/copy_page.S unused in Xen ===================================================================== arm32 diff --git a/xen/arch/arm/arm64/lib/Makefile b/xen/arch/arm/arm64/lib/Makefile index b895afa..2e7fb64 100644 --- a/xen/arch/arm/arm64/lib/Makefile +++ b/xen/arch/arm/arm64/lib/Makefile @@ -1,4 +1,4 @@ -obj-y += memcpy.o memmove.o memset.o memchr.o +obj-y += memcpy.o memcmp.o memmove.o memset.o memchr.o obj-y += clear_page.o obj-y += bitops.o find_next_bit.o obj-y += strchr.o strrchr.o diff --git a/xen/arch/arm/arm64/lib/assembler.h b/xen/arch/arm/arm64/lib/assembler.h new file mode 100644 index 0000000..3f9c0dc --- /dev/null +++ b/xen/arch/arm/arm64/lib/assembler.h @@ -0,0 +1,12 @@ +#ifndef __ASM_ASSEMBLER_H__ +#define __ASM_ASSEMBLER_H__ + +#ifndef __ASSEMBLY__ +#error "Only include this from assembly code" +#endif + +/* Only LE support so far */ +#define CPU_BE(x...) +#define CPU_LE(x...) x + +#endif /* __ASM_ASSEMBLER_H__ */ diff --git a/xen/arch/arm/arm64/lib/memchr.S b/xen/arch/arm/arm64/lib/memchr.S index 3cc1b01..b04590c 100644 --- a/xen/arch/arm/arm64/lib/memchr.S +++ b/xen/arch/arm/arm64/lib/memchr.S @@ -18,6 +18,7 @@ */ #include +#include "assembler.h" /* * Find a character in an area of memory. diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S new file mode 100644 index 0000000..9aad925 --- /dev/null +++ b/xen/arch/arm/arm64/lib/memcmp.S @@ -0,0 +1,258 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include +#include "assembler.h" + +/* +* compare memory areas(when two memory areas' offset are different, +* alignment handled by the hardware) +* +* Parameters: +* x0 - const memory area 1 pointer +* x1 - const memory area 2 pointer +* x2 - the maximal compare byte length +* Returns: +* x0 - a compare result, maybe less than, equal to, or greater than ZERO +*/ + +/* Parameters and result. */ +src1 .req x0 +src2 .req x1 +limit .req x2 +result .req x0 + +/* Internal variables. */ +data1 .req x3 +data1w .req w3 +data2 .req x4 +data2w .req w4 +has_nul .req x5 +diff .req x6 +endloop .req x7 +tmp1 .req x8 +tmp2 .req x9 +tmp3 .req x10 +pos .req x11 +limit_wd .req x12 +mask .req x13 + +ENTRY(memcmp) + cbz limit, .Lret0 + eor tmp1, src1, src2 + tst tmp1, #7 + b.ne .Lmisaligned8 + ands tmp1, src1, #7 + b.ne .Lmutual_align + sub limit_wd, limit, #1 /* limit != 0, so no underflow. */ + lsr limit_wd, limit_wd, #3 /* Convert to Dwords. */ + /* + * The input source addresses are at alignment boundary. + * Directly compare eight bytes each time. + */ +.Lloop_aligned: + ldr data1, [src1], #8 + ldr data2, [src2], #8 +.Lstart_realigned: + subs limit_wd, limit_wd, #1 + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, cs /* Last Dword or differences. */ + cbz endloop, .Lloop_aligned + + /* Not reached the limit, must have found a diff. */ + tbz limit_wd, #63, .Lnot_limit + + /* Limit % 8 == 0 => the diff is in the last 8 bytes. */ + ands limit, limit, #7 + b.eq .Lnot_limit + /* + * The remained bytes less than 8. It is needed to extract valid data + * from last eight bytes of the intended memory range. + */ + lsl limit, limit, #3 /* bytes-> bits. */ + mov mask, #~0 +CPU_BE( lsr mask, mask, limit ) +CPU_LE( lsl mask, mask, limit ) + bic data1, data1, mask + bic data2, data2, mask + + orr diff, diff, mask + b .Lnot_limit + +.Lmutual_align: + /* + * Sources are mutually aligned, but are not currently at an + * alignment boundary. Round down the addresses and then mask off + * the bytes that precede the start point. + */ + bic src1, src1, #7 + bic src2, src2, #7 + ldr data1, [src1], #8 + ldr data2, [src2], #8 + /* + * We can not add limit with alignment offset(tmp1) here. Since the + * addition probably make the limit overflown. + */ + sub limit_wd, limit, #1/*limit != 0, so no underflow.*/ + and tmp3, limit_wd, #7 + lsr limit_wd, limit_wd, #3 + add tmp3, tmp3, tmp1 + add limit_wd, limit_wd, tmp3, lsr #3 + add limit, limit, tmp1/* Adjust the limit for the extra. */ + + lsl tmp1, tmp1, #3/* Bytes beyond alignment -> bits.*/ + neg tmp1, tmp1/* Bits to alignment -64. */ + mov tmp2, #~0 + /*mask off the non-intended bytes before the start address.*/ +CPU_BE( lsl tmp2, tmp2, tmp1 )/*Big-endian.Early bytes are at MSB*/ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp1 ) + + orr data1, data1, tmp2 + orr data2, data2, tmp2 + b .Lstart_realigned + + /*src1 and src2 have different alignment offset.*/ +.Lmisaligned8: + cmp limit, #8 + b.lo .Ltiny8proc /*limit < 8: compare byte by byte*/ + + and tmp1, src1, #7 + neg tmp1, tmp1 + add tmp1, tmp1, #8/*valid length in the first 8 bytes of src1*/ + and tmp2, src2, #7 + neg tmp2, tmp2 + add tmp2, tmp2, #8/*valid length in the first 8 bytes of src2*/ + subs tmp3, tmp1, tmp2 + csel pos, tmp1, tmp2, hi /*Choose the maximum.*/ + + sub limit, limit, pos + /*compare the proceeding bytes in the first 8 byte segment.*/ +.Ltinycmp: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs pos, pos, #1 + ccmp data1w, data2w, #0, ne /* NZCV = 0b0000. */ + b.eq .Ltinycmp + cbnz pos, 1f /*diff occurred before the last byte.*/ + cmp data1w, data2w + b.eq .Lstart_align +1: + sub result, data1, data2 + ret + +.Lstart_align: + lsr limit_wd, limit, #3 + cbz limit_wd, .Lremain8 + + ands xzr, src1, #7 + b.eq .Lrecal_offset + /*process more leading bytes to make src1 aligned...*/ + add src1, src1, tmp3 /*backwards src1 to alignment boundary*/ + add src2, src2, tmp3 + sub limit, limit, tmp3 + lsr limit_wd, limit, #3 + cbz limit_wd, .Lremain8 + /*load 8 bytes from aligned SRC1..*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + + subs limit_wd, limit_wd, #1 + eor diff, data1, data2 /*Non-zero if differences found.*/ + csinv endloop, diff, xzr, ne + cbnz endloop, .Lunequal_proc + /*How far is the current SRC2 from the alignment boundary...*/ + and tmp3, tmp3, #7 + +.Lrecal_offset:/*src1 is aligned now..*/ + neg pos, tmp3 +.Lloopcmp_proc: + /* + * Divide the eight bytes into two parts. First,backwards the src2 + * to an alignment boundary,load eight bytes and compare from + * the SRC2 alignment boundary. If all 8 bytes are equal,then start + * the second part's comparison. Otherwise finish the comparison. + * This special handle can garantee all the accesses are in the + * thread/task space in avoid to overrange access. + */ + ldr data1, [src1,pos] + ldr data2, [src2,pos] + eor diff, data1, data2 /* Non-zero if differences found. */ + cbnz diff, .Lnot_limit + + /*The second part process*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + eor diff, data1, data2 /* Non-zero if differences found. */ + subs limit_wd, limit_wd, #1 + csinv endloop, diff, xzr, ne/*if limit_wd is 0,will finish the cmp*/ + cbz endloop, .Lloopcmp_proc +.Lunequal_proc: + cbz diff, .Lremain8 + +/*There is differnence occured in the latest comparison.*/ +.Lnot_limit: +/* +* For little endian,reverse the low significant equal bits into MSB,then +* following CLZ can find how many equal bits exist. +*/ +CPU_LE( rev diff, diff ) +CPU_LE( rev data1, data1 ) +CPU_LE( rev data2, data2 ) + + /* + * The MS-non-zero bit of DIFF marks either the first bit + * that is different, or the end of the significant data. + * Shifting left now will bring the critical information into the + * top bits. + */ + clz pos, diff + lsl data1, data1, pos + lsl data2, data2, pos + /* + * We need to zero-extend (char is unsigned) the value and then + * perform a signed subtraction. + */ + lsr data1, data1, #56 + sub result, data1, data2, lsr #56 + ret + +.Lremain8: + /* Limit % 8 == 0 =>. all data are equal.*/ + ands limit, limit, #7 + b.eq .Lret0 + +.Ltiny8proc: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs limit, limit, #1 + + ccmp data1w, data2w, #0, ne /* NZCV = 0b0000. */ + b.eq .Ltiny8proc + sub result, data1, data2 + ret +.Lret0: + mov result, #0 + ret +ENDPROC(memcmp) diff --git a/xen/arch/arm/arm64/lib/memcpy.S b/xen/arch/arm/arm64/lib/memcpy.S index c8197c6..7cc885d 100644 --- a/xen/arch/arm/arm64/lib/memcpy.S +++ b/xen/arch/arm/arm64/lib/memcpy.S @@ -1,5 +1,13 @@ /* * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ * * 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 @@ -15,6 +23,8 @@ */ #include +#include +#include "assembler.h" /* * Copy a buffer from src to dest (alignment handled by the hardware) @@ -26,27 +36,166 @@ * Returns: * x0 - dest */ +dstin .req x0 +src .req x1 +count .req x2 +tmp1 .req x3 +tmp1w .req w3 +tmp2 .req x4 +tmp2w .req w4 +tmp3 .req x5 +tmp3w .req w5 +dst .req x6 + +A_l .req x7 +A_h .req x8 +B_l .req x9 +B_h .req x10 +C_l .req x11 +C_h .req x12 +D_l .req x13 +D_h .req x14 + ENTRY(memcpy) - mov x4, x0 - subs x2, x2, #8 - b.mi 2f -1: ldr x3, [x1], #8 - subs x2, x2, #8 - str x3, [x4], #8 - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - ldr w3, [x1], #4 - sub x2, x2, #4 - str w3, [x4], #4 -3: adds x2, x2, #2 - b.mi 4f - ldrh w3, [x1], #2 - sub x2, x2, #2 - strh w3, [x4], #2 -4: adds x2, x2, #1 - b.mi 5f - ldrb w3, [x1] - strb w3, [x4] -5: ret + mov dst, dstin + cmp count, #16 + /*When memory length is less than 16, the accessed are not aligned.*/ + b.lo .Ltiny15 + + neg tmp2, src + ands tmp2, tmp2, #15/* Bytes to reach alignment. */ + b.eq .LSrcAligned + sub count, count, tmp2 + /* + * Copy the leading memory data from src to dst in an increasing + * address order.By this way,the risk of overwritting the source + * memory data is eliminated when the distance between src and + * dst is less than 16. The memory accesses here are alignment. + */ + tbz tmp2, #0, 1f + ldrb tmp1w, [src], #1 + strb tmp1w, [dst], #1 +1: + tbz tmp2, #1, 2f + ldrh tmp1w, [src], #2 + strh tmp1w, [dst], #2 +2: + tbz tmp2, #2, 3f + ldr tmp1w, [src], #4 + str tmp1w, [dst], #4 +3: + tbz tmp2, #3, .LSrcAligned + ldr tmp1, [src],#8 + str tmp1, [dst],#8 + +.LSrcAligned: + cmp count, #64 + b.ge .Lcpy_over64 + /* + * Deal with small copies quickly by dropping straight into the + * exit block. + */ +.Ltail63: + /* + * Copy up to 48 bytes of data. At this point we only need the + * bottom 6 bits of count to be accurate. + */ + ands tmp1, count, #0x30 + b.eq .Ltiny15 + cmp tmp1w, #0x20 + b.eq 1f + b.lt 2f + ldp A_l, A_h, [src], #16 + stp A_l, A_h, [dst], #16 +1: + ldp A_l, A_h, [src], #16 + stp A_l, A_h, [dst], #16 +2: + ldp A_l, A_h, [src], #16 + stp A_l, A_h, [dst], #16 +.Ltiny15: + /* + * Prefer to break one ldp/stp into several load/store to access + * memory in an increasing address order,rather than to load/store 16 + * bytes from (src-16) to (dst-16) and to backward the src to aligned + * address,which way is used in original cortex memcpy. If keeping + * the original memcpy process here, memmove need to satisfy the + * precondition that src address is at least 16 bytes bigger than dst + * address,otherwise some source data will be overwritten when memove + * call memcpy directly. To make memmove simpler and decouple the + * memcpy's dependency on memmove, withdrew the original process. + */ + tbz count, #3, 1f + ldr tmp1, [src], #8 + str tmp1, [dst], #8 +1: + tbz count, #2, 2f + ldr tmp1w, [src], #4 + str tmp1w, [dst], #4 +2: + tbz count, #1, 3f + ldrh tmp1w, [src], #2 + strh tmp1w, [dst], #2 +3: + tbz count, #0, .Lexitfunc + ldrb tmp1w, [src] + strb tmp1w, [dst] + +.Lexitfunc: + ret + +.Lcpy_over64: + subs count, count, #128 + b.ge .Lcpy_body_large + /* + * Less than 128 bytes to copy, so handle 64 here and then jump + * to the tail. + */ + ldp A_l, A_h, [src],#16 + stp A_l, A_h, [dst],#16 + ldp B_l, B_h, [src],#16 + ldp C_l, C_h, [src],#16 + stp B_l, B_h, [dst],#16 + stp C_l, C_h, [dst],#16 + ldp D_l, D_h, [src],#16 + stp D_l, D_h, [dst],#16 + + tst count, #0x3f + b.ne .Ltail63 + ret + + /* + * Critical loop. Start at a new cache line boundary. Assuming + * 64 bytes per line this ensures the entire loop is in one line. + */ + .p2align L1_CACHE_SHIFT +.Lcpy_body_large: + /* pre-get 64 bytes data. */ + ldp A_l, A_h, [src],#16 + ldp B_l, B_h, [src],#16 + ldp C_l, C_h, [src],#16 + ldp D_l, D_h, [src],#16 +1: + /* + * interlace the load of next 64 bytes data block with store of the last + * loaded 64 bytes data. + */ + stp A_l, A_h, [dst],#16 + ldp A_l, A_h, [src],#16 + stp B_l, B_h, [dst],#16 + ldp B_l, B_h, [src],#16 + stp C_l, C_h, [dst],#16 + ldp C_l, C_h, [src],#16 + stp D_l, D_h, [dst],#16 + ldp D_l, D_h, [src],#16 + subs count, count, #64 + b.ge 1b + stp A_l, A_h, [dst],#16 + stp B_l, B_h, [dst],#16 + stp C_l, C_h, [dst],#16 + stp D_l, D_h, [dst],#16 + + tst count, #0x3f + b.ne .Ltail63 + ret ENDPROC(memcpy) diff --git a/xen/arch/arm/arm64/lib/memmove.S b/xen/arch/arm/arm64/lib/memmove.S index 1bf0936..f4065b9 100644 --- a/xen/arch/arm/arm64/lib/memmove.S +++ b/xen/arch/arm/arm64/lib/memmove.S @@ -1,5 +1,13 @@ /* * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ * * 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 @@ -15,6 +23,8 @@ */ #include +#include +#include "assembler.h" /* * Move a buffer from src to test (alignment handled by the hardware). @@ -27,30 +37,161 @@ * Returns: * x0 - dest */ +dstin .req x0 +src .req x1 +count .req x2 +tmp1 .req x3 +tmp1w .req w3 +tmp2 .req x4 +tmp2w .req w4 +tmp3 .req x5 +tmp3w .req w5 +dst .req x6 + +A_l .req x7 +A_h .req x8 +B_l .req x9 +B_h .req x10 +C_l .req x11 +C_h .req x12 +D_l .req x13 +D_h .req x14 + ENTRY(memmove) - cmp x0, x1 - b.ls memcpy - add x4, x0, x2 - add x1, x1, x2 - subs x2, x2, #8 - b.mi 2f -1: ldr x3, [x1, #-8]! - subs x2, x2, #8 - str x3, [x4, #-8]! - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - ldr w3, [x1, #-4]! - sub x2, x2, #4 - str w3, [x4, #-4]! -3: adds x2, x2, #2 - b.mi 4f - ldrh w3, [x1, #-2]! - sub x2, x2, #2 - strh w3, [x4, #-2]! -4: adds x2, x2, #1 - b.mi 5f - ldrb w3, [x1, #-1] - strb w3, [x4, #-1] -5: ret + cmp dstin, src + b.lo memcpy + add tmp1, src, count + cmp dstin, tmp1 + b.hs memcpy /* No overlap. */ + + add dst, dstin, count + add src, src, count + cmp count, #16 + b.lo .Ltail15 /*probably non-alignment accesses.*/ + + ands tmp2, src, #15 /* Bytes to reach alignment. */ + b.eq .LSrcAligned + sub count, count, tmp2 + /* + * process the aligned offset length to make the src aligned firstly. + * those extra instructions' cost is acceptable. It also make the + * coming accesses are based on aligned address. + */ + tbz tmp2, #0, 1f + ldrb tmp1w, [src, #-1]! + strb tmp1w, [dst, #-1]! +1: + tbz tmp2, #1, 2f + ldrh tmp1w, [src, #-2]! + strh tmp1w, [dst, #-2]! +2: + tbz tmp2, #2, 3f + ldr tmp1w, [src, #-4]! + str tmp1w, [dst, #-4]! +3: + tbz tmp2, #3, .LSrcAligned + ldr tmp1, [src, #-8]! + str tmp1, [dst, #-8]! + +.LSrcAligned: + cmp count, #64 + b.ge .Lcpy_over64 + + /* + * Deal with small copies quickly by dropping straight into the + * exit block. + */ +.Ltail63: + /* + * Copy up to 48 bytes of data. At this point we only need the + * bottom 6 bits of count to be accurate. + */ + ands tmp1, count, #0x30 + b.eq .Ltail15 + cmp tmp1w, #0x20 + b.eq 1f + b.lt 2f + ldp A_l, A_h, [src, #-16]! + stp A_l, A_h, [dst, #-16]! +1: + ldp A_l, A_h, [src, #-16]! + stp A_l, A_h, [dst, #-16]! +2: + ldp A_l, A_h, [src, #-16]! + stp A_l, A_h, [dst, #-16]! + +.Ltail15: + tbz count, #3, 1f + ldr tmp1, [src, #-8]! + str tmp1, [dst, #-8]! +1: + tbz count, #2, 2f + ldr tmp1w, [src, #-4]! + str tmp1w, [dst, #-4]! +2: + tbz count, #1, 3f + ldrh tmp1w, [src, #-2]! + strh tmp1w, [dst, #-2]! +3: + tbz count, #0, .Lexitfunc + ldrb tmp1w, [src, #-1] + strb tmp1w, [dst, #-1] + +.Lexitfunc: + ret + +.Lcpy_over64: + subs count, count, #128 + b.ge .Lcpy_body_large + /* + * Less than 128 bytes to copy, so handle 64 bytes here and then jump + * to the tail. + */ + ldp A_l, A_h, [src, #-16] + stp A_l, A_h, [dst, #-16] + ldp B_l, B_h, [src, #-32] + ldp C_l, C_h, [src, #-48] + stp B_l, B_h, [dst, #-32] + stp C_l, C_h, [dst, #-48] + ldp D_l, D_h, [src, #-64]! + stp D_l, D_h, [dst, #-64]! + + tst count, #0x3f + b.ne .Ltail63 + ret + + /* + * Critical loop. Start at a new cache line boundary. Assuming + * 64 bytes per line this ensures the entire loop is in one line. + */ + .p2align L1_CACHE_SHIFT +.Lcpy_body_large: + /* pre-load 64 bytes data. */ + ldp A_l, A_h, [src, #-16] + ldp B_l, B_h, [src, #-32] + ldp C_l, C_h, [src, #-48] + ldp D_l, D_h, [src, #-64]! +1: + /* + * interlace the load of next 64 bytes data block with store of the last + * loaded 64 bytes data. + */ + stp A_l, A_h, [dst, #-16] + ldp A_l, A_h, [src, #-16] + stp B_l, B_h, [dst, #-32] + ldp B_l, B_h, [src, #-32] + stp C_l, C_h, [dst, #-48] + ldp C_l, C_h, [src, #-48] + stp D_l, D_h, [dst, #-64]! + ldp D_l, D_h, [src, #-64]! + subs count, count, #64 + b.ge 1b + stp A_l, A_h, [dst, #-16] + stp B_l, B_h, [dst, #-32] + stp C_l, C_h, [dst, #-48] + stp D_l, D_h, [dst, #-64]! + + tst count, #0x3f + b.ne .Ltail63 + ret ENDPROC(memmove) diff --git a/xen/arch/arm/arm64/lib/memset.S b/xen/arch/arm/arm64/lib/memset.S index 25a4fb6..4ee714d 100644 --- a/xen/arch/arm/arm64/lib/memset.S +++ b/xen/arch/arm/arm64/lib/memset.S @@ -1,5 +1,13 @@ /* * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ * * 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 @@ -15,6 +23,8 @@ */ #include +#include +#include "assembler.h" /* * Fill in the buffer with character c (alignment handled by the hardware) @@ -26,27 +36,181 @@ * Returns: * x0 - buf */ + +dstin .req x0 +val .req w1 +count .req x2 +tmp1 .req x3 +tmp1w .req w3 +tmp2 .req x4 +tmp2w .req w4 +zva_len_x .req x5 +zva_len .req w5 +zva_bits_x .req x6 + +A_l .req x7 +A_lw .req w7 +dst .req x8 +tmp3w .req w9 +tmp3 .req x9 + ENTRY(memset) - mov x4, x0 - and w1, w1, #0xff - orr w1, w1, w1, lsl #8 - orr w1, w1, w1, lsl #16 - orr x1, x1, x1, lsl #32 - subs x2, x2, #8 - b.mi 2f -1: str x1, [x4], #8 - subs x2, x2, #8 - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - sub x2, x2, #4 - str w1, [x4], #4 -3: adds x2, x2, #2 - b.mi 4f - sub x2, x2, #2 - strh w1, [x4], #2 -4: adds x2, x2, #1 - b.mi 5f - strb w1, [x4] -5: ret + mov dst, dstin /* Preserve return value. */ + and A_lw, val, #255 + orr A_lw, A_lw, A_lw, lsl #8 + orr A_lw, A_lw, A_lw, lsl #16 + orr A_l, A_l, A_l, lsl #32 + + cmp count, #15 + b.hi .Lover16_proc + /*All store maybe are non-aligned..*/ + tbz count, #3, 1f + str A_l, [dst], #8 +1: + tbz count, #2, 2f + str A_lw, [dst], #4 +2: + tbz count, #1, 3f + strh A_lw, [dst], #2 +3: + tbz count, #0, 4f + strb A_lw, [dst] +4: + ret + +.Lover16_proc: + /*Whether the start address is aligned with 16.*/ + neg tmp2, dst + ands tmp2, tmp2, #15 + b.eq .Laligned +/* +* The count is not less than 16, we can use stp to store the start 16 bytes, +* then adjust the dst aligned with 16.This process will make the current +* memory address at alignment boundary. +*/ + stp A_l, A_l, [dst] /*non-aligned store..*/ + /*make the dst aligned..*/ + sub count, count, tmp2 + add dst, dst, tmp2 + +.Laligned: + cbz A_l, .Lzero_mem + +.Ltail_maybe_long: + cmp count, #64 + b.ge .Lnot_short +.Ltail63: + ands tmp1, count, #0x30 + b.eq 3f + cmp tmp1w, #0x20 + b.eq 1f + b.lt 2f + stp A_l, A_l, [dst], #16 +1: + stp A_l, A_l, [dst], #16 +2: + stp A_l, A_l, [dst], #16 +/* +* The last store length is less than 16,use stp to write last 16 bytes. +* It will lead some bytes written twice and the access is non-aligned. +*/ +3: + ands count, count, #15 + cbz count, 4f + add dst, dst, count + stp A_l, A_l, [dst, #-16] /* Repeat some/all of last store. */ +4: + ret + + /* + * Critical loop. Start at a new cache line boundary. Assuming + * 64 bytes per line, this ensures the entire loop is in one line. + */ + .p2align L1_CACHE_SHIFT +.Lnot_short: + sub dst, dst, #16/* Pre-bias. */ + sub count, count, #64 +1: + stp A_l, A_l, [dst, #16] + stp A_l, A_l, [dst, #32] + stp A_l, A_l, [dst, #48] + stp A_l, A_l, [dst, #64]! + subs count, count, #64 + b.ge 1b + tst count, #0x3f + add dst, dst, #16 + b.ne .Ltail63 +.Lexitfunc: + ret + + /* + * For zeroing memory, check to see if we can use the ZVA feature to + * zero entire 'cache' lines. + */ +.Lzero_mem: + cmp count, #63 + b.le .Ltail63 + /* + * For zeroing small amounts of memory, it's not worth setting up + * the line-clear code. + */ + cmp count, #128 + b.lt .Lnot_short /*count is at least 128 bytes*/ + + mrs tmp1, dczid_el0 + tbnz tmp1, #4, .Lnot_short + mov tmp3w, #4 + and zva_len, tmp1w, #15 /* Safety: other bits reserved. */ + lsl zva_len, tmp3w, zva_len + + ands tmp3w, zva_len, #63 + /* + * ensure the zva_len is not less than 64. + * It is not meaningful to use ZVA if the block size is less than 64. + */ + b.ne .Lnot_short +.Lzero_by_line: + /* + * Compute how far we need to go to become suitably aligned. We're + * already at quad-word alignment. + */ + cmp count, zva_len_x + b.lt .Lnot_short /* Not enough to reach alignment. */ + sub zva_bits_x, zva_len_x, #1 + neg tmp2, dst + ands tmp2, tmp2, zva_bits_x + b.eq 2f /* Already aligned. */ + /* Not aligned, check that there's enough to copy after alignment.*/ + sub tmp1, count, tmp2 + /* + * grantee the remain length to be ZVA is bigger than 64, + * avoid to make the 2f's process over mem range.*/ + cmp tmp1, #64 + ccmp tmp1, zva_len_x, #8, ge /* NZCV=0b1000 */ + b.lt .Lnot_short + /* + * We know that there's at least 64 bytes to zero and that it's safe + * to overrun by 64 bytes. + */ + mov count, tmp1 +1: + stp A_l, A_l, [dst] + stp A_l, A_l, [dst, #16] + stp A_l, A_l, [dst, #32] + subs tmp2, tmp2, #64 + stp A_l, A_l, [dst, #48] + add dst, dst, #64 + b.ge 1b + /* We've overrun a bit, so adjust dst downwards.*/ + add dst, dst, tmp2 +2: + sub count, count, zva_len_x +3: + dc zva, dst + add dst, dst, zva_len_x + subs count, count, zva_len_x + b.ge 3b + ands count, count, zva_bits_x + b.ne .Ltail_maybe_long + ret ENDPROC(memset) diff --git a/xen/include/asm-arm/arm32/cmpxchg.h b/xen/include/asm-arm/arm32/cmpxchg.h index 3f4e7a1..9a511f2 100644 --- a/xen/include/asm-arm/arm32/cmpxchg.h +++ b/xen/include/asm-arm/arm32/cmpxchg.h @@ -40,6 +40,9 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 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 diff --git a/xen/include/asm-arm/arm64/atomic.h b/xen/include/asm-arm/arm64/atomic.h index b5d50f2..b49219e 100644 --- a/xen/include/asm-arm/arm64/atomic.h +++ b/xen/include/asm-arm/arm64/atomic.h @@ -136,11 +136,6 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) #define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) -#define smp_mb__before_atomic_dec() smp_mb() -#define smp_mb__after_atomic_dec() smp_mb() -#define smp_mb__before_atomic_inc() smp_mb() -#define smp_mb__after_atomic_inc() smp_mb() - #endif /* * Local variables: diff --git a/xen/include/asm-arm/arm64/cmpxchg.h b/xen/include/asm-arm/arm64/cmpxchg.h index 4e930ce..ae42b2f 100644 --- a/xen/include/asm-arm/arm64/cmpxchg.h +++ b/xen/include/asm-arm/arm64/cmpxchg.h @@ -54,7 +54,12 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size } #define xchg(ptr,x) \ - ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __ret; \ +}) extern void __bad_cmpxchg(volatile void *ptr, int size); @@ -144,17 +149,23 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, return ret; } -#define cmpxchg(ptr,o,n) \ - ((__typeof__(*(ptr)))__cmpxchg_mb((ptr), \ - (unsigned long)(o), \ - (unsigned long)(n), \ - sizeof(*(ptr)))) - -#define cmpxchg_local(ptr,o,n) \ - ((__typeof__(*(ptr)))__cmpxchg((ptr), \ - (unsigned long)(o), \ - (unsigned long)(n), \ - sizeof(*(ptr)))) +#define cmpxchg(ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \ + sizeof(*(ptr))); \ + __ret; \ +}) + +#define cmpxchg_local(ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __cmpxchg((ptr), (unsigned long)(o), \ + (unsigned long)(n), sizeof(*(ptr))); \ + __ret; \ +}) #endif /* diff --git a/xen/include/asm-arm/string.h b/xen/include/asm-arm/string.h index 3242762..dfad1fe 100644 --- a/xen/include/asm-arm/string.h +++ b/xen/include/asm-arm/string.h @@ -17,6 +17,11 @@ extern char * strchr(const char * s, int c); #define __HAVE_ARCH_MEMCPY extern void * memcpy(void *, const void *, __kernel_size_t); +#if defined(CONFIG_ARM_64) +#define __HAVE_ARCH_MEMCMP +extern int memcmp(const void *, const void *, __kernel_size_t); +#endif + /* Some versions of gcc don't have this builtin. It's non-critical anyway. */ #define __HAVE_ARCH_MEMMOVE extern void *memmove(void *dest, const void *src, size_t n); diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 7aaaf50..ce3d38a 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -33,9 +33,6 @@ #define smp_wmb() dmb(ishst) -#define xchg(ptr,x) \ - ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) - /* * This is used to ensure the compiler did actually allocate the register we * asked it for some inline assembly sequences. Apparently we can't trust -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKv-0001PE-GV; Tue, 12 Aug 2014 19:02:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKu-0001P2-1U for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:20 +0000 Received: from [85.158.143.35:45279] by server-1.bemta-4.messagelabs.com id 67/60-05872-BB46AE35; Tue, 12 Aug 2014 19:02:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1407870136!12563978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30623 invoked from network); 12 Aug 2014 19:02:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHKp-00005C-So for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHKp-0003Ij-Qt for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:15 +0000 Date: Tue, 12 Aug 2014 19:02:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: update arm64 assembly primitives to Linux v3.16-rc6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a04ef51e4cd10e72d70d0fe983a476201127f6fa Author: Ian Campbell AuthorDate: Fri Jul 25 16:22:51 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 16:53:12 2014 +0100 xen: arm: update arm64 assembly primitives to Linux v3.16-rc6 The only really interesting changes here are the updates to mem* which update to actually optimised versions and introduce an optimised memcmp. bitops: No change to the bits we import. Record new baseline. cmpxchg: Import: 60010e5 arm64: cmpxchg: update macros to prevent warnings Author: Mark Hambleton Signed-off-by: Mark Hambleton Signed-off-by: Mark Brown Signed-off-by: Catalin Marinas e1dfda9 arm64: xchg: prevent warning if return value is unused Author: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas e1dfda9 resolves the warning which previous caused us to skip 60010e508111. Since arm32 and arm64 now differ (as do Linux arm and arm64) here the existing definition in asm/system.h gets moved to asm/arm32/cmpxchg.h. Previously this was shadowing the arm64 one but they happened to be identical. atomics: Import: 8715466 arch,arm64: Convert smp_mb__*() Author: Peter Zijlstra Signed-off-by: Peter Zijlstra This just drops some unused (by us) smp_mb__*_atomic_*. spinlocks: No change. Record new baseline. mem*: Import: 808dbac arm64: lib: Implement optimized memcpy routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas 280adc1 arm64: lib: Implement optimized memmove routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas b29a51f arm64: lib: Implement optimized memset routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas d875c9b arm64: lib: Implement optimized memcmp routine Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas These import various routines from Linaro's Cortex Strings library. Added assembler.h similar to on arm32 to define the various magic symbols which these imported routines depend on (e.g. CPU_LE() and CPU_BE()) str*: No changes. Record new baseline. Correct the paths in the README. *_page: No changes. Record new baseline. README previous said clear_page was unused while clear page was, which was backwards. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 36 +++--- xen/arch/arm/arm64/lib/Makefile | 2 +- xen/arch/arm/arm64/lib/assembler.h | 12 ++ xen/arch/arm/arm64/lib/memchr.S | 1 + xen/arch/arm/arm64/lib/memcmp.S | 258 +++++++++++++++++++++++++++++++++++ xen/arch/arm/arm64/lib/memcpy.S | 193 +++++++++++++++++++++++--- xen/arch/arm/arm64/lib/memmove.S | 191 ++++++++++++++++++++++---- xen/arch/arm/arm64/lib/memset.S | 208 +++++++++++++++++++++++++--- xen/include/asm-arm/arm32/cmpxchg.h | 3 + xen/include/asm-arm/arm64/atomic.h | 5 - xen/include/asm-arm/arm64/cmpxchg.h | 35 +++-- xen/include/asm-arm/string.h | 5 + xen/include/asm-arm/system.h | 3 - 13 files changed, 843 insertions(+), 109 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 6cd03ca..69eeb70 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -6,29 +6,26 @@ were last updated. arm64: ===================================================================== -bitops: last sync @ v3.14-rc7 (last commit: 8e86f0b) +bitops: last sync @ v3.16-rc6 (last commit: 8715466b6027) linux/arch/arm64/lib/bitops.S xen/arch/arm/arm64/lib/bitops.S linux/arch/arm64/include/asm/bitops.h xen/include/asm-arm/arm64/bitops.h --------------------------------------------------------------------- -cmpxchg: last sync @ v3.14-rc7 (last commit: 95c4189) +cmpxchg: last sync @ v3.16-rc6 (last commit: e1dfda9ced9b) linux/arch/arm64/include/asm/cmpxchg.h xen/include/asm-arm/arm64/cmpxchg.h -Skipped: - 60010e5 arm64: cmpxchg: update macros to prevent warnings - --------------------------------------------------------------------- -atomics: last sync @ v3.14-rc7 (last commit: 95c4189) +atomics: last sync @ v3.16-rc6 (last commit: 8715466b6027) linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- -spinlocks: last sync @ v3.14-rc7 (last commit: 95c4189) +spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h @@ -38,30 +35,31 @@ Skipped: --------------------------------------------------------------------- -mem*: last sync @ v3.14-rc7 (last commit: 4a89922) +mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) -linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S -linux/arch/arm64/lib/memcpy.S xen/arch/arm/arm64/lib/memcpy.S -linux/arch/arm64/lib/memmove.S xen/arch/arm/arm64/lib/memmove.S -linux/arch/arm64/lib/memset.S xen/arch/arm/arm64/lib/memset.S +linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S +linux/arch/arm64/lib/memcmp.S xen/arch/arm/arm64/lib/memcmp.S +linux/arch/arm64/lib/memcpy.S xen/arch/arm/arm64/lib/memcpy.S +linux/arch/arm64/lib/memmove.S xen/arch/arm/arm64/lib/memmove.S +linux/arch/arm64/lib/memset.S xen/arch/arm/arm64/lib/memset.S -for i in memchr.S memcpy.S memmove.S memset.S ; do +for i in memchr.S memcmp.S memcpy.S memmove.S memset.S ; do diff -u linux/arch/arm64/lib/$i xen/arch/arm/arm64/lib/$i done --------------------------------------------------------------------- -str*: last sync @ v3.14-rc7 (last commit: 2b8cac8) +str*: last sync @ v3.16-rc6 (last commit: 2b8cac814cd5) -linux/arch/arm/lib/strchr.S xen/arch/arm/arm64/lib/strchr.S -linux/arch/arm/lib/strrchr.S xen/arch/arm/arm64/lib/strrchr.S +linux/arch/arm64/lib/strchr.S xen/arch/arm/arm64/lib/strchr.S +linux/arch/arm64/lib/strrchr.S xen/arch/arm/arm64/lib/strrchr.S --------------------------------------------------------------------- -{clear,copy}_page: last sync @ v3.14-rc7 (last commit: f27bb13) +{clear,copy}_page: last sync @ v3.16-rc6 (last commit: f27bb139c387) -linux/arch/arm64/lib/clear_page.S unused in Xen -linux/arch/arm64/lib/copy_page.S xen/arch/arm/arm64/lib/copy_page.S +linux/arch/arm64/lib/clear_page.S xen/arch/arm/arm64/lib/clear_page.S +linux/arch/arm64/lib/copy_page.S unused in Xen ===================================================================== arm32 diff --git a/xen/arch/arm/arm64/lib/Makefile b/xen/arch/arm/arm64/lib/Makefile index b895afa..2e7fb64 100644 --- a/xen/arch/arm/arm64/lib/Makefile +++ b/xen/arch/arm/arm64/lib/Makefile @@ -1,4 +1,4 @@ -obj-y += memcpy.o memmove.o memset.o memchr.o +obj-y += memcpy.o memcmp.o memmove.o memset.o memchr.o obj-y += clear_page.o obj-y += bitops.o find_next_bit.o obj-y += strchr.o strrchr.o diff --git a/xen/arch/arm/arm64/lib/assembler.h b/xen/arch/arm/arm64/lib/assembler.h new file mode 100644 index 0000000..3f9c0dc --- /dev/null +++ b/xen/arch/arm/arm64/lib/assembler.h @@ -0,0 +1,12 @@ +#ifndef __ASM_ASSEMBLER_H__ +#define __ASM_ASSEMBLER_H__ + +#ifndef __ASSEMBLY__ +#error "Only include this from assembly code" +#endif + +/* Only LE support so far */ +#define CPU_BE(x...) +#define CPU_LE(x...) x + +#endif /* __ASM_ASSEMBLER_H__ */ diff --git a/xen/arch/arm/arm64/lib/memchr.S b/xen/arch/arm/arm64/lib/memchr.S index 3cc1b01..b04590c 100644 --- a/xen/arch/arm/arm64/lib/memchr.S +++ b/xen/arch/arm/arm64/lib/memchr.S @@ -18,6 +18,7 @@ */ #include +#include "assembler.h" /* * Find a character in an area of memory. diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S new file mode 100644 index 0000000..9aad925 --- /dev/null +++ b/xen/arch/arm/arm64/lib/memcmp.S @@ -0,0 +1,258 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include +#include "assembler.h" + +/* +* compare memory areas(when two memory areas' offset are different, +* alignment handled by the hardware) +* +* Parameters: +* x0 - const memory area 1 pointer +* x1 - const memory area 2 pointer +* x2 - the maximal compare byte length +* Returns: +* x0 - a compare result, maybe less than, equal to, or greater than ZERO +*/ + +/* Parameters and result. */ +src1 .req x0 +src2 .req x1 +limit .req x2 +result .req x0 + +/* Internal variables. */ +data1 .req x3 +data1w .req w3 +data2 .req x4 +data2w .req w4 +has_nul .req x5 +diff .req x6 +endloop .req x7 +tmp1 .req x8 +tmp2 .req x9 +tmp3 .req x10 +pos .req x11 +limit_wd .req x12 +mask .req x13 + +ENTRY(memcmp) + cbz limit, .Lret0 + eor tmp1, src1, src2 + tst tmp1, #7 + b.ne .Lmisaligned8 + ands tmp1, src1, #7 + b.ne .Lmutual_align + sub limit_wd, limit, #1 /* limit != 0, so no underflow. */ + lsr limit_wd, limit_wd, #3 /* Convert to Dwords. */ + /* + * The input source addresses are at alignment boundary. + * Directly compare eight bytes each time. + */ +.Lloop_aligned: + ldr data1, [src1], #8 + ldr data2, [src2], #8 +.Lstart_realigned: + subs limit_wd, limit_wd, #1 + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, cs /* Last Dword or differences. */ + cbz endloop, .Lloop_aligned + + /* Not reached the limit, must have found a diff. */ + tbz limit_wd, #63, .Lnot_limit + + /* Limit % 8 == 0 => the diff is in the last 8 bytes. */ + ands limit, limit, #7 + b.eq .Lnot_limit + /* + * The remained bytes less than 8. It is needed to extract valid data + * from last eight bytes of the intended memory range. + */ + lsl limit, limit, #3 /* bytes-> bits. */ + mov mask, #~0 +CPU_BE( lsr mask, mask, limit ) +CPU_LE( lsl mask, mask, limit ) + bic data1, data1, mask + bic data2, data2, mask + + orr diff, diff, mask + b .Lnot_limit + +.Lmutual_align: + /* + * Sources are mutually aligned, but are not currently at an + * alignment boundary. Round down the addresses and then mask off + * the bytes that precede the start point. + */ + bic src1, src1, #7 + bic src2, src2, #7 + ldr data1, [src1], #8 + ldr data2, [src2], #8 + /* + * We can not add limit with alignment offset(tmp1) here. Since the + * addition probably make the limit overflown. + */ + sub limit_wd, limit, #1/*limit != 0, so no underflow.*/ + and tmp3, limit_wd, #7 + lsr limit_wd, limit_wd, #3 + add tmp3, tmp3, tmp1 + add limit_wd, limit_wd, tmp3, lsr #3 + add limit, limit, tmp1/* Adjust the limit for the extra. */ + + lsl tmp1, tmp1, #3/* Bytes beyond alignment -> bits.*/ + neg tmp1, tmp1/* Bits to alignment -64. */ + mov tmp2, #~0 + /*mask off the non-intended bytes before the start address.*/ +CPU_BE( lsl tmp2, tmp2, tmp1 )/*Big-endian.Early bytes are at MSB*/ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp1 ) + + orr data1, data1, tmp2 + orr data2, data2, tmp2 + b .Lstart_realigned + + /*src1 and src2 have different alignment offset.*/ +.Lmisaligned8: + cmp limit, #8 + b.lo .Ltiny8proc /*limit < 8: compare byte by byte*/ + + and tmp1, src1, #7 + neg tmp1, tmp1 + add tmp1, tmp1, #8/*valid length in the first 8 bytes of src1*/ + and tmp2, src2, #7 + neg tmp2, tmp2 + add tmp2, tmp2, #8/*valid length in the first 8 bytes of src2*/ + subs tmp3, tmp1, tmp2 + csel pos, tmp1, tmp2, hi /*Choose the maximum.*/ + + sub limit, limit, pos + /*compare the proceeding bytes in the first 8 byte segment.*/ +.Ltinycmp: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs pos, pos, #1 + ccmp data1w, data2w, #0, ne /* NZCV = 0b0000. */ + b.eq .Ltinycmp + cbnz pos, 1f /*diff occurred before the last byte.*/ + cmp data1w, data2w + b.eq .Lstart_align +1: + sub result, data1, data2 + ret + +.Lstart_align: + lsr limit_wd, limit, #3 + cbz limit_wd, .Lremain8 + + ands xzr, src1, #7 + b.eq .Lrecal_offset + /*process more leading bytes to make src1 aligned...*/ + add src1, src1, tmp3 /*backwards src1 to alignment boundary*/ + add src2, src2, tmp3 + sub limit, limit, tmp3 + lsr limit_wd, limit, #3 + cbz limit_wd, .Lremain8 + /*load 8 bytes from aligned SRC1..*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + + subs limit_wd, limit_wd, #1 + eor diff, data1, data2 /*Non-zero if differences found.*/ + csinv endloop, diff, xzr, ne + cbnz endloop, .Lunequal_proc + /*How far is the current SRC2 from the alignment boundary...*/ + and tmp3, tmp3, #7 + +.Lrecal_offset:/*src1 is aligned now..*/ + neg pos, tmp3 +.Lloopcmp_proc: + /* + * Divide the eight bytes into two parts. First,backwards the src2 + * to an alignment boundary,load eight bytes and compare from + * the SRC2 alignment boundary. If all 8 bytes are equal,then start + * the second part's comparison. Otherwise finish the comparison. + * This special handle can garantee all the accesses are in the + * thread/task space in avoid to overrange access. + */ + ldr data1, [src1,pos] + ldr data2, [src2,pos] + eor diff, data1, data2 /* Non-zero if differences found. */ + cbnz diff, .Lnot_limit + + /*The second part process*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + eor diff, data1, data2 /* Non-zero if differences found. */ + subs limit_wd, limit_wd, #1 + csinv endloop, diff, xzr, ne/*if limit_wd is 0,will finish the cmp*/ + cbz endloop, .Lloopcmp_proc +.Lunequal_proc: + cbz diff, .Lremain8 + +/*There is differnence occured in the latest comparison.*/ +.Lnot_limit: +/* +* For little endian,reverse the low significant equal bits into MSB,then +* following CLZ can find how many equal bits exist. +*/ +CPU_LE( rev diff, diff ) +CPU_LE( rev data1, data1 ) +CPU_LE( rev data2, data2 ) + + /* + * The MS-non-zero bit of DIFF marks either the first bit + * that is different, or the end of the significant data. + * Shifting left now will bring the critical information into the + * top bits. + */ + clz pos, diff + lsl data1, data1, pos + lsl data2, data2, pos + /* + * We need to zero-extend (char is unsigned) the value and then + * perform a signed subtraction. + */ + lsr data1, data1, #56 + sub result, data1, data2, lsr #56 + ret + +.Lremain8: + /* Limit % 8 == 0 =>. all data are equal.*/ + ands limit, limit, #7 + b.eq .Lret0 + +.Ltiny8proc: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs limit, limit, #1 + + ccmp data1w, data2w, #0, ne /* NZCV = 0b0000. */ + b.eq .Ltiny8proc + sub result, data1, data2 + ret +.Lret0: + mov result, #0 + ret +ENDPROC(memcmp) diff --git a/xen/arch/arm/arm64/lib/memcpy.S b/xen/arch/arm/arm64/lib/memcpy.S index c8197c6..7cc885d 100644 --- a/xen/arch/arm/arm64/lib/memcpy.S +++ b/xen/arch/arm/arm64/lib/memcpy.S @@ -1,5 +1,13 @@ /* * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ * * 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 @@ -15,6 +23,8 @@ */ #include +#include +#include "assembler.h" /* * Copy a buffer from src to dest (alignment handled by the hardware) @@ -26,27 +36,166 @@ * Returns: * x0 - dest */ +dstin .req x0 +src .req x1 +count .req x2 +tmp1 .req x3 +tmp1w .req w3 +tmp2 .req x4 +tmp2w .req w4 +tmp3 .req x5 +tmp3w .req w5 +dst .req x6 + +A_l .req x7 +A_h .req x8 +B_l .req x9 +B_h .req x10 +C_l .req x11 +C_h .req x12 +D_l .req x13 +D_h .req x14 + ENTRY(memcpy) - mov x4, x0 - subs x2, x2, #8 - b.mi 2f -1: ldr x3, [x1], #8 - subs x2, x2, #8 - str x3, [x4], #8 - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - ldr w3, [x1], #4 - sub x2, x2, #4 - str w3, [x4], #4 -3: adds x2, x2, #2 - b.mi 4f - ldrh w3, [x1], #2 - sub x2, x2, #2 - strh w3, [x4], #2 -4: adds x2, x2, #1 - b.mi 5f - ldrb w3, [x1] - strb w3, [x4] -5: ret + mov dst, dstin + cmp count, #16 + /*When memory length is less than 16, the accessed are not aligned.*/ + b.lo .Ltiny15 + + neg tmp2, src + ands tmp2, tmp2, #15/* Bytes to reach alignment. */ + b.eq .LSrcAligned + sub count, count, tmp2 + /* + * Copy the leading memory data from src to dst in an increasing + * address order.By this way,the risk of overwritting the source + * memory data is eliminated when the distance between src and + * dst is less than 16. The memory accesses here are alignment. + */ + tbz tmp2, #0, 1f + ldrb tmp1w, [src], #1 + strb tmp1w, [dst], #1 +1: + tbz tmp2, #1, 2f + ldrh tmp1w, [src], #2 + strh tmp1w, [dst], #2 +2: + tbz tmp2, #2, 3f + ldr tmp1w, [src], #4 + str tmp1w, [dst], #4 +3: + tbz tmp2, #3, .LSrcAligned + ldr tmp1, [src],#8 + str tmp1, [dst],#8 + +.LSrcAligned: + cmp count, #64 + b.ge .Lcpy_over64 + /* + * Deal with small copies quickly by dropping straight into the + * exit block. + */ +.Ltail63: + /* + * Copy up to 48 bytes of data. At this point we only need the + * bottom 6 bits of count to be accurate. + */ + ands tmp1, count, #0x30 + b.eq .Ltiny15 + cmp tmp1w, #0x20 + b.eq 1f + b.lt 2f + ldp A_l, A_h, [src], #16 + stp A_l, A_h, [dst], #16 +1: + ldp A_l, A_h, [src], #16 + stp A_l, A_h, [dst], #16 +2: + ldp A_l, A_h, [src], #16 + stp A_l, A_h, [dst], #16 +.Ltiny15: + /* + * Prefer to break one ldp/stp into several load/store to access + * memory in an increasing address order,rather than to load/store 16 + * bytes from (src-16) to (dst-16) and to backward the src to aligned + * address,which way is used in original cortex memcpy. If keeping + * the original memcpy process here, memmove need to satisfy the + * precondition that src address is at least 16 bytes bigger than dst + * address,otherwise some source data will be overwritten when memove + * call memcpy directly. To make memmove simpler and decouple the + * memcpy's dependency on memmove, withdrew the original process. + */ + tbz count, #3, 1f + ldr tmp1, [src], #8 + str tmp1, [dst], #8 +1: + tbz count, #2, 2f + ldr tmp1w, [src], #4 + str tmp1w, [dst], #4 +2: + tbz count, #1, 3f + ldrh tmp1w, [src], #2 + strh tmp1w, [dst], #2 +3: + tbz count, #0, .Lexitfunc + ldrb tmp1w, [src] + strb tmp1w, [dst] + +.Lexitfunc: + ret + +.Lcpy_over64: + subs count, count, #128 + b.ge .Lcpy_body_large + /* + * Less than 128 bytes to copy, so handle 64 here and then jump + * to the tail. + */ + ldp A_l, A_h, [src],#16 + stp A_l, A_h, [dst],#16 + ldp B_l, B_h, [src],#16 + ldp C_l, C_h, [src],#16 + stp B_l, B_h, [dst],#16 + stp C_l, C_h, [dst],#16 + ldp D_l, D_h, [src],#16 + stp D_l, D_h, [dst],#16 + + tst count, #0x3f + b.ne .Ltail63 + ret + + /* + * Critical loop. Start at a new cache line boundary. Assuming + * 64 bytes per line this ensures the entire loop is in one line. + */ + .p2align L1_CACHE_SHIFT +.Lcpy_body_large: + /* pre-get 64 bytes data. */ + ldp A_l, A_h, [src],#16 + ldp B_l, B_h, [src],#16 + ldp C_l, C_h, [src],#16 + ldp D_l, D_h, [src],#16 +1: + /* + * interlace the load of next 64 bytes data block with store of the last + * loaded 64 bytes data. + */ + stp A_l, A_h, [dst],#16 + ldp A_l, A_h, [src],#16 + stp B_l, B_h, [dst],#16 + ldp B_l, B_h, [src],#16 + stp C_l, C_h, [dst],#16 + ldp C_l, C_h, [src],#16 + stp D_l, D_h, [dst],#16 + ldp D_l, D_h, [src],#16 + subs count, count, #64 + b.ge 1b + stp A_l, A_h, [dst],#16 + stp B_l, B_h, [dst],#16 + stp C_l, C_h, [dst],#16 + stp D_l, D_h, [dst],#16 + + tst count, #0x3f + b.ne .Ltail63 + ret ENDPROC(memcpy) diff --git a/xen/arch/arm/arm64/lib/memmove.S b/xen/arch/arm/arm64/lib/memmove.S index 1bf0936..f4065b9 100644 --- a/xen/arch/arm/arm64/lib/memmove.S +++ b/xen/arch/arm/arm64/lib/memmove.S @@ -1,5 +1,13 @@ /* * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ * * 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 @@ -15,6 +23,8 @@ */ #include +#include +#include "assembler.h" /* * Move a buffer from src to test (alignment handled by the hardware). @@ -27,30 +37,161 @@ * Returns: * x0 - dest */ +dstin .req x0 +src .req x1 +count .req x2 +tmp1 .req x3 +tmp1w .req w3 +tmp2 .req x4 +tmp2w .req w4 +tmp3 .req x5 +tmp3w .req w5 +dst .req x6 + +A_l .req x7 +A_h .req x8 +B_l .req x9 +B_h .req x10 +C_l .req x11 +C_h .req x12 +D_l .req x13 +D_h .req x14 + ENTRY(memmove) - cmp x0, x1 - b.ls memcpy - add x4, x0, x2 - add x1, x1, x2 - subs x2, x2, #8 - b.mi 2f -1: ldr x3, [x1, #-8]! - subs x2, x2, #8 - str x3, [x4, #-8]! - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - ldr w3, [x1, #-4]! - sub x2, x2, #4 - str w3, [x4, #-4]! -3: adds x2, x2, #2 - b.mi 4f - ldrh w3, [x1, #-2]! - sub x2, x2, #2 - strh w3, [x4, #-2]! -4: adds x2, x2, #1 - b.mi 5f - ldrb w3, [x1, #-1] - strb w3, [x4, #-1] -5: ret + cmp dstin, src + b.lo memcpy + add tmp1, src, count + cmp dstin, tmp1 + b.hs memcpy /* No overlap. */ + + add dst, dstin, count + add src, src, count + cmp count, #16 + b.lo .Ltail15 /*probably non-alignment accesses.*/ + + ands tmp2, src, #15 /* Bytes to reach alignment. */ + b.eq .LSrcAligned + sub count, count, tmp2 + /* + * process the aligned offset length to make the src aligned firstly. + * those extra instructions' cost is acceptable. It also make the + * coming accesses are based on aligned address. + */ + tbz tmp2, #0, 1f + ldrb tmp1w, [src, #-1]! + strb tmp1w, [dst, #-1]! +1: + tbz tmp2, #1, 2f + ldrh tmp1w, [src, #-2]! + strh tmp1w, [dst, #-2]! +2: + tbz tmp2, #2, 3f + ldr tmp1w, [src, #-4]! + str tmp1w, [dst, #-4]! +3: + tbz tmp2, #3, .LSrcAligned + ldr tmp1, [src, #-8]! + str tmp1, [dst, #-8]! + +.LSrcAligned: + cmp count, #64 + b.ge .Lcpy_over64 + + /* + * Deal with small copies quickly by dropping straight into the + * exit block. + */ +.Ltail63: + /* + * Copy up to 48 bytes of data. At this point we only need the + * bottom 6 bits of count to be accurate. + */ + ands tmp1, count, #0x30 + b.eq .Ltail15 + cmp tmp1w, #0x20 + b.eq 1f + b.lt 2f + ldp A_l, A_h, [src, #-16]! + stp A_l, A_h, [dst, #-16]! +1: + ldp A_l, A_h, [src, #-16]! + stp A_l, A_h, [dst, #-16]! +2: + ldp A_l, A_h, [src, #-16]! + stp A_l, A_h, [dst, #-16]! + +.Ltail15: + tbz count, #3, 1f + ldr tmp1, [src, #-8]! + str tmp1, [dst, #-8]! +1: + tbz count, #2, 2f + ldr tmp1w, [src, #-4]! + str tmp1w, [dst, #-4]! +2: + tbz count, #1, 3f + ldrh tmp1w, [src, #-2]! + strh tmp1w, [dst, #-2]! +3: + tbz count, #0, .Lexitfunc + ldrb tmp1w, [src, #-1] + strb tmp1w, [dst, #-1] + +.Lexitfunc: + ret + +.Lcpy_over64: + subs count, count, #128 + b.ge .Lcpy_body_large + /* + * Less than 128 bytes to copy, so handle 64 bytes here and then jump + * to the tail. + */ + ldp A_l, A_h, [src, #-16] + stp A_l, A_h, [dst, #-16] + ldp B_l, B_h, [src, #-32] + ldp C_l, C_h, [src, #-48] + stp B_l, B_h, [dst, #-32] + stp C_l, C_h, [dst, #-48] + ldp D_l, D_h, [src, #-64]! + stp D_l, D_h, [dst, #-64]! + + tst count, #0x3f + b.ne .Ltail63 + ret + + /* + * Critical loop. Start at a new cache line boundary. Assuming + * 64 bytes per line this ensures the entire loop is in one line. + */ + .p2align L1_CACHE_SHIFT +.Lcpy_body_large: + /* pre-load 64 bytes data. */ + ldp A_l, A_h, [src, #-16] + ldp B_l, B_h, [src, #-32] + ldp C_l, C_h, [src, #-48] + ldp D_l, D_h, [src, #-64]! +1: + /* + * interlace the load of next 64 bytes data block with store of the last + * loaded 64 bytes data. + */ + stp A_l, A_h, [dst, #-16] + ldp A_l, A_h, [src, #-16] + stp B_l, B_h, [dst, #-32] + ldp B_l, B_h, [src, #-32] + stp C_l, C_h, [dst, #-48] + ldp C_l, C_h, [src, #-48] + stp D_l, D_h, [dst, #-64]! + ldp D_l, D_h, [src, #-64]! + subs count, count, #64 + b.ge 1b + stp A_l, A_h, [dst, #-16] + stp B_l, B_h, [dst, #-32] + stp C_l, C_h, [dst, #-48] + stp D_l, D_h, [dst, #-64]! + + tst count, #0x3f + b.ne .Ltail63 + ret ENDPROC(memmove) diff --git a/xen/arch/arm/arm64/lib/memset.S b/xen/arch/arm/arm64/lib/memset.S index 25a4fb6..4ee714d 100644 --- a/xen/arch/arm/arm64/lib/memset.S +++ b/xen/arch/arm/arm64/lib/memset.S @@ -1,5 +1,13 @@ /* * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ * * 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 @@ -15,6 +23,8 @@ */ #include +#include +#include "assembler.h" /* * Fill in the buffer with character c (alignment handled by the hardware) @@ -26,27 +36,181 @@ * Returns: * x0 - buf */ + +dstin .req x0 +val .req w1 +count .req x2 +tmp1 .req x3 +tmp1w .req w3 +tmp2 .req x4 +tmp2w .req w4 +zva_len_x .req x5 +zva_len .req w5 +zva_bits_x .req x6 + +A_l .req x7 +A_lw .req w7 +dst .req x8 +tmp3w .req w9 +tmp3 .req x9 + ENTRY(memset) - mov x4, x0 - and w1, w1, #0xff - orr w1, w1, w1, lsl #8 - orr w1, w1, w1, lsl #16 - orr x1, x1, x1, lsl #32 - subs x2, x2, #8 - b.mi 2f -1: str x1, [x4], #8 - subs x2, x2, #8 - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - sub x2, x2, #4 - str w1, [x4], #4 -3: adds x2, x2, #2 - b.mi 4f - sub x2, x2, #2 - strh w1, [x4], #2 -4: adds x2, x2, #1 - b.mi 5f - strb w1, [x4] -5: ret + mov dst, dstin /* Preserve return value. */ + and A_lw, val, #255 + orr A_lw, A_lw, A_lw, lsl #8 + orr A_lw, A_lw, A_lw, lsl #16 + orr A_l, A_l, A_l, lsl #32 + + cmp count, #15 + b.hi .Lover16_proc + /*All store maybe are non-aligned..*/ + tbz count, #3, 1f + str A_l, [dst], #8 +1: + tbz count, #2, 2f + str A_lw, [dst], #4 +2: + tbz count, #1, 3f + strh A_lw, [dst], #2 +3: + tbz count, #0, 4f + strb A_lw, [dst] +4: + ret + +.Lover16_proc: + /*Whether the start address is aligned with 16.*/ + neg tmp2, dst + ands tmp2, tmp2, #15 + b.eq .Laligned +/* +* The count is not less than 16, we can use stp to store the start 16 bytes, +* then adjust the dst aligned with 16.This process will make the current +* memory address at alignment boundary. +*/ + stp A_l, A_l, [dst] /*non-aligned store..*/ + /*make the dst aligned..*/ + sub count, count, tmp2 + add dst, dst, tmp2 + +.Laligned: + cbz A_l, .Lzero_mem + +.Ltail_maybe_long: + cmp count, #64 + b.ge .Lnot_short +.Ltail63: + ands tmp1, count, #0x30 + b.eq 3f + cmp tmp1w, #0x20 + b.eq 1f + b.lt 2f + stp A_l, A_l, [dst], #16 +1: + stp A_l, A_l, [dst], #16 +2: + stp A_l, A_l, [dst], #16 +/* +* The last store length is less than 16,use stp to write last 16 bytes. +* It will lead some bytes written twice and the access is non-aligned. +*/ +3: + ands count, count, #15 + cbz count, 4f + add dst, dst, count + stp A_l, A_l, [dst, #-16] /* Repeat some/all of last store. */ +4: + ret + + /* + * Critical loop. Start at a new cache line boundary. Assuming + * 64 bytes per line, this ensures the entire loop is in one line. + */ + .p2align L1_CACHE_SHIFT +.Lnot_short: + sub dst, dst, #16/* Pre-bias. */ + sub count, count, #64 +1: + stp A_l, A_l, [dst, #16] + stp A_l, A_l, [dst, #32] + stp A_l, A_l, [dst, #48] + stp A_l, A_l, [dst, #64]! + subs count, count, #64 + b.ge 1b + tst count, #0x3f + add dst, dst, #16 + b.ne .Ltail63 +.Lexitfunc: + ret + + /* + * For zeroing memory, check to see if we can use the ZVA feature to + * zero entire 'cache' lines. + */ +.Lzero_mem: + cmp count, #63 + b.le .Ltail63 + /* + * For zeroing small amounts of memory, it's not worth setting up + * the line-clear code. + */ + cmp count, #128 + b.lt .Lnot_short /*count is at least 128 bytes*/ + + mrs tmp1, dczid_el0 + tbnz tmp1, #4, .Lnot_short + mov tmp3w, #4 + and zva_len, tmp1w, #15 /* Safety: other bits reserved. */ + lsl zva_len, tmp3w, zva_len + + ands tmp3w, zva_len, #63 + /* + * ensure the zva_len is not less than 64. + * It is not meaningful to use ZVA if the block size is less than 64. + */ + b.ne .Lnot_short +.Lzero_by_line: + /* + * Compute how far we need to go to become suitably aligned. We're + * already at quad-word alignment. + */ + cmp count, zva_len_x + b.lt .Lnot_short /* Not enough to reach alignment. */ + sub zva_bits_x, zva_len_x, #1 + neg tmp2, dst + ands tmp2, tmp2, zva_bits_x + b.eq 2f /* Already aligned. */ + /* Not aligned, check that there's enough to copy after alignment.*/ + sub tmp1, count, tmp2 + /* + * grantee the remain length to be ZVA is bigger than 64, + * avoid to make the 2f's process over mem range.*/ + cmp tmp1, #64 + ccmp tmp1, zva_len_x, #8, ge /* NZCV=0b1000 */ + b.lt .Lnot_short + /* + * We know that there's at least 64 bytes to zero and that it's safe + * to overrun by 64 bytes. + */ + mov count, tmp1 +1: + stp A_l, A_l, [dst] + stp A_l, A_l, [dst, #16] + stp A_l, A_l, [dst, #32] + subs tmp2, tmp2, #64 + stp A_l, A_l, [dst, #48] + add dst, dst, #64 + b.ge 1b + /* We've overrun a bit, so adjust dst downwards.*/ + add dst, dst, tmp2 +2: + sub count, count, zva_len_x +3: + dc zva, dst + add dst, dst, zva_len_x + subs count, count, zva_len_x + b.ge 3b + ands count, count, zva_bits_x + b.ne .Ltail_maybe_long + ret ENDPROC(memset) diff --git a/xen/include/asm-arm/arm32/cmpxchg.h b/xen/include/asm-arm/arm32/cmpxchg.h index 3f4e7a1..9a511f2 100644 --- a/xen/include/asm-arm/arm32/cmpxchg.h +++ b/xen/include/asm-arm/arm32/cmpxchg.h @@ -40,6 +40,9 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 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 diff --git a/xen/include/asm-arm/arm64/atomic.h b/xen/include/asm-arm/arm64/atomic.h index b5d50f2..b49219e 100644 --- a/xen/include/asm-arm/arm64/atomic.h +++ b/xen/include/asm-arm/arm64/atomic.h @@ -136,11 +136,6 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) #define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) -#define smp_mb__before_atomic_dec() smp_mb() -#define smp_mb__after_atomic_dec() smp_mb() -#define smp_mb__before_atomic_inc() smp_mb() -#define smp_mb__after_atomic_inc() smp_mb() - #endif /* * Local variables: diff --git a/xen/include/asm-arm/arm64/cmpxchg.h b/xen/include/asm-arm/arm64/cmpxchg.h index 4e930ce..ae42b2f 100644 --- a/xen/include/asm-arm/arm64/cmpxchg.h +++ b/xen/include/asm-arm/arm64/cmpxchg.h @@ -54,7 +54,12 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size } #define xchg(ptr,x) \ - ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __ret; \ +}) extern void __bad_cmpxchg(volatile void *ptr, int size); @@ -144,17 +149,23 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, return ret; } -#define cmpxchg(ptr,o,n) \ - ((__typeof__(*(ptr)))__cmpxchg_mb((ptr), \ - (unsigned long)(o), \ - (unsigned long)(n), \ - sizeof(*(ptr)))) - -#define cmpxchg_local(ptr,o,n) \ - ((__typeof__(*(ptr)))__cmpxchg((ptr), \ - (unsigned long)(o), \ - (unsigned long)(n), \ - sizeof(*(ptr)))) +#define cmpxchg(ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \ + sizeof(*(ptr))); \ + __ret; \ +}) + +#define cmpxchg_local(ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __cmpxchg((ptr), (unsigned long)(o), \ + (unsigned long)(n), sizeof(*(ptr))); \ + __ret; \ +}) #endif /* diff --git a/xen/include/asm-arm/string.h b/xen/include/asm-arm/string.h index 3242762..dfad1fe 100644 --- a/xen/include/asm-arm/string.h +++ b/xen/include/asm-arm/string.h @@ -17,6 +17,11 @@ extern char * strchr(const char * s, int c); #define __HAVE_ARCH_MEMCPY extern void * memcpy(void *, const void *, __kernel_size_t); +#if defined(CONFIG_ARM_64) +#define __HAVE_ARCH_MEMCMP +extern int memcmp(const void *, const void *, __kernel_size_t); +#endif + /* Some versions of gcc don't have this builtin. It's non-critical anyway. */ #define __HAVE_ARCH_MEMMOVE extern void *memmove(void *dest, const void *src, size_t n); diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 7aaaf50..ce3d38a 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -33,9 +33,6 @@ #define smp_wmb() dmb(ishst) -#define xchg(ptr,x) \ - ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) - /* * This is used to ensure the compiler did actually allocate the register we * asked it for some inline assembly sequences. Apparently we can't trust -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHL4-0001RE-LI; Tue, 12 Aug 2014 19:02:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHL3-0001Qy-BD for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:29 +0000 Received: from [85.158.143.35:49697] by server-2.bemta-4.messagelabs.com id 52/BB-04525-4C46AE35; Tue, 12 Aug 2014 19:02:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1407870146!12655113!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8028 invoked from network); 12 Aug 2014 19:02:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHL0-00005G-3p for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHL0-0003JD-1C for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:26 +0000 Date: Tue, 12 Aug 2014 19:02:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: update arm32 assembly primitives to Linux v3.16-rc6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65e9f0660697e895ada7999a4e9822c716bc4ec7 Author: Ian Campbell AuthorDate: Fri Jul 25 16:22:52 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 16:53:31 2014 +0100 xen: arm: update arm32 assembly primitives to Linux v3.16-rc6 bitops, cmpxchg, atomics: Import: c32ffce ARM: 7984/1: prefetch: add prefetchw invocations for barriered atomics Author: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Russell King atomics: In addition to the above import: db38ee8 ARM: 7983/1: atomics: implement a better __atomic_add_unless for v6+ Author: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Russell King spinlocks: We have diverged from Linux, so no updates but note this in the README. mem* and str*: Import: d98b90e ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull Author: Victor Kamensky Suggested-by: Will Deacon Signed-off-by: Victor Kamensky Acked-by: Nicolas Pitre Signed-off-by: Russell King For some reason str* were mentioned under mem* in the README, fix. libgcc: No changes, update baseline Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 17 +++++++-------- xen/arch/arm/arm32/lib/assembler.h | 8 +++--- xen/arch/arm/arm32/lib/bitops.h | 5 ++++ xen/arch/arm/arm32/lib/copy_template.S | 36 ++++++++++++++++---------------- xen/arch/arm/arm32/lib/memmove.S | 36 ++++++++++++++++---------------- xen/include/asm-arm/arm32/atomic.h | 32 ++++++++++++++++++++++++++++ xen/include/asm-arm/arm32/cmpxchg.h | 5 ++++ 7 files changed, 90 insertions(+), 49 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 69eeb70..7e15b04 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -65,7 +65,7 @@ linux/arch/arm64/lib/copy_page.S unused in Xen arm32 ===================================================================== -bitops: last sync @ v3.14-rc7 (last commit: b7ec699) +bitops: last sync @ v3.16-rc6 (last commit: c32ffce0f66e) linux/arch/arm/lib/bitops.h xen/arch/arm/arm32/lib/bitops.h linux/arch/arm/lib/changebit.S xen/arch/arm/arm32/lib/changebit.S @@ -83,13 +83,13 @@ done --------------------------------------------------------------------- -cmpxchg: last sync @ v3.14-rc7 (last commit: 775ebcc) +cmpxchg: last sync @ v3.16-rc6 (last commit: c32ffce0f66e) linux/arch/arm/include/asm/cmpxchg.h xen/include/asm-arm/arm32/cmpxchg.h --------------------------------------------------------------------- -atomics: last sync @ v3.14-rc7 (last commit: aed3a4e) +atomics: last sync @ v3.16-rc6 (last commit: 030d0178bdbd) linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h @@ -99,6 +99,8 @@ spinlocks: last sync: 15e7e5c1ebf5 linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h +*** Linux has switched to ticket locks but we still use bitlocks. + resync to v3.14-rc7: 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev @@ -111,7 +113,7 @@ resync to v3.14-rc7: --------------------------------------------------------------------- -mem*: last sync @ v3.14-rc7 (last commit: 418df63a) +mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S linux/arch/arm/lib/memchr.S xen/arch/arm/arm32/lib/memchr.S @@ -120,9 +122,6 @@ linux/arch/arm/lib/memmove.S xen/arch/arm/arm32/lib/memmove.S linux/arch/arm/lib/memset.S xen/arch/arm/arm32/lib/memset.S linux/arch/arm/lib/memzero.S xen/arch/arm/arm32/lib/memzero.S -linux/arch/arm/lib/strchr.S xen/arch/arm/arm32/lib/strchr.S -linux/arch/arm/lib/strrchr.S xen/arch/arm/arm32/lib/strrchr.S - for i in copy_template.S memchr.S memcpy.S memmove.S memset.S \ memzero.S ; do diff -u linux/arch/arm/lib/$i xen/arch/arm/arm32/lib/$i @@ -130,7 +129,7 @@ done --------------------------------------------------------------------- -str*: last sync @ v3.13-rc7 (last commit: 93ed397) +str*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/strchr.S xen/arch/arm/arm32/lib/strchr.S linux/arch/arm/lib/strrchr.S xen/arch/arm/arm32/lib/strrchr.S @@ -145,7 +144,7 @@ clear_page == memset --------------------------------------------------------------------- -libgcc: last sync @ v3.14-rc7 (last commit: 01885bc) +libgcc: last sync @ v3.16-rc6 (last commit: 01885bc) linux/arch/arm/lib/lib1funcs.S xen/arch/arm/arm32/lib/lib1funcs.S linux/arch/arm/lib/lshrdi3.S xen/arch/arm/arm32/lib/lshrdi3.S diff --git a/xen/arch/arm/arm32/lib/assembler.h b/xen/arch/arm/arm32/lib/assembler.h index f8d4b3a..6de2638 100644 --- a/xen/arch/arm/arm32/lib/assembler.h +++ b/xen/arch/arm/arm32/lib/assembler.h @@ -36,8 +36,8 @@ * Endian independent macros for shifting bytes within registers. */ #ifndef __ARMEB__ -#define pull lsr -#define push lsl +#define lspull lsr +#define lspush lsl #define get_byte_0 lsl #0 #define get_byte_1 lsr #8 #define get_byte_2 lsr #16 @@ -47,8 +47,8 @@ #define put_byte_2 lsl #16 #define put_byte_3 lsl #24 #else -#define pull lsl -#define push lsr +#define lspull lsl +#define lspush lsr #define get_byte_0 lsr #24 #define get_byte_1 lsr #16 #define get_byte_2 lsr #8 diff --git a/xen/arch/arm/arm32/lib/bitops.h b/xen/arch/arm/arm32/lib/bitops.h index 25784c3..a167c2d 100644 --- a/xen/arch/arm/arm32/lib/bitops.h +++ b/xen/arch/arm/arm32/lib/bitops.h @@ -37,6 +37,11 @@ UNWIND( .fnstart ) add r1, r1, r0, lsl #2 @ Get word offset mov r3, r2, lsl r3 @ create mask smp_dmb +#if __LINUX_ARM_ARCH__ >= 7 && defined(CONFIG_SMP) + .arch_extension mp + ALT_SMP(W(pldw) [r1]) + ALT_UP(W(nop)) +#endif 1: ldrex r2, [r1] ands r0, r2, r3 @ save old value of bit \instr r2, r2, r3 @ toggle bit diff --git a/xen/arch/arm/arm32/lib/copy_template.S b/xen/arch/arm/arm32/lib/copy_template.S index 805e3f8..3bc8eb8 100644 --- a/xen/arch/arm/arm32/lib/copy_template.S +++ b/xen/arch/arm/arm32/lib/copy_template.S @@ -197,24 +197,24 @@ 12: PLD( pld [r1, #124] ) 13: ldr4w r1, r4, r5, r6, r7, abort=19f - mov r3, lr, pull #\pull + mov r3, lr, lspull #\pull subs r2, r2, #32 ldr4w r1, r8, r9, ip, lr, abort=19f - orr r3, r3, r4, push #\push - mov r4, r4, pull #\pull - orr r4, r4, r5, push #\push - mov r5, r5, pull #\pull - orr r5, r5, r6, push #\push - mov r6, r6, pull #\pull - orr r6, r6, r7, push #\push - mov r7, r7, pull #\pull - orr r7, r7, r8, push #\push - mov r8, r8, pull #\pull - orr r8, r8, r9, push #\push - mov r9, r9, pull #\pull - orr r9, r9, ip, push #\push - mov ip, ip, pull #\pull - orr ip, ip, lr, push #\push + orr r3, r3, r4, lspush #\push + mov r4, r4, lspull #\pull + orr r4, r4, r5, lspush #\push + mov r5, r5, lspull #\pull + orr r5, r5, r6, lspush #\push + mov r6, r6, lspull #\pull + orr r6, r6, r7, lspush #\push + mov r7, r7, lspull #\pull + orr r7, r7, r8, lspush #\push + mov r8, r8, lspull #\pull + orr r8, r8, r9, lspush #\push + mov r9, r9, lspull #\pull + orr r9, r9, ip, lspush #\push + mov ip, ip, lspull #\pull + orr ip, ip, lr, lspush #\push str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f bge 12b PLD( cmn r2, #96 ) @@ -225,10 +225,10 @@ 14: ands ip, r2, #28 beq 16f -15: mov r3, lr, pull #\pull +15: mov r3, lr, lspull #\pull ldr1w r1, lr, abort=21f subs ip, ip, #4 - orr r3, r3, lr, push #\push + orr r3, r3, lr, lspush #\push str1w r0, r3, abort=21f bgt 15b CALGN( cmp r2, #0 ) diff --git a/xen/arch/arm/arm32/lib/memmove.S b/xen/arch/arm/arm32/lib/memmove.S index 4e142b8..18634c3 100644 --- a/xen/arch/arm/arm32/lib/memmove.S +++ b/xen/arch/arm/arm32/lib/memmove.S @@ -148,24 +148,24 @@ ENTRY(memmove) 12: PLD( pld [r1, #-128] ) 13: ldmdb r1!, {r7, r8, r9, ip} - mov lr, r3, push #\push + mov lr, r3, lspush #\push subs r2, r2, #32 ldmdb r1!, {r3, r4, r5, r6} - orr lr, lr, ip, pull #\pull - mov ip, ip, push #\push - orr ip, ip, r9, pull #\pull - mov r9, r9, push #\push - orr r9, r9, r8, pull #\pull - mov r8, r8, push #\push - orr r8, r8, r7, pull #\pull - mov r7, r7, push #\push - orr r7, r7, r6, pull #\pull - mov r6, r6, push #\push - orr r6, r6, r5, pull #\pull - mov r5, r5, push #\push - orr r5, r5, r4, pull #\pull - mov r4, r4, push #\push - orr r4, r4, r3, pull #\pull + orr lr, lr, ip, lspull #\pull + mov ip, ip, lspush #\push + orr ip, ip, r9, lspull #\pull + mov r9, r9, lspush #\push + orr r9, r9, r8, lspull #\pull + mov r8, r8, lspush #\push + orr r8, r8, r7, lspull #\pull + mov r7, r7, lspush #\push + orr r7, r7, r6, lspull #\pull + mov r6, r6, lspush #\push + orr r6, r6, r5, lspull #\pull + mov r5, r5, lspush #\push + orr r5, r5, r4, lspull #\pull + mov r4, r4, lspush #\push + orr r4, r4, r3, lspull #\pull stmdb r0!, {r4 - r9, ip, lr} bge 12b PLD( cmn r2, #96 ) @@ -176,10 +176,10 @@ ENTRY(memmove) 14: ands ip, r2, #28 beq 16f -15: mov lr, r3, push #\push +15: mov lr, r3, lspush #\push ldr r3, [r1, #-4]! subs ip, ip, #4 - orr lr, lr, r3, pull #\pull + orr lr, lr, r3, lspull #\pull str lr, [r0, #-4]! bgt 15b CALGN( cmp r2, #0 ) diff --git a/xen/include/asm-arm/arm32/atomic.h b/xen/include/asm-arm/arm32/atomic.h index 3d601d1..7ec712f 100644 --- a/xen/include/asm-arm/arm32/atomic.h +++ b/xen/include/asm-arm/arm32/atomic.h @@ -39,6 +39,7 @@ static inline int atomic_add_return(int i, atomic_t *v) int result; smp_mb(); + prefetchw(&v->counter); __asm__ __volatile__("@ atomic_add_return\n" "1: ldrex %0, [%3]\n" @@ -78,6 +79,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) int result; smp_mb(); + prefetchw(&v->counter); __asm__ __volatile__("@ atomic_sub_return\n" "1: ldrex %0, [%3]\n" @@ -100,6 +102,7 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) unsigned long res; smp_mb(); + prefetchw(&ptr->counter); do { __asm__ __volatile__("@ atomic_cmpxchg\n" @@ -117,6 +120,35 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) 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; +} + +#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) + #define atomic_inc(v) atomic_add(1, v) #define atomic_dec(v) atomic_sub(1, v) diff --git a/xen/include/asm-arm/arm32/cmpxchg.h b/xen/include/asm-arm/arm32/cmpxchg.h index 9a511f2..03e0bed 100644 --- a/xen/include/asm-arm/arm32/cmpxchg.h +++ b/xen/include/asm-arm/arm32/cmpxchg.h @@ -1,6 +1,8 @@ #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) @@ -9,6 +11,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size unsigned int tmp; smp_mb(); + prefetchw((const void *)ptr); switch (size) { case 1: @@ -56,6 +59,8 @@ static always_inline unsigned long __cmpxchg( { unsigned long oldval, res; + prefetchw((const void *)ptr); + switch (size) { case 1: do { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHL4-0001RE-LI; Tue, 12 Aug 2014 19:02:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHL3-0001Qy-BD for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:29 +0000 Received: from [85.158.143.35:49697] by server-2.bemta-4.messagelabs.com id 52/BB-04525-4C46AE35; Tue, 12 Aug 2014 19:02:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1407870146!12655113!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8028 invoked from network); 12 Aug 2014 19:02:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHL0-00005G-3p for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHL0-0003JD-1C for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:26 +0000 Date: Tue, 12 Aug 2014 19:02:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: update arm32 assembly primitives to Linux v3.16-rc6 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 65e9f0660697e895ada7999a4e9822c716bc4ec7 Author: Ian Campbell AuthorDate: Fri Jul 25 16:22:52 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 16:53:31 2014 +0100 xen: arm: update arm32 assembly primitives to Linux v3.16-rc6 bitops, cmpxchg, atomics: Import: c32ffce ARM: 7984/1: prefetch: add prefetchw invocations for barriered atomics Author: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Russell King atomics: In addition to the above import: db38ee8 ARM: 7983/1: atomics: implement a better __atomic_add_unless for v6+ Author: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Russell King spinlocks: We have diverged from Linux, so no updates but note this in the README. mem* and str*: Import: d98b90e ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull Author: Victor Kamensky Suggested-by: Will Deacon Signed-off-by: Victor Kamensky Acked-by: Nicolas Pitre Signed-off-by: Russell King For some reason str* were mentioned under mem* in the README, fix. libgcc: No changes, update baseline Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 17 +++++++-------- xen/arch/arm/arm32/lib/assembler.h | 8 +++--- xen/arch/arm/arm32/lib/bitops.h | 5 ++++ xen/arch/arm/arm32/lib/copy_template.S | 36 ++++++++++++++++---------------- xen/arch/arm/arm32/lib/memmove.S | 36 ++++++++++++++++---------------- xen/include/asm-arm/arm32/atomic.h | 32 ++++++++++++++++++++++++++++ xen/include/asm-arm/arm32/cmpxchg.h | 5 ++++ 7 files changed, 90 insertions(+), 49 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 69eeb70..7e15b04 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -65,7 +65,7 @@ linux/arch/arm64/lib/copy_page.S unused in Xen arm32 ===================================================================== -bitops: last sync @ v3.14-rc7 (last commit: b7ec699) +bitops: last sync @ v3.16-rc6 (last commit: c32ffce0f66e) linux/arch/arm/lib/bitops.h xen/arch/arm/arm32/lib/bitops.h linux/arch/arm/lib/changebit.S xen/arch/arm/arm32/lib/changebit.S @@ -83,13 +83,13 @@ done --------------------------------------------------------------------- -cmpxchg: last sync @ v3.14-rc7 (last commit: 775ebcc) +cmpxchg: last sync @ v3.16-rc6 (last commit: c32ffce0f66e) linux/arch/arm/include/asm/cmpxchg.h xen/include/asm-arm/arm32/cmpxchg.h --------------------------------------------------------------------- -atomics: last sync @ v3.14-rc7 (last commit: aed3a4e) +atomics: last sync @ v3.16-rc6 (last commit: 030d0178bdbd) linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h @@ -99,6 +99,8 @@ spinlocks: last sync: 15e7e5c1ebf5 linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h +*** Linux has switched to ticket locks but we still use bitlocks. + resync to v3.14-rc7: 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev @@ -111,7 +113,7 @@ resync to v3.14-rc7: --------------------------------------------------------------------- -mem*: last sync @ v3.14-rc7 (last commit: 418df63a) +mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S linux/arch/arm/lib/memchr.S xen/arch/arm/arm32/lib/memchr.S @@ -120,9 +122,6 @@ linux/arch/arm/lib/memmove.S xen/arch/arm/arm32/lib/memmove.S linux/arch/arm/lib/memset.S xen/arch/arm/arm32/lib/memset.S linux/arch/arm/lib/memzero.S xen/arch/arm/arm32/lib/memzero.S -linux/arch/arm/lib/strchr.S xen/arch/arm/arm32/lib/strchr.S -linux/arch/arm/lib/strrchr.S xen/arch/arm/arm32/lib/strrchr.S - for i in copy_template.S memchr.S memcpy.S memmove.S memset.S \ memzero.S ; do diff -u linux/arch/arm/lib/$i xen/arch/arm/arm32/lib/$i @@ -130,7 +129,7 @@ done --------------------------------------------------------------------- -str*: last sync @ v3.13-rc7 (last commit: 93ed397) +str*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/strchr.S xen/arch/arm/arm32/lib/strchr.S linux/arch/arm/lib/strrchr.S xen/arch/arm/arm32/lib/strrchr.S @@ -145,7 +144,7 @@ clear_page == memset --------------------------------------------------------------------- -libgcc: last sync @ v3.14-rc7 (last commit: 01885bc) +libgcc: last sync @ v3.16-rc6 (last commit: 01885bc) linux/arch/arm/lib/lib1funcs.S xen/arch/arm/arm32/lib/lib1funcs.S linux/arch/arm/lib/lshrdi3.S xen/arch/arm/arm32/lib/lshrdi3.S diff --git a/xen/arch/arm/arm32/lib/assembler.h b/xen/arch/arm/arm32/lib/assembler.h index f8d4b3a..6de2638 100644 --- a/xen/arch/arm/arm32/lib/assembler.h +++ b/xen/arch/arm/arm32/lib/assembler.h @@ -36,8 +36,8 @@ * Endian independent macros for shifting bytes within registers. */ #ifndef __ARMEB__ -#define pull lsr -#define push lsl +#define lspull lsr +#define lspush lsl #define get_byte_0 lsl #0 #define get_byte_1 lsr #8 #define get_byte_2 lsr #16 @@ -47,8 +47,8 @@ #define put_byte_2 lsl #16 #define put_byte_3 lsl #24 #else -#define pull lsl -#define push lsr +#define lspull lsl +#define lspush lsr #define get_byte_0 lsr #24 #define get_byte_1 lsr #16 #define get_byte_2 lsr #8 diff --git a/xen/arch/arm/arm32/lib/bitops.h b/xen/arch/arm/arm32/lib/bitops.h index 25784c3..a167c2d 100644 --- a/xen/arch/arm/arm32/lib/bitops.h +++ b/xen/arch/arm/arm32/lib/bitops.h @@ -37,6 +37,11 @@ UNWIND( .fnstart ) add r1, r1, r0, lsl #2 @ Get word offset mov r3, r2, lsl r3 @ create mask smp_dmb +#if __LINUX_ARM_ARCH__ >= 7 && defined(CONFIG_SMP) + .arch_extension mp + ALT_SMP(W(pldw) [r1]) + ALT_UP(W(nop)) +#endif 1: ldrex r2, [r1] ands r0, r2, r3 @ save old value of bit \instr r2, r2, r3 @ toggle bit diff --git a/xen/arch/arm/arm32/lib/copy_template.S b/xen/arch/arm/arm32/lib/copy_template.S index 805e3f8..3bc8eb8 100644 --- a/xen/arch/arm/arm32/lib/copy_template.S +++ b/xen/arch/arm/arm32/lib/copy_template.S @@ -197,24 +197,24 @@ 12: PLD( pld [r1, #124] ) 13: ldr4w r1, r4, r5, r6, r7, abort=19f - mov r3, lr, pull #\pull + mov r3, lr, lspull #\pull subs r2, r2, #32 ldr4w r1, r8, r9, ip, lr, abort=19f - orr r3, r3, r4, push #\push - mov r4, r4, pull #\pull - orr r4, r4, r5, push #\push - mov r5, r5, pull #\pull - orr r5, r5, r6, push #\push - mov r6, r6, pull #\pull - orr r6, r6, r7, push #\push - mov r7, r7, pull #\pull - orr r7, r7, r8, push #\push - mov r8, r8, pull #\pull - orr r8, r8, r9, push #\push - mov r9, r9, pull #\pull - orr r9, r9, ip, push #\push - mov ip, ip, pull #\pull - orr ip, ip, lr, push #\push + orr r3, r3, r4, lspush #\push + mov r4, r4, lspull #\pull + orr r4, r4, r5, lspush #\push + mov r5, r5, lspull #\pull + orr r5, r5, r6, lspush #\push + mov r6, r6, lspull #\pull + orr r6, r6, r7, lspush #\push + mov r7, r7, lspull #\pull + orr r7, r7, r8, lspush #\push + mov r8, r8, lspull #\pull + orr r8, r8, r9, lspush #\push + mov r9, r9, lspull #\pull + orr r9, r9, ip, lspush #\push + mov ip, ip, lspull #\pull + orr ip, ip, lr, lspush #\push str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f bge 12b PLD( cmn r2, #96 ) @@ -225,10 +225,10 @@ 14: ands ip, r2, #28 beq 16f -15: mov r3, lr, pull #\pull +15: mov r3, lr, lspull #\pull ldr1w r1, lr, abort=21f subs ip, ip, #4 - orr r3, r3, lr, push #\push + orr r3, r3, lr, lspush #\push str1w r0, r3, abort=21f bgt 15b CALGN( cmp r2, #0 ) diff --git a/xen/arch/arm/arm32/lib/memmove.S b/xen/arch/arm/arm32/lib/memmove.S index 4e142b8..18634c3 100644 --- a/xen/arch/arm/arm32/lib/memmove.S +++ b/xen/arch/arm/arm32/lib/memmove.S @@ -148,24 +148,24 @@ ENTRY(memmove) 12: PLD( pld [r1, #-128] ) 13: ldmdb r1!, {r7, r8, r9, ip} - mov lr, r3, push #\push + mov lr, r3, lspush #\push subs r2, r2, #32 ldmdb r1!, {r3, r4, r5, r6} - orr lr, lr, ip, pull #\pull - mov ip, ip, push #\push - orr ip, ip, r9, pull #\pull - mov r9, r9, push #\push - orr r9, r9, r8, pull #\pull - mov r8, r8, push #\push - orr r8, r8, r7, pull #\pull - mov r7, r7, push #\push - orr r7, r7, r6, pull #\pull - mov r6, r6, push #\push - orr r6, r6, r5, pull #\pull - mov r5, r5, push #\push - orr r5, r5, r4, pull #\pull - mov r4, r4, push #\push - orr r4, r4, r3, pull #\pull + orr lr, lr, ip, lspull #\pull + mov ip, ip, lspush #\push + orr ip, ip, r9, lspull #\pull + mov r9, r9, lspush #\push + orr r9, r9, r8, lspull #\pull + mov r8, r8, lspush #\push + orr r8, r8, r7, lspull #\pull + mov r7, r7, lspush #\push + orr r7, r7, r6, lspull #\pull + mov r6, r6, lspush #\push + orr r6, r6, r5, lspull #\pull + mov r5, r5, lspush #\push + orr r5, r5, r4, lspull #\pull + mov r4, r4, lspush #\push + orr r4, r4, r3, lspull #\pull stmdb r0!, {r4 - r9, ip, lr} bge 12b PLD( cmn r2, #96 ) @@ -176,10 +176,10 @@ ENTRY(memmove) 14: ands ip, r2, #28 beq 16f -15: mov lr, r3, push #\push +15: mov lr, r3, lspush #\push ldr r3, [r1, #-4]! subs ip, ip, #4 - orr lr, lr, r3, pull #\pull + orr lr, lr, r3, lspull #\pull str lr, [r0, #-4]! bgt 15b CALGN( cmp r2, #0 ) diff --git a/xen/include/asm-arm/arm32/atomic.h b/xen/include/asm-arm/arm32/atomic.h index 3d601d1..7ec712f 100644 --- a/xen/include/asm-arm/arm32/atomic.h +++ b/xen/include/asm-arm/arm32/atomic.h @@ -39,6 +39,7 @@ static inline int atomic_add_return(int i, atomic_t *v) int result; smp_mb(); + prefetchw(&v->counter); __asm__ __volatile__("@ atomic_add_return\n" "1: ldrex %0, [%3]\n" @@ -78,6 +79,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) int result; smp_mb(); + prefetchw(&v->counter); __asm__ __volatile__("@ atomic_sub_return\n" "1: ldrex %0, [%3]\n" @@ -100,6 +102,7 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) unsigned long res; smp_mb(); + prefetchw(&ptr->counter); do { __asm__ __volatile__("@ atomic_cmpxchg\n" @@ -117,6 +120,35 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) 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; +} + +#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) + #define atomic_inc(v) atomic_add(1, v) #define atomic_dec(v) atomic_sub(1, v) diff --git a/xen/include/asm-arm/arm32/cmpxchg.h b/xen/include/asm-arm/arm32/cmpxchg.h index 9a511f2..03e0bed 100644 --- a/xen/include/asm-arm/arm32/cmpxchg.h +++ b/xen/include/asm-arm/arm32/cmpxchg.h @@ -1,6 +1,8 @@ #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) @@ -9,6 +11,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size unsigned int tmp; smp_mb(); + prefetchw((const void *)ptr); switch (size) { case 1: @@ -56,6 +59,8 @@ static always_inline unsigned long __cmpxchg( { unsigned long oldval, res; + prefetchw((const void *)ptr); + switch (size) { case 1: do { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLF-0001T6-O7; Tue, 12 Aug 2014 19:02:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLE-0001Sm-F3 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:40 +0000 Received: from [193.109.254.147:57470] by server-11.bemta-14.messagelabs.com id 7F/CB-14213-FC46AE35; Tue, 12 Aug 2014 19:02:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1407870156!12059975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32736 invoked from network); 12 Aug 2014 19:02:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLA-00005Q-B3 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLA-0003Jh-8r for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:36 +0000 Date: Tue, 12 Aug 2014 19:02:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add new str* primitives from Linux v3.16-rc6. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f65a05af142d47fcfbca14778348edad213fcf2c Author: Ian Campbell AuthorDate: Fri Jul 25 16:31:46 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 16:54:34 2014 +0100 xen: arm: Add new str* primitives from Linux v3.16-rc6. Imports: 0a42cb0 arm64: lib: Implement optimized string length routines Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas 192c4d9 arm64: lib: Implement optimized string compare routines Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 10 +- xen/arch/arm/arm64/lib/Makefile | 2 +- xen/arch/arm/arm64/lib/strcmp.S | 235 ++++++++++++++++++++++++++ xen/arch/arm/arm64/lib/strlen.S | 128 ++++++++++++++ xen/arch/arm/arm64/lib/strncmp.S | 311 +++++++++++++++++++++++++++++++++++ xen/arch/arm/arm64/lib/strnlen.S | 172 +++++++++++++++++++ xen/include/asm-arm/string.h | 14 ++ 7 files changed, 870 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 7e15b04..7f33fc7 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -49,11 +49,19 @@ done --------------------------------------------------------------------- -str*: last sync @ v3.16-rc6 (last commit: 2b8cac814cd5) +str*: last sync @ v3.16-rc6 (last commit: 0a42cb0a6fa6) linux/arch/arm64/lib/strchr.S xen/arch/arm/arm64/lib/strchr.S +linux/arch/arm64/lib/strcmp.S xen/arch/arm/arm64/lib/strcmp.S +linux/arch/arm64/lib/strlen.S xen/arch/arm/arm64/lib/strlen.S +linux/arch/arm64/lib/strncmp.S xen/arch/arm/arm64/lib/strncmp.S +linux/arch/arm64/lib/strnlen.S xen/arch/arm/arm64/lib/strnlen.S linux/arch/arm64/lib/strrchr.S xen/arch/arm/arm64/lib/strrchr.S +for i in strchr.S strcmp.S strlen.S strncmp.S strnlen.S strrchr.S ; do + diff -u linux/arch/arm64/lib/$i xen/arch/arm/arm64/lib/$i +done + --------------------------------------------------------------------- {clear,copy}_page: last sync @ v3.16-rc6 (last commit: f27bb139c387) diff --git a/xen/arch/arm/arm64/lib/Makefile b/xen/arch/arm/arm64/lib/Makefile index 2e7fb64..1b9c7a9 100644 --- a/xen/arch/arm/arm64/lib/Makefile +++ b/xen/arch/arm/arm64/lib/Makefile @@ -1,4 +1,4 @@ obj-y += memcpy.o memcmp.o memmove.o memset.o memchr.o obj-y += clear_page.o obj-y += bitops.o find_next_bit.o -obj-y += strchr.o strrchr.o +obj-y += strchr.o strcmp.o strlen.o strncmp.o strnlen.o strrchr.o diff --git a/xen/arch/arm/arm64/lib/strcmp.S b/xen/arch/arm/arm64/lib/strcmp.S new file mode 100644 index 0000000..bdcf7b0 --- /dev/null +++ b/xen/arch/arm/arm64/lib/strcmp.S @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + +/* + * compare two strings + * + * Parameters: + * x0 - const string 1 pointer + * x1 - const string 2 pointer + * Returns: + * x0 - an integer less than, equal to, or greater than zero + * if s1 is found, respectively, to be less than, to match, + * or be greater than s2. + */ + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +/* Parameters and result. */ +src1 .req x0 +src2 .req x1 +result .req x0 + +/* Internal variables. */ +data1 .req x2 +data1w .req w2 +data2 .req x3 +data2w .req w3 +has_nul .req x4 +diff .req x5 +syndrome .req x6 +tmp1 .req x7 +tmp2 .req x8 +tmp3 .req x9 +zeroones .req x10 +pos .req x11 + +ENTRY(strcmp) + eor tmp1, src1, src2 + mov zeroones, #REP8_01 + tst tmp1, #7 + b.ne .Lmisaligned8 + ands tmp1, src1, #7 + b.ne .Lmutual_align + + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ +.Lloop_aligned: + ldr data1, [src1], #8 + ldr data2, [src2], #8 +.Lstart_realigned: + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + bic has_nul, tmp1, tmp2 /* Non-zero if NUL terminator. */ + orr syndrome, diff, has_nul + cbz syndrome, .Lloop_aligned + b .Lcal_cmpresult + +.Lmutual_align: + /* + * Sources are mutually aligned, but are not currently at an + * alignment boundary. Round down the addresses and then mask off + * the bytes that preceed the start point. + */ + bic src1, src1, #7 + bic src2, src2, #7 + lsl tmp1, tmp1, #3 /* Bytes beyond alignment -> bits. */ + ldr data1, [src1], #8 + neg tmp1, tmp1 /* Bits to alignment -64. */ + ldr data2, [src2], #8 + mov tmp2, #~0 + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + + orr data1, data1, tmp2 + orr data2, data2, tmp2 + b .Lstart_realigned + +.Lmisaligned8: + /* + * Get the align offset length to compare per byte first. + * After this process, one string's address will be aligned. + */ + and tmp1, src1, #7 + neg tmp1, tmp1 + add tmp1, tmp1, #8 + and tmp2, src2, #7 + neg tmp2, tmp2 + add tmp2, tmp2, #8 + subs tmp3, tmp1, tmp2 + csel pos, tmp1, tmp2, hi /*Choose the maximum. */ +.Ltinycmp: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs pos, pos, #1 + ccmp data1w, #1, #0, ne /* NZCV = 0b0000. */ + ccmp data1w, data2w, #0, cs /* NZCV = 0b0000. */ + b.eq .Ltinycmp + cbnz pos, 1f /*find the null or unequal...*/ + cmp data1w, #1 + ccmp data1w, data2w, #0, cs + b.eq .Lstart_align /*the last bytes are equal....*/ +1: + sub result, data1, data2 + ret + +.Lstart_align: + ands xzr, src1, #7 + b.eq .Lrecal_offset + /*process more leading bytes to make str1 aligned...*/ + add src1, src1, tmp3 + add src2, src2, tmp3 + /*load 8 bytes from aligned str1 and non-aligned str2..*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bic has_nul, tmp1, tmp2 + eor diff, data1, data2 /* Non-zero if differences found. */ + orr syndrome, diff, has_nul + cbnz syndrome, .Lcal_cmpresult + /*How far is the current str2 from the alignment boundary...*/ + and tmp3, tmp3, #7 +.Lrecal_offset: + neg pos, tmp3 +.Lloopcmp_proc: + /* + * Divide the eight bytes into two parts. First,backwards the src2 + * to an alignment boundary,load eight bytes from the SRC2 alignment + * boundary,then compare with the relative bytes from SRC1. + * If all 8 bytes are equal,then start the second part's comparison. + * Otherwise finish the comparison. + * This special handle can garantee all the accesses are in the + * thread/task space in avoid to overrange access. + */ + ldr data1, [src1,pos] + ldr data2, [src2,pos] + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bic has_nul, tmp1, tmp2 + eor diff, data1, data2 /* Non-zero if differences found. */ + orr syndrome, diff, has_nul + cbnz syndrome, .Lcal_cmpresult + + /*The second part process*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bic has_nul, tmp1, tmp2 + eor diff, data1, data2 /* Non-zero if differences found. */ + orr syndrome, diff, has_nul + cbz syndrome, .Lloopcmp_proc + +.Lcal_cmpresult: + /* + * reversed the byte-order as big-endian,then CLZ can find the most + * significant zero bits. + */ +CPU_LE( rev syndrome, syndrome ) +CPU_LE( rev data1, data1 ) +CPU_LE( rev data2, data2 ) + + /* + * For big-endian we cannot use the trick with the syndrome value + * as carry-propagation can corrupt the upper bits if the trailing + * bytes in the string contain 0x01. + * However, if there is no NUL byte in the dword, we can generate + * the result directly. We ca not just subtract the bytes as the + * MSB might be significant. + */ +CPU_BE( cbnz has_nul, 1f ) +CPU_BE( cmp data1, data2 ) +CPU_BE( cset result, ne ) +CPU_BE( cneg result, result, lo ) +CPU_BE( ret ) +CPU_BE( 1: ) + /*Re-compute the NUL-byte detection, using a byte-reversed value. */ +CPU_BE( rev tmp3, data1 ) +CPU_BE( sub tmp1, tmp3, zeroones ) +CPU_BE( orr tmp2, tmp3, #REP8_7f ) +CPU_BE( bic has_nul, tmp1, tmp2 ) +CPU_BE( rev has_nul, has_nul ) +CPU_BE( orr syndrome, diff, has_nul ) + + clz pos, syndrome + /* + * The MS-non-zero bit of the syndrome marks either the first bit + * that is different, or the top bit of the first zero byte. + * Shifting left now will bring the critical information into the + * top bits. + */ + lsl data1, data1, pos + lsl data2, data2, pos + /* + * But we need to zero-extend (char is unsigned) the value and then + * perform a signed 32-bit subtraction. + */ + lsr data1, data1, #56 + sub result, data1, data2, lsr #56 + ret +ENDPROC(strcmp) diff --git a/xen/arch/arm/arm64/lib/strlen.S b/xen/arch/arm/arm64/lib/strlen.S new file mode 100644 index 0000000..ee055a2 --- /dev/null +++ b/xen/arch/arm/arm64/lib/strlen.S @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + + +/* + * calculate the length of a string + * + * Parameters: + * x0 - const string pointer + * Returns: + * x0 - the return length of specific string + */ + +/* Arguments and results. */ +srcin .req x0 +len .req x0 + +/* Locals and temporaries. */ +src .req x1 +data1 .req x2 +data2 .req x3 +data2a .req x4 +has_nul1 .req x5 +has_nul2 .req x6 +tmp1 .req x7 +tmp2 .req x8 +tmp3 .req x9 +tmp4 .req x10 +zeroones .req x11 +pos .req x12 + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +ENTRY(strlen) + mov zeroones, #REP8_01 + bic src, srcin, #15 + ands tmp1, srcin, #15 + b.ne .Lmisaligned + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ + /* + * The inner loop deals with two Dwords at a time. This has a + * slightly higher start-up cost, but we should win quite quickly, + * especially on cores with a high number of issue slots per + * cycle, as we get much better parallelism out of the operations. + */ +.Lloop: + ldp data1, data2, [src], #16 +.Lrealigned: + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + sub tmp3, data2, zeroones + orr tmp4, data2, #REP8_7f + bic has_nul1, tmp1, tmp2 + bics has_nul2, tmp3, tmp4 + ccmp has_nul1, #0, #0, eq /* NZCV = 0000 */ + b.eq .Lloop + + sub len, src, srcin + cbz has_nul1, .Lnul_in_data2 +CPU_BE( mov data2, data1 ) /*prepare data to re-calculate the syndrome*/ + sub len, len, #8 + mov has_nul2, has_nul1 +.Lnul_in_data2: + /* + * For big-endian, carry propagation (if the final byte in the + * string is 0x01) means we cannot use has_nul directly. The + * easiest way to get the correct byte is to byte-swap the data + * and calculate the syndrome a second time. + */ +CPU_BE( rev data2, data2 ) +CPU_BE( sub tmp1, data2, zeroones ) +CPU_BE( orr tmp2, data2, #REP8_7f ) +CPU_BE( bic has_nul2, tmp1, tmp2 ) + + sub len, len, #8 + rev has_nul2, has_nul2 + clz pos, has_nul2 + add len, len, pos, lsr #3 /* Bits to bytes. */ + ret + +.Lmisaligned: + cmp tmp1, #8 + neg tmp1, tmp1 + ldp data1, data2, [src], #16 + lsl tmp1, tmp1, #3 /* Bytes beyond alignment -> bits. */ + mov tmp2, #~0 + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + + orr data1, data1, tmp2 + orr data2a, data2, tmp2 + csinv data1, data1, xzr, le + csel data2, data2, data2a, le + b .Lrealigned +ENDPROC(strlen) diff --git a/xen/arch/arm/arm64/lib/strncmp.S b/xen/arch/arm/arm64/lib/strncmp.S new file mode 100644 index 0000000..ca2e4a6 --- /dev/null +++ b/xen/arch/arm/arm64/lib/strncmp.S @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + +/* + * compare two strings + * + * Parameters: + * x0 - const string 1 pointer + * x1 - const string 2 pointer + * x2 - the maximal length to be compared + * Returns: + * x0 - an integer less than, equal to, or greater than zero if s1 is found, + * respectively, to be less than, to match, or be greater than s2. + */ + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +/* Parameters and result. */ +src1 .req x0 +src2 .req x1 +limit .req x2 +result .req x0 + +/* Internal variables. */ +data1 .req x3 +data1w .req w3 +data2 .req x4 +data2w .req w4 +has_nul .req x5 +diff .req x6 +syndrome .req x7 +tmp1 .req x8 +tmp2 .req x9 +tmp3 .req x10 +zeroones .req x11 +pos .req x12 +limit_wd .req x13 +mask .req x14 +endloop .req x15 + +ENTRY(strncmp) + cbz limit, .Lret0 + eor tmp1, src1, src2 + mov zeroones, #REP8_01 + tst tmp1, #7 + b.ne .Lmisaligned8 + ands tmp1, src1, #7 + b.ne .Lmutual_align + /* Calculate the number of full and partial words -1. */ + /* + * when limit is mulitply of 8, if not sub 1, + * the judgement of last dword will wrong. + */ + sub limit_wd, limit, #1 /* limit != 0, so no underflow. */ + lsr limit_wd, limit_wd, #3 /* Convert to Dwords. */ + + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ +.Lloop_aligned: + ldr data1, [src1], #8 + ldr data2, [src2], #8 +.Lstart_realigned: + subs limit_wd, limit_wd, #1 + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, pl /* Last Dword or differences.*/ + bics has_nul, tmp1, tmp2 /* Non-zero if NUL terminator. */ + ccmp endloop, #0, #0, eq + b.eq .Lloop_aligned + + /*Not reached the limit, must have found the end or a diff. */ + tbz limit_wd, #63, .Lnot_limit + + /* Limit % 8 == 0 => all bytes significant. */ + ands limit, limit, #7 + b.eq .Lnot_limit + + lsl limit, limit, #3 /* Bits -> bytes. */ + mov mask, #~0 +CPU_BE( lsr mask, mask, limit ) +CPU_LE( lsl mask, mask, limit ) + bic data1, data1, mask + bic data2, data2, mask + + /* Make sure that the NUL byte is marked in the syndrome. */ + orr has_nul, has_nul, mask + +.Lnot_limit: + orr syndrome, diff, has_nul + b .Lcal_cmpresult + +.Lmutual_align: + /* + * Sources are mutually aligned, but are not currently at an + * alignment boundary. Round down the addresses and then mask off + * the bytes that precede the start point. + * We also need to adjust the limit calculations, but without + * overflowing if the limit is near ULONG_MAX. + */ + bic src1, src1, #7 + bic src2, src2, #7 + ldr data1, [src1], #8 + neg tmp3, tmp1, lsl #3 /* 64 - bits(bytes beyond align). */ + ldr data2, [src2], #8 + mov tmp2, #~0 + sub limit_wd, limit, #1 /* limit != 0, so no underflow. */ + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp3 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp3 ) /* Shift (tmp1 & 63). */ + + and tmp3, limit_wd, #7 + lsr limit_wd, limit_wd, #3 + /* Adjust the limit. Only low 3 bits used, so overflow irrelevant.*/ + add limit, limit, tmp1 + add tmp3, tmp3, tmp1 + orr data1, data1, tmp2 + orr data2, data2, tmp2 + add limit_wd, limit_wd, tmp3, lsr #3 + b .Lstart_realigned + +/*when src1 offset is not equal to src2 offset...*/ +.Lmisaligned8: + cmp limit, #8 + b.lo .Ltiny8proc /*limit < 8... */ + /* + * Get the align offset length to compare per byte first. + * After this process, one string's address will be aligned.*/ + and tmp1, src1, #7 + neg tmp1, tmp1 + add tmp1, tmp1, #8 + and tmp2, src2, #7 + neg tmp2, tmp2 + add tmp2, tmp2, #8 + subs tmp3, tmp1, tmp2 + csel pos, tmp1, tmp2, hi /*Choose the maximum. */ + /* + * Here, limit is not less than 8, so directly run .Ltinycmp + * without checking the limit.*/ + sub limit, limit, pos +.Ltinycmp: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs pos, pos, #1 + ccmp data1w, #1, #0, ne /* NZCV = 0b0000. */ + ccmp data1w, data2w, #0, cs /* NZCV = 0b0000. */ + b.eq .Ltinycmp + cbnz pos, 1f /*find the null or unequal...*/ + cmp data1w, #1 + ccmp data1w, data2w, #0, cs + b.eq .Lstart_align /*the last bytes are equal....*/ +1: + sub result, data1, data2 + ret + +.Lstart_align: + lsr limit_wd, limit, #3 + cbz limit_wd, .Lremain8 + /*process more leading bytes to make str1 aligned...*/ + ands xzr, src1, #7 + b.eq .Lrecal_offset + add src1, src1, tmp3 /*tmp3 is positive in this branch.*/ + add src2, src2, tmp3 + ldr data1, [src1], #8 + ldr data2, [src2], #8 + + sub limit, limit, tmp3 + lsr limit_wd, limit, #3 + subs limit_wd, limit_wd, #1 + + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, ne/*if limit_wd is 0,will finish the cmp*/ + bics has_nul, tmp1, tmp2 + ccmp endloop, #0, #0, eq /*has_null is ZERO: no null byte*/ + b.ne .Lunequal_proc + /*How far is the current str2 from the alignment boundary...*/ + and tmp3, tmp3, #7 +.Lrecal_offset: + neg pos, tmp3 +.Lloopcmp_proc: + /* + * Divide the eight bytes into two parts. First,backwards the src2 + * to an alignment boundary,load eight bytes from the SRC2 alignment + * boundary,then compare with the relative bytes from SRC1. + * If all 8 bytes are equal,then start the second part's comparison. + * Otherwise finish the comparison. + * This special handle can garantee all the accesses are in the + * thread/task space in avoid to overrange access. + */ + ldr data1, [src1,pos] + ldr data2, [src2,pos] + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bics has_nul, tmp1, tmp2 /* Non-zero if NUL terminator. */ + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, eq + cbnz endloop, .Lunequal_proc + + /*The second part process*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + subs limit_wd, limit_wd, #1 + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, ne/*if limit_wd is 0,will finish the cmp*/ + bics has_nul, tmp1, tmp2 + ccmp endloop, #0, #0, eq /*has_null is ZERO: no null byte*/ + b.eq .Lloopcmp_proc + +.Lunequal_proc: + orr syndrome, diff, has_nul + cbz syndrome, .Lremain8 +.Lcal_cmpresult: + /* + * reversed the byte-order as big-endian,then CLZ can find the most + * significant zero bits. + */ +CPU_LE( rev syndrome, syndrome ) +CPU_LE( rev data1, data1 ) +CPU_LE( rev data2, data2 ) + /* + * For big-endian we cannot use the trick with the syndrome value + * as carry-propagation can corrupt the upper bits if the trailing + * bytes in the string contain 0x01. + * However, if there is no NUL byte in the dword, we can generate + * the result directly. We can't just subtract the bytes as the + * MSB might be significant. + */ +CPU_BE( cbnz has_nul, 1f ) +CPU_BE( cmp data1, data2 ) +CPU_BE( cset result, ne ) +CPU_BE( cneg result, result, lo ) +CPU_BE( ret ) +CPU_BE( 1: ) + /* Re-compute the NUL-byte detection, using a byte-reversed value.*/ +CPU_BE( rev tmp3, data1 ) +CPU_BE( sub tmp1, tmp3, zeroones ) +CPU_BE( orr tmp2, tmp3, #REP8_7f ) +CPU_BE( bic has_nul, tmp1, tmp2 ) +CPU_BE( rev has_nul, has_nul ) +CPU_BE( orr syndrome, diff, has_nul ) + /* + * The MS-non-zero bit of the syndrome marks either the first bit + * that is different, or the top bit of the first zero byte. + * Shifting left now will bring the critical information into the + * top bits. + */ + clz pos, syndrome + lsl data1, data1, pos + lsl data2, data2, pos + /* + * But we need to zero-extend (char is unsigned) the value and then + * perform a signed 32-bit subtraction. + */ + lsr data1, data1, #56 + sub result, data1, data2, lsr #56 + ret + +.Lremain8: + /* Limit % 8 == 0 => all bytes significant. */ + ands limit, limit, #7 + b.eq .Lret0 +.Ltiny8proc: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs limit, limit, #1 + + ccmp data1w, #1, #0, ne /* NZCV = 0b0000. */ + ccmp data1w, data2w, #0, cs /* NZCV = 0b0000. */ + b.eq .Ltiny8proc + sub result, data1, data2 + ret + +.Lret0: + mov result, #0 + ret +ENDPROC(strncmp) diff --git a/xen/arch/arm/arm64/lib/strnlen.S b/xen/arch/arm/arm64/lib/strnlen.S new file mode 100644 index 0000000..8aa5bbf --- /dev/null +++ b/xen/arch/arm/arm64/lib/strnlen.S @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + +/* + * determine the length of a fixed-size string + * + * Parameters: + * x0 - const string pointer + * x1 - maximal string length + * Returns: + * x0 - the return length of specific string + */ + +/* Arguments and results. */ +srcin .req x0 +len .req x0 +limit .req x1 + +/* Locals and temporaries. */ +src .req x2 +data1 .req x3 +data2 .req x4 +data2a .req x5 +has_nul1 .req x6 +has_nul2 .req x7 +tmp1 .req x8 +tmp2 .req x9 +tmp3 .req x10 +tmp4 .req x11 +zeroones .req x12 +pos .req x13 +limit_wd .req x14 + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +ENTRY(strnlen) + cbz limit, .Lhit_limit + mov zeroones, #REP8_01 + bic src, srcin, #15 + ands tmp1, srcin, #15 + b.ne .Lmisaligned + /* Calculate the number of full and partial words -1. */ + sub limit_wd, limit, #1 /* Limit != 0, so no underflow. */ + lsr limit_wd, limit_wd, #4 /* Convert to Qwords. */ + + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ + /* + * The inner loop deals with two Dwords at a time. This has a + * slightly higher start-up cost, but we should win quite quickly, + * especially on cores with a high number of issue slots per + * cycle, as we get much better parallelism out of the operations. + */ +.Lloop: + ldp data1, data2, [src], #16 +.Lrealigned: + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + sub tmp3, data2, zeroones + orr tmp4, data2, #REP8_7f + bic has_nul1, tmp1, tmp2 + bic has_nul2, tmp3, tmp4 + subs limit_wd, limit_wd, #1 + orr tmp1, has_nul1, has_nul2 + ccmp tmp1, #0, #0, pl /* NZCV = 0000 */ + b.eq .Lloop + + cbz tmp1, .Lhit_limit /* No null in final Qword. */ + + /* + * We know there's a null in the final Qword. The easiest thing + * to do now is work out the length of the string and return + * MIN (len, limit). + */ + sub len, src, srcin + cbz has_nul1, .Lnul_in_data2 +CPU_BE( mov data2, data1 ) /*perpare data to re-calculate the syndrome*/ + + sub len, len, #8 + mov has_nul2, has_nul1 +.Lnul_in_data2: + /* + * For big-endian, carry propagation (if the final byte in the + * string is 0x01) means we cannot use has_nul directly. The + * easiest way to get the correct byte is to byte-swap the data + * and calculate the syndrome a second time. + */ +CPU_BE( rev data2, data2 ) +CPU_BE( sub tmp1, data2, zeroones ) +CPU_BE( orr tmp2, data2, #REP8_7f ) +CPU_BE( bic has_nul2, tmp1, tmp2 ) + + sub len, len, #8 + rev has_nul2, has_nul2 + clz pos, has_nul2 + add len, len, pos, lsr #3 /* Bits to bytes. */ + cmp len, limit + csel len, len, limit, ls /* Return the lower value. */ + ret + +.Lmisaligned: + /* + * Deal with a partial first word. + * We're doing two things in parallel here; + * 1) Calculate the number of words (but avoiding overflow if + * limit is near ULONG_MAX) - to do this we need to work out + * limit + tmp1 - 1 as a 65-bit value before shifting it; + * 2) Load and mask the initial data words - we force the bytes + * before the ones we are interested in to 0xff - this ensures + * early bytes will not hit any zero detection. + */ + ldp data1, data2, [src], #16 + + sub limit_wd, limit, #1 + and tmp3, limit_wd, #15 + lsr limit_wd, limit_wd, #4 + + add tmp3, tmp3, tmp1 + add limit_wd, limit_wd, tmp3, lsr #4 + + neg tmp4, tmp1 + lsl tmp4, tmp4, #3 /* Bytes beyond alignment -> bits. */ + + mov tmp2, #~0 + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ + + cmp tmp1, #8 + + orr data1, data1, tmp2 + orr data2a, data2, tmp2 + + csinv data1, data1, xzr, le + csel data2, data2, data2a, le + b .Lrealigned + +.Lhit_limit: + mov len, limit + ret +ENDPROC(strnlen) diff --git a/xen/include/asm-arm/string.h b/xen/include/asm-arm/string.h index dfad1fe..e4b4469 100644 --- a/xen/include/asm-arm/string.h +++ b/xen/include/asm-arm/string.h @@ -14,6 +14,20 @@ extern char * strrchr(const char * s, int c); #define __HAVE_ARCH_STRCHR extern char * strchr(const char * s, int c); +#if defined(CONFIG_ARM_64) +#define __HAVE_ARCH_STRCMP +extern int strcmp(const char *, const char *); + +#define __HAVE_ARCH_STRNCMP +extern int strncmp(const char *, const char *, __kernel_size_t); + +#define __HAVE_ARCH_STRLEN +extern __kernel_size_t strlen(const char *); + +#define __HAVE_ARCH_STRNLEN +extern __kernel_size_t strnlen(const char *, __kernel_size_t); +#endif + #define __HAVE_ARCH_MEMCPY extern void * memcpy(void *, const void *, __kernel_size_t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLF-0001T6-O7; Tue, 12 Aug 2014 19:02:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLE-0001Sm-F3 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:40 +0000 Received: from [193.109.254.147:57470] by server-11.bemta-14.messagelabs.com id 7F/CB-14213-FC46AE35; Tue, 12 Aug 2014 19:02:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1407870156!12059975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32736 invoked from network); 12 Aug 2014 19:02:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLA-00005Q-B3 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLA-0003Jh-8r for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:36 +0000 Date: Tue, 12 Aug 2014 19:02:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add new str* primitives from Linux v3.16-rc6. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f65a05af142d47fcfbca14778348edad213fcf2c Author: Ian Campbell AuthorDate: Fri Jul 25 16:31:46 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 16:54:34 2014 +0100 xen: arm: Add new str* primitives from Linux v3.16-rc6. Imports: 0a42cb0 arm64: lib: Implement optimized string length routines Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas 192c4d9 arm64: lib: Implement optimized string compare routines Author: zhichang.yuan Signed-off-by: Zhichang Yuan Signed-off-by: Deepak Saxena Signed-off-by: Catalin Marinas Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 10 +- xen/arch/arm/arm64/lib/Makefile | 2 +- xen/arch/arm/arm64/lib/strcmp.S | 235 ++++++++++++++++++++++++++ xen/arch/arm/arm64/lib/strlen.S | 128 ++++++++++++++ xen/arch/arm/arm64/lib/strncmp.S | 311 +++++++++++++++++++++++++++++++++++ xen/arch/arm/arm64/lib/strnlen.S | 172 +++++++++++++++++++ xen/include/asm-arm/string.h | 14 ++ 7 files changed, 870 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 7e15b04..7f33fc7 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -49,11 +49,19 @@ done --------------------------------------------------------------------- -str*: last sync @ v3.16-rc6 (last commit: 2b8cac814cd5) +str*: last sync @ v3.16-rc6 (last commit: 0a42cb0a6fa6) linux/arch/arm64/lib/strchr.S xen/arch/arm/arm64/lib/strchr.S +linux/arch/arm64/lib/strcmp.S xen/arch/arm/arm64/lib/strcmp.S +linux/arch/arm64/lib/strlen.S xen/arch/arm/arm64/lib/strlen.S +linux/arch/arm64/lib/strncmp.S xen/arch/arm/arm64/lib/strncmp.S +linux/arch/arm64/lib/strnlen.S xen/arch/arm/arm64/lib/strnlen.S linux/arch/arm64/lib/strrchr.S xen/arch/arm/arm64/lib/strrchr.S +for i in strchr.S strcmp.S strlen.S strncmp.S strnlen.S strrchr.S ; do + diff -u linux/arch/arm64/lib/$i xen/arch/arm/arm64/lib/$i +done + --------------------------------------------------------------------- {clear,copy}_page: last sync @ v3.16-rc6 (last commit: f27bb139c387) diff --git a/xen/arch/arm/arm64/lib/Makefile b/xen/arch/arm/arm64/lib/Makefile index 2e7fb64..1b9c7a9 100644 --- a/xen/arch/arm/arm64/lib/Makefile +++ b/xen/arch/arm/arm64/lib/Makefile @@ -1,4 +1,4 @@ obj-y += memcpy.o memcmp.o memmove.o memset.o memchr.o obj-y += clear_page.o obj-y += bitops.o find_next_bit.o -obj-y += strchr.o strrchr.o +obj-y += strchr.o strcmp.o strlen.o strncmp.o strnlen.o strrchr.o diff --git a/xen/arch/arm/arm64/lib/strcmp.S b/xen/arch/arm/arm64/lib/strcmp.S new file mode 100644 index 0000000..bdcf7b0 --- /dev/null +++ b/xen/arch/arm/arm64/lib/strcmp.S @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + +/* + * compare two strings + * + * Parameters: + * x0 - const string 1 pointer + * x1 - const string 2 pointer + * Returns: + * x0 - an integer less than, equal to, or greater than zero + * if s1 is found, respectively, to be less than, to match, + * or be greater than s2. + */ + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +/* Parameters and result. */ +src1 .req x0 +src2 .req x1 +result .req x0 + +/* Internal variables. */ +data1 .req x2 +data1w .req w2 +data2 .req x3 +data2w .req w3 +has_nul .req x4 +diff .req x5 +syndrome .req x6 +tmp1 .req x7 +tmp2 .req x8 +tmp3 .req x9 +zeroones .req x10 +pos .req x11 + +ENTRY(strcmp) + eor tmp1, src1, src2 + mov zeroones, #REP8_01 + tst tmp1, #7 + b.ne .Lmisaligned8 + ands tmp1, src1, #7 + b.ne .Lmutual_align + + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ +.Lloop_aligned: + ldr data1, [src1], #8 + ldr data2, [src2], #8 +.Lstart_realigned: + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + bic has_nul, tmp1, tmp2 /* Non-zero if NUL terminator. */ + orr syndrome, diff, has_nul + cbz syndrome, .Lloop_aligned + b .Lcal_cmpresult + +.Lmutual_align: + /* + * Sources are mutually aligned, but are not currently at an + * alignment boundary. Round down the addresses and then mask off + * the bytes that preceed the start point. + */ + bic src1, src1, #7 + bic src2, src2, #7 + lsl tmp1, tmp1, #3 /* Bytes beyond alignment -> bits. */ + ldr data1, [src1], #8 + neg tmp1, tmp1 /* Bits to alignment -64. */ + ldr data2, [src2], #8 + mov tmp2, #~0 + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + + orr data1, data1, tmp2 + orr data2, data2, tmp2 + b .Lstart_realigned + +.Lmisaligned8: + /* + * Get the align offset length to compare per byte first. + * After this process, one string's address will be aligned. + */ + and tmp1, src1, #7 + neg tmp1, tmp1 + add tmp1, tmp1, #8 + and tmp2, src2, #7 + neg tmp2, tmp2 + add tmp2, tmp2, #8 + subs tmp3, tmp1, tmp2 + csel pos, tmp1, tmp2, hi /*Choose the maximum. */ +.Ltinycmp: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs pos, pos, #1 + ccmp data1w, #1, #0, ne /* NZCV = 0b0000. */ + ccmp data1w, data2w, #0, cs /* NZCV = 0b0000. */ + b.eq .Ltinycmp + cbnz pos, 1f /*find the null or unequal...*/ + cmp data1w, #1 + ccmp data1w, data2w, #0, cs + b.eq .Lstart_align /*the last bytes are equal....*/ +1: + sub result, data1, data2 + ret + +.Lstart_align: + ands xzr, src1, #7 + b.eq .Lrecal_offset + /*process more leading bytes to make str1 aligned...*/ + add src1, src1, tmp3 + add src2, src2, tmp3 + /*load 8 bytes from aligned str1 and non-aligned str2..*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bic has_nul, tmp1, tmp2 + eor diff, data1, data2 /* Non-zero if differences found. */ + orr syndrome, diff, has_nul + cbnz syndrome, .Lcal_cmpresult + /*How far is the current str2 from the alignment boundary...*/ + and tmp3, tmp3, #7 +.Lrecal_offset: + neg pos, tmp3 +.Lloopcmp_proc: + /* + * Divide the eight bytes into two parts. First,backwards the src2 + * to an alignment boundary,load eight bytes from the SRC2 alignment + * boundary,then compare with the relative bytes from SRC1. + * If all 8 bytes are equal,then start the second part's comparison. + * Otherwise finish the comparison. + * This special handle can garantee all the accesses are in the + * thread/task space in avoid to overrange access. + */ + ldr data1, [src1,pos] + ldr data2, [src2,pos] + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bic has_nul, tmp1, tmp2 + eor diff, data1, data2 /* Non-zero if differences found. */ + orr syndrome, diff, has_nul + cbnz syndrome, .Lcal_cmpresult + + /*The second part process*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bic has_nul, tmp1, tmp2 + eor diff, data1, data2 /* Non-zero if differences found. */ + orr syndrome, diff, has_nul + cbz syndrome, .Lloopcmp_proc + +.Lcal_cmpresult: + /* + * reversed the byte-order as big-endian,then CLZ can find the most + * significant zero bits. + */ +CPU_LE( rev syndrome, syndrome ) +CPU_LE( rev data1, data1 ) +CPU_LE( rev data2, data2 ) + + /* + * For big-endian we cannot use the trick with the syndrome value + * as carry-propagation can corrupt the upper bits if the trailing + * bytes in the string contain 0x01. + * However, if there is no NUL byte in the dword, we can generate + * the result directly. We ca not just subtract the bytes as the + * MSB might be significant. + */ +CPU_BE( cbnz has_nul, 1f ) +CPU_BE( cmp data1, data2 ) +CPU_BE( cset result, ne ) +CPU_BE( cneg result, result, lo ) +CPU_BE( ret ) +CPU_BE( 1: ) + /*Re-compute the NUL-byte detection, using a byte-reversed value. */ +CPU_BE( rev tmp3, data1 ) +CPU_BE( sub tmp1, tmp3, zeroones ) +CPU_BE( orr tmp2, tmp3, #REP8_7f ) +CPU_BE( bic has_nul, tmp1, tmp2 ) +CPU_BE( rev has_nul, has_nul ) +CPU_BE( orr syndrome, diff, has_nul ) + + clz pos, syndrome + /* + * The MS-non-zero bit of the syndrome marks either the first bit + * that is different, or the top bit of the first zero byte. + * Shifting left now will bring the critical information into the + * top bits. + */ + lsl data1, data1, pos + lsl data2, data2, pos + /* + * But we need to zero-extend (char is unsigned) the value and then + * perform a signed 32-bit subtraction. + */ + lsr data1, data1, #56 + sub result, data1, data2, lsr #56 + ret +ENDPROC(strcmp) diff --git a/xen/arch/arm/arm64/lib/strlen.S b/xen/arch/arm/arm64/lib/strlen.S new file mode 100644 index 0000000..ee055a2 --- /dev/null +++ b/xen/arch/arm/arm64/lib/strlen.S @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + + +/* + * calculate the length of a string + * + * Parameters: + * x0 - const string pointer + * Returns: + * x0 - the return length of specific string + */ + +/* Arguments and results. */ +srcin .req x0 +len .req x0 + +/* Locals and temporaries. */ +src .req x1 +data1 .req x2 +data2 .req x3 +data2a .req x4 +has_nul1 .req x5 +has_nul2 .req x6 +tmp1 .req x7 +tmp2 .req x8 +tmp3 .req x9 +tmp4 .req x10 +zeroones .req x11 +pos .req x12 + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +ENTRY(strlen) + mov zeroones, #REP8_01 + bic src, srcin, #15 + ands tmp1, srcin, #15 + b.ne .Lmisaligned + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ + /* + * The inner loop deals with two Dwords at a time. This has a + * slightly higher start-up cost, but we should win quite quickly, + * especially on cores with a high number of issue slots per + * cycle, as we get much better parallelism out of the operations. + */ +.Lloop: + ldp data1, data2, [src], #16 +.Lrealigned: + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + sub tmp3, data2, zeroones + orr tmp4, data2, #REP8_7f + bic has_nul1, tmp1, tmp2 + bics has_nul2, tmp3, tmp4 + ccmp has_nul1, #0, #0, eq /* NZCV = 0000 */ + b.eq .Lloop + + sub len, src, srcin + cbz has_nul1, .Lnul_in_data2 +CPU_BE( mov data2, data1 ) /*prepare data to re-calculate the syndrome*/ + sub len, len, #8 + mov has_nul2, has_nul1 +.Lnul_in_data2: + /* + * For big-endian, carry propagation (if the final byte in the + * string is 0x01) means we cannot use has_nul directly. The + * easiest way to get the correct byte is to byte-swap the data + * and calculate the syndrome a second time. + */ +CPU_BE( rev data2, data2 ) +CPU_BE( sub tmp1, data2, zeroones ) +CPU_BE( orr tmp2, data2, #REP8_7f ) +CPU_BE( bic has_nul2, tmp1, tmp2 ) + + sub len, len, #8 + rev has_nul2, has_nul2 + clz pos, has_nul2 + add len, len, pos, lsr #3 /* Bits to bytes. */ + ret + +.Lmisaligned: + cmp tmp1, #8 + neg tmp1, tmp1 + ldp data1, data2, [src], #16 + lsl tmp1, tmp1, #3 /* Bytes beyond alignment -> bits. */ + mov tmp2, #~0 + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ + + orr data1, data1, tmp2 + orr data2a, data2, tmp2 + csinv data1, data1, xzr, le + csel data2, data2, data2a, le + b .Lrealigned +ENDPROC(strlen) diff --git a/xen/arch/arm/arm64/lib/strncmp.S b/xen/arch/arm/arm64/lib/strncmp.S new file mode 100644 index 0000000..ca2e4a6 --- /dev/null +++ b/xen/arch/arm/arm64/lib/strncmp.S @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + +/* + * compare two strings + * + * Parameters: + * x0 - const string 1 pointer + * x1 - const string 2 pointer + * x2 - the maximal length to be compared + * Returns: + * x0 - an integer less than, equal to, or greater than zero if s1 is found, + * respectively, to be less than, to match, or be greater than s2. + */ + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +/* Parameters and result. */ +src1 .req x0 +src2 .req x1 +limit .req x2 +result .req x0 + +/* Internal variables. */ +data1 .req x3 +data1w .req w3 +data2 .req x4 +data2w .req w4 +has_nul .req x5 +diff .req x6 +syndrome .req x7 +tmp1 .req x8 +tmp2 .req x9 +tmp3 .req x10 +zeroones .req x11 +pos .req x12 +limit_wd .req x13 +mask .req x14 +endloop .req x15 + +ENTRY(strncmp) + cbz limit, .Lret0 + eor tmp1, src1, src2 + mov zeroones, #REP8_01 + tst tmp1, #7 + b.ne .Lmisaligned8 + ands tmp1, src1, #7 + b.ne .Lmutual_align + /* Calculate the number of full and partial words -1. */ + /* + * when limit is mulitply of 8, if not sub 1, + * the judgement of last dword will wrong. + */ + sub limit_wd, limit, #1 /* limit != 0, so no underflow. */ + lsr limit_wd, limit_wd, #3 /* Convert to Dwords. */ + + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ +.Lloop_aligned: + ldr data1, [src1], #8 + ldr data2, [src2], #8 +.Lstart_realigned: + subs limit_wd, limit_wd, #1 + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, pl /* Last Dword or differences.*/ + bics has_nul, tmp1, tmp2 /* Non-zero if NUL terminator. */ + ccmp endloop, #0, #0, eq + b.eq .Lloop_aligned + + /*Not reached the limit, must have found the end or a diff. */ + tbz limit_wd, #63, .Lnot_limit + + /* Limit % 8 == 0 => all bytes significant. */ + ands limit, limit, #7 + b.eq .Lnot_limit + + lsl limit, limit, #3 /* Bits -> bytes. */ + mov mask, #~0 +CPU_BE( lsr mask, mask, limit ) +CPU_LE( lsl mask, mask, limit ) + bic data1, data1, mask + bic data2, data2, mask + + /* Make sure that the NUL byte is marked in the syndrome. */ + orr has_nul, has_nul, mask + +.Lnot_limit: + orr syndrome, diff, has_nul + b .Lcal_cmpresult + +.Lmutual_align: + /* + * Sources are mutually aligned, but are not currently at an + * alignment boundary. Round down the addresses and then mask off + * the bytes that precede the start point. + * We also need to adjust the limit calculations, but without + * overflowing if the limit is near ULONG_MAX. + */ + bic src1, src1, #7 + bic src2, src2, #7 + ldr data1, [src1], #8 + neg tmp3, tmp1, lsl #3 /* 64 - bits(bytes beyond align). */ + ldr data2, [src2], #8 + mov tmp2, #~0 + sub limit_wd, limit, #1 /* limit != 0, so no underflow. */ + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp3 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp3 ) /* Shift (tmp1 & 63). */ + + and tmp3, limit_wd, #7 + lsr limit_wd, limit_wd, #3 + /* Adjust the limit. Only low 3 bits used, so overflow irrelevant.*/ + add limit, limit, tmp1 + add tmp3, tmp3, tmp1 + orr data1, data1, tmp2 + orr data2, data2, tmp2 + add limit_wd, limit_wd, tmp3, lsr #3 + b .Lstart_realigned + +/*when src1 offset is not equal to src2 offset...*/ +.Lmisaligned8: + cmp limit, #8 + b.lo .Ltiny8proc /*limit < 8... */ + /* + * Get the align offset length to compare per byte first. + * After this process, one string's address will be aligned.*/ + and tmp1, src1, #7 + neg tmp1, tmp1 + add tmp1, tmp1, #8 + and tmp2, src2, #7 + neg tmp2, tmp2 + add tmp2, tmp2, #8 + subs tmp3, tmp1, tmp2 + csel pos, tmp1, tmp2, hi /*Choose the maximum. */ + /* + * Here, limit is not less than 8, so directly run .Ltinycmp + * without checking the limit.*/ + sub limit, limit, pos +.Ltinycmp: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs pos, pos, #1 + ccmp data1w, #1, #0, ne /* NZCV = 0b0000. */ + ccmp data1w, data2w, #0, cs /* NZCV = 0b0000. */ + b.eq .Ltinycmp + cbnz pos, 1f /*find the null or unequal...*/ + cmp data1w, #1 + ccmp data1w, data2w, #0, cs + b.eq .Lstart_align /*the last bytes are equal....*/ +1: + sub result, data1, data2 + ret + +.Lstart_align: + lsr limit_wd, limit, #3 + cbz limit_wd, .Lremain8 + /*process more leading bytes to make str1 aligned...*/ + ands xzr, src1, #7 + b.eq .Lrecal_offset + add src1, src1, tmp3 /*tmp3 is positive in this branch.*/ + add src2, src2, tmp3 + ldr data1, [src1], #8 + ldr data2, [src2], #8 + + sub limit, limit, tmp3 + lsr limit_wd, limit, #3 + subs limit_wd, limit_wd, #1 + + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, ne/*if limit_wd is 0,will finish the cmp*/ + bics has_nul, tmp1, tmp2 + ccmp endloop, #0, #0, eq /*has_null is ZERO: no null byte*/ + b.ne .Lunequal_proc + /*How far is the current str2 from the alignment boundary...*/ + and tmp3, tmp3, #7 +.Lrecal_offset: + neg pos, tmp3 +.Lloopcmp_proc: + /* + * Divide the eight bytes into two parts. First,backwards the src2 + * to an alignment boundary,load eight bytes from the SRC2 alignment + * boundary,then compare with the relative bytes from SRC1. + * If all 8 bytes are equal,then start the second part's comparison. + * Otherwise finish the comparison. + * This special handle can garantee all the accesses are in the + * thread/task space in avoid to overrange access. + */ + ldr data1, [src1,pos] + ldr data2, [src2,pos] + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + bics has_nul, tmp1, tmp2 /* Non-zero if NUL terminator. */ + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, eq + cbnz endloop, .Lunequal_proc + + /*The second part process*/ + ldr data1, [src1], #8 + ldr data2, [src2], #8 + subs limit_wd, limit_wd, #1 + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + eor diff, data1, data2 /* Non-zero if differences found. */ + csinv endloop, diff, xzr, ne/*if limit_wd is 0,will finish the cmp*/ + bics has_nul, tmp1, tmp2 + ccmp endloop, #0, #0, eq /*has_null is ZERO: no null byte*/ + b.eq .Lloopcmp_proc + +.Lunequal_proc: + orr syndrome, diff, has_nul + cbz syndrome, .Lremain8 +.Lcal_cmpresult: + /* + * reversed the byte-order as big-endian,then CLZ can find the most + * significant zero bits. + */ +CPU_LE( rev syndrome, syndrome ) +CPU_LE( rev data1, data1 ) +CPU_LE( rev data2, data2 ) + /* + * For big-endian we cannot use the trick with the syndrome value + * as carry-propagation can corrupt the upper bits if the trailing + * bytes in the string contain 0x01. + * However, if there is no NUL byte in the dword, we can generate + * the result directly. We can't just subtract the bytes as the + * MSB might be significant. + */ +CPU_BE( cbnz has_nul, 1f ) +CPU_BE( cmp data1, data2 ) +CPU_BE( cset result, ne ) +CPU_BE( cneg result, result, lo ) +CPU_BE( ret ) +CPU_BE( 1: ) + /* Re-compute the NUL-byte detection, using a byte-reversed value.*/ +CPU_BE( rev tmp3, data1 ) +CPU_BE( sub tmp1, tmp3, zeroones ) +CPU_BE( orr tmp2, tmp3, #REP8_7f ) +CPU_BE( bic has_nul, tmp1, tmp2 ) +CPU_BE( rev has_nul, has_nul ) +CPU_BE( orr syndrome, diff, has_nul ) + /* + * The MS-non-zero bit of the syndrome marks either the first bit + * that is different, or the top bit of the first zero byte. + * Shifting left now will bring the critical information into the + * top bits. + */ + clz pos, syndrome + lsl data1, data1, pos + lsl data2, data2, pos + /* + * But we need to zero-extend (char is unsigned) the value and then + * perform a signed 32-bit subtraction. + */ + lsr data1, data1, #56 + sub result, data1, data2, lsr #56 + ret + +.Lremain8: + /* Limit % 8 == 0 => all bytes significant. */ + ands limit, limit, #7 + b.eq .Lret0 +.Ltiny8proc: + ldrb data1w, [src1], #1 + ldrb data2w, [src2], #1 + subs limit, limit, #1 + + ccmp data1w, #1, #0, ne /* NZCV = 0b0000. */ + ccmp data1w, data2w, #0, cs /* NZCV = 0b0000. */ + b.eq .Ltiny8proc + sub result, data1, data2 + ret + +.Lret0: + mov result, #0 + ret +ENDPROC(strncmp) diff --git a/xen/arch/arm/arm64/lib/strnlen.S b/xen/arch/arm/arm64/lib/strnlen.S new file mode 100644 index 0000000..8aa5bbf --- /dev/null +++ b/xen/arch/arm/arm64/lib/strnlen.S @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2013 ARM Ltd. + * Copyright (C) 2013 Linaro. + * + * This code is based on glibc cortex strings work originally authored by Linaro + * and re-licensed under GPLv2 for the Linux kernel. The original code can + * be found @ + * + * http://bazaar.launchpad.net/~linaro-toolchain-dev/cortex-strings/trunk/ + * files/head:/src/aarch64/ + * + * 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 . + */ + +#include + +#include "assembler.h" + +/* + * determine the length of a fixed-size string + * + * Parameters: + * x0 - const string pointer + * x1 - maximal string length + * Returns: + * x0 - the return length of specific string + */ + +/* Arguments and results. */ +srcin .req x0 +len .req x0 +limit .req x1 + +/* Locals and temporaries. */ +src .req x2 +data1 .req x3 +data2 .req x4 +data2a .req x5 +has_nul1 .req x6 +has_nul2 .req x7 +tmp1 .req x8 +tmp2 .req x9 +tmp3 .req x10 +tmp4 .req x11 +zeroones .req x12 +pos .req x13 +limit_wd .req x14 + +#define REP8_01 0x0101010101010101 +#define REP8_7f 0x7f7f7f7f7f7f7f7f +#define REP8_80 0x8080808080808080 + +ENTRY(strnlen) + cbz limit, .Lhit_limit + mov zeroones, #REP8_01 + bic src, srcin, #15 + ands tmp1, srcin, #15 + b.ne .Lmisaligned + /* Calculate the number of full and partial words -1. */ + sub limit_wd, limit, #1 /* Limit != 0, so no underflow. */ + lsr limit_wd, limit_wd, #4 /* Convert to Qwords. */ + + /* + * NUL detection works on the principle that (X - 1) & (~X) & 0x80 + * (=> (X - 1) & ~(X | 0x7f)) is non-zero iff a byte is zero, and + * can be done in parallel across the entire word. + */ + /* + * The inner loop deals with two Dwords at a time. This has a + * slightly higher start-up cost, but we should win quite quickly, + * especially on cores with a high number of issue slots per + * cycle, as we get much better parallelism out of the operations. + */ +.Lloop: + ldp data1, data2, [src], #16 +.Lrealigned: + sub tmp1, data1, zeroones + orr tmp2, data1, #REP8_7f + sub tmp3, data2, zeroones + orr tmp4, data2, #REP8_7f + bic has_nul1, tmp1, tmp2 + bic has_nul2, tmp3, tmp4 + subs limit_wd, limit_wd, #1 + orr tmp1, has_nul1, has_nul2 + ccmp tmp1, #0, #0, pl /* NZCV = 0000 */ + b.eq .Lloop + + cbz tmp1, .Lhit_limit /* No null in final Qword. */ + + /* + * We know there's a null in the final Qword. The easiest thing + * to do now is work out the length of the string and return + * MIN (len, limit). + */ + sub len, src, srcin + cbz has_nul1, .Lnul_in_data2 +CPU_BE( mov data2, data1 ) /*perpare data to re-calculate the syndrome*/ + + sub len, len, #8 + mov has_nul2, has_nul1 +.Lnul_in_data2: + /* + * For big-endian, carry propagation (if the final byte in the + * string is 0x01) means we cannot use has_nul directly. The + * easiest way to get the correct byte is to byte-swap the data + * and calculate the syndrome a second time. + */ +CPU_BE( rev data2, data2 ) +CPU_BE( sub tmp1, data2, zeroones ) +CPU_BE( orr tmp2, data2, #REP8_7f ) +CPU_BE( bic has_nul2, tmp1, tmp2 ) + + sub len, len, #8 + rev has_nul2, has_nul2 + clz pos, has_nul2 + add len, len, pos, lsr #3 /* Bits to bytes. */ + cmp len, limit + csel len, len, limit, ls /* Return the lower value. */ + ret + +.Lmisaligned: + /* + * Deal with a partial first word. + * We're doing two things in parallel here; + * 1) Calculate the number of words (but avoiding overflow if + * limit is near ULONG_MAX) - to do this we need to work out + * limit + tmp1 - 1 as a 65-bit value before shifting it; + * 2) Load and mask the initial data words - we force the bytes + * before the ones we are interested in to 0xff - this ensures + * early bytes will not hit any zero detection. + */ + ldp data1, data2, [src], #16 + + sub limit_wd, limit, #1 + and tmp3, limit_wd, #15 + lsr limit_wd, limit_wd, #4 + + add tmp3, tmp3, tmp1 + add limit_wd, limit_wd, tmp3, lsr #4 + + neg tmp4, tmp1 + lsl tmp4, tmp4, #3 /* Bytes beyond alignment -> bits. */ + + mov tmp2, #~0 + /* Big-endian. Early bytes are at MSB. */ +CPU_BE( lsl tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ + /* Little-endian. Early bytes are at LSB. */ +CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ + + cmp tmp1, #8 + + orr data1, data1, tmp2 + orr data2a, data2, tmp2 + + csinv data1, data1, xzr, le + csel data2, data2, data2a, le + b .Lrealigned + +.Lhit_limit: + mov len, limit + ret +ENDPROC(strnlen) diff --git a/xen/include/asm-arm/string.h b/xen/include/asm-arm/string.h index dfad1fe..e4b4469 100644 --- a/xen/include/asm-arm/string.h +++ b/xen/include/asm-arm/string.h @@ -14,6 +14,20 @@ extern char * strrchr(const char * s, int c); #define __HAVE_ARCH_STRCHR extern char * strchr(const char * s, int c); +#if defined(CONFIG_ARM_64) +#define __HAVE_ARCH_STRCMP +extern int strcmp(const char *, const char *); + +#define __HAVE_ARCH_STRNCMP +extern int strncmp(const char *, const char *, __kernel_size_t); + +#define __HAVE_ARCH_STRLEN +extern __kernel_size_t strlen(const char *); + +#define __HAVE_ARCH_STRNLEN +extern __kernel_size_t strnlen(const char *, __kernel_size_t); +#endif + #define __HAVE_ARCH_MEMCPY extern void * memcpy(void *, const void *, __kernel_size_t); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLP-0001VI-TU; Tue, 12 Aug 2014 19:02:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLN-0001Ur-0h for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:49 +0000 Received: from [85.158.139.211:16715] by server-17.bemta-5.messagelabs.com id 3F/AE-08943-8D46AE35; Tue, 12 Aug 2014 19:02:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1407870166!10946597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29459 invoked from network); 12 Aug 2014 19:02:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLK-00005W-G8 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLK-0003K6-EL for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:46 +0000 Date: Tue, 12 Aug 2014 19:02:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Makefile inclusion of Paths.mk should be conditional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b15599e84f90232c80753fead201d50c89b5d159 Author: Ian Campbell AuthorDate: Mon Aug 4 14:29:17 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 17:00:10 2014 +0100 Makefile inclusion of Paths.mk should be conditional Since it may not exist when doing e.g. "make clean". There is existing logic in the makefiles which will raise an error if an actual build target is invoked without having run configure. Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- config/Stubdom.mk.in | 2 +- tools/Rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 6bce206..c1c83bc 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -1,5 +1,5 @@ # Prefix and install folder -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk prefix := @prefix@ PREFIX := $(prefix) exec_prefix := @exec_prefix@ diff --git a/tools/Rules.mk b/tools/Rules.mk index 0aa1e6b..5bac700 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,7 +5,7 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:02:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:02:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLP-0001VI-TU; Tue, 12 Aug 2014 19:02:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLN-0001Ur-0h for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:49 +0000 Received: from [85.158.139.211:16715] by server-17.bemta-5.messagelabs.com id 3F/AE-08943-8D46AE35; Tue, 12 Aug 2014 19:02:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1407870166!10946597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29459 invoked from network); 12 Aug 2014 19:02:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLK-00005W-G8 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLK-0003K6-EL for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:46 +0000 Date: Tue, 12 Aug 2014 19:02:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Makefile inclusion of Paths.mk should be conditional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b15599e84f90232c80753fead201d50c89b5d159 Author: Ian Campbell AuthorDate: Mon Aug 4 14:29:17 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 17:00:10 2014 +0100 Makefile inclusion of Paths.mk should be conditional Since it may not exist when doing e.g. "make clean". There is existing logic in the makefiles which will raise an error if an actual build target is invoked without having run configure. Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- config/Stubdom.mk.in | 2 +- tools/Rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 6bce206..c1c83bc 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -1,5 +1,5 @@ # Prefix and install folder -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk prefix := @prefix@ PREFIX := $(prefix) exec_prefix := @exec_prefix@ diff --git a/tools/Rules.mk b/tools/Rules.mk index 0aa1e6b..5bac700 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,7 +5,7 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLZ-0001Ww-08; Tue, 12 Aug 2014 19:03:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLX-0001WY-3t for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:59 +0000 Received: from [85.158.139.211:17238] by server-5.bemta-5.messagelabs.com id 73/DF-11546-2E46AE35; Tue, 12 Aug 2014 19:02:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1407870176!8069467!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14030 invoked from network); 12 Aug 2014 19:02:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLU-00005f-Mg for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLU-0003KS-Kb for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:56 +0000 Date: Tue, 12 Aug 2014 19:02:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: exec_prefix should default to $prefix not $ac_default_prefix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbe4f1df3879c861f8c79240784f4a378123babd Author: Ian Campbell AuthorDate: Mon Aug 4 15:27:05 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 17:00:25 2014 +0100 autoconf: exec_prefix should default to $prefix not $ac_default_prefix Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to /usr/local/foo. This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to config/Paths.mk.in" which tried to add code to expand exec_prefix earlier. Reported-by: Julien Grall Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- configure | 2 +- m4/paths.m4 | 2 +- tools/configure | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1ff0a44..a6efd35 100755 --- a/configure +++ b/configure @@ -1850,7 +1850,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin diff --git a/m4/paths.m4 b/m4/paths.m4 index 717fcd1..eac50af 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -1,7 +1,7 @@ AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ dnl expand these early so we can use this for substitutions test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin AC_SUBST(BINDIR) diff --git a/tools/configure b/tools/configure index 7c9bbca..3830da4 100755 --- a/tools/configure +++ b/tools/configure @@ -3681,7 +3681,7 @@ esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLZ-0001Ww-08; Tue, 12 Aug 2014 19:03:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLX-0001WY-3t for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:59 +0000 Received: from [85.158.139.211:17238] by server-5.bemta-5.messagelabs.com id 73/DF-11546-2E46AE35; Tue, 12 Aug 2014 19:02:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1407870176!8069467!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14030 invoked from network); 12 Aug 2014 19:02:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:02:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLU-00005f-Mg for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLU-0003KS-Kb for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:02:56 +0000 Date: Tue, 12 Aug 2014 19:02:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] autoconf: exec_prefix should default to $prefix not $ac_default_prefix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cbe4f1df3879c861f8c79240784f4a378123babd Author: Ian Campbell AuthorDate: Mon Aug 4 15:27:05 2014 +0100 Commit: Ian Campbell CommitDate: Mon Aug 4 17:00:25 2014 +0100 autoconf: exec_prefix should default to $prefix not $ac_default_prefix Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to /usr/local/foo. This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to config/Paths.mk.in" which tried to add code to expand exec_prefix earlier. Reported-by: Julien Grall Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- configure | 2 +- m4/paths.m4 | 2 +- tools/configure | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1ff0a44..a6efd35 100755 --- a/configure +++ b/configure @@ -1850,7 +1850,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin diff --git a/m4/paths.m4 b/m4/paths.m4 index 717fcd1..eac50af 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -1,7 +1,7 @@ AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ dnl expand these early so we can use this for substitutions test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin AC_SUBST(BINDIR) diff --git a/tools/configure b/tools/configure index 7c9bbca..3830da4 100755 --- a/tools/configure +++ b/tools/configure @@ -3681,7 +3681,7 @@ esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLk-0001Yn-46; Tue, 12 Aug 2014 19:03:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLj-0001Ya-2T for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:11 +0000 Received: from [193.109.254.147:22412] by server-10.bemta-14.messagelabs.com id CF/B0-06615-EE46AE35; Tue, 12 Aug 2014 19:03:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1407870187!12105777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20929 invoked from network); 12 Aug 2014 19:03:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLe-00006E-Re for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLe-0003Kz-QM for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:06 +0000 Date: Tue, 12 Aug 2014 19:03:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI: command line option adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1e06bed5435ce89c48532caa2d2e2725765022e Author: Jan Beulich AuthorDate: Wed Aug 6 18:00:40 2014 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 18:00:40 2014 +0200 x86/ACPI: command line option adjustments Improving their documentation, and converting one option to boolean since it has only boolean meaning. Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 24 ++++++++++++++++++------ xen/arch/x86/acpi/cpufreq/cpufreq.c | 4 ++-- xen/arch/x86/setup.c | 1 - xen/arch/x86/shutdown.c | 3 ++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 1604c9a..4afa84f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -111,20 +111,28 @@ Specify which ACPI MADT table to parse for APIC information, if more than one is present. ### acpi\_pstate\_strict -> `= ` +> `= ` + +> Default: `false` + +Enforce checking that P-state transitions by the ACPI cpufreq driver +actually result in the nominated frequency to be established. A warning +message will be logged if that isn't the case. ### acpi\_skip\_timer\_override > `= ` Instruct Xen to ignore timer-interrupt override. -Because responsibility for ACPI processing is shared between Xen and -the domain 0 kernel this option is automatically propagated to the -domain 0 command line - ### acpi\_sleep > `= s3_bios | s3_mode` +`s3_bios` instructs Xen to invoke video BIOS initialization during S3 +resume. + +`s3_mode` instructs Xen to set up the boot time (option `vga=`) video +mode during S3 resume. + ### allowsuperpage > `= ` @@ -964,7 +972,7 @@ This option can be specified more than once (up to 8 times at present). > `= ` ### reboot -> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` Default: `0` @@ -974,12 +982,16 @@ Specify the host reboot method. `cold` instructs Xen to set the cold reboot flag. +`no` instructs Xen to not automatically reboot after panics or crashes. + `triple` instructs Xen to reboot the host by causing a triple fault. `kbd` instructs Xen to reboot the host via the keyboard controller. `acpi` instructs Xen to reboot the host using RESET_REG in the ACPI FADT. +`pci` instructs Xen to reboot the host using PCI reset register (port CF9). + ### sched > `= credit | credit2 | sedf | arinc653` diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 4a6aeb3..fa3678d 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -57,8 +57,8 @@ struct acpi_cpufreq_data *cpufreq_drv_data[NR_CPUS]; static struct cpufreq_driver acpi_cpufreq_driver; -static unsigned int __read_mostly acpi_pstate_strict; -integer_param("acpi_pstate_strict", acpi_pstate_strict); +static bool_t __read_mostly acpi_pstate_strict; +boolean_param("acpi_pstate_strict", acpi_pstate_strict); static int check_est_cpu(unsigned int cpuid) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 599cf04..6a814cd 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -73,7 +73,6 @@ boolean_param("dom0pvh", opt_dom0pvh); /* **** Linux config option: propagated to domain0. */ /* "acpi=off": Sisables both ACPI table parsing and interpreter. */ /* "acpi=force": Override the disable blacklist. */ -/* "acpi=strict": Disables out-of-spec workarounds. */ /* "acpi=ht": Limit ACPI just to boot-time to enable HT. */ /* "acpi=noirq": Disables ACPI interrupt routing. */ static void parse_acpi_param(char *s); diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 81dfadf..21f6cf5 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -37,9 +37,10 @@ enum reboot_type { static int reboot_mode; /* - * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag + * no Suppress automatic reboot after panics or crashes * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLk-0001Yn-46; Tue, 12 Aug 2014 19:03:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLj-0001Ya-2T for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:11 +0000 Received: from [193.109.254.147:22412] by server-10.bemta-14.messagelabs.com id CF/B0-06615-EE46AE35; Tue, 12 Aug 2014 19:03:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1407870187!12105777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20929 invoked from network); 12 Aug 2014 19:03:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLe-00006E-Re for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLe-0003Kz-QM for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:06 +0000 Date: Tue, 12 Aug 2014 19:03:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ACPI: command line option adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1e06bed5435ce89c48532caa2d2e2725765022e Author: Jan Beulich AuthorDate: Wed Aug 6 18:00:40 2014 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 18:00:40 2014 +0200 x86/ACPI: command line option adjustments Improving their documentation, and converting one option to boolean since it has only boolean meaning. Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 24 ++++++++++++++++++------ xen/arch/x86/acpi/cpufreq/cpufreq.c | 4 ++-- xen/arch/x86/setup.c | 1 - xen/arch/x86/shutdown.c | 3 ++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 1604c9a..4afa84f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -111,20 +111,28 @@ Specify which ACPI MADT table to parse for APIC information, if more than one is present. ### acpi\_pstate\_strict -> `= ` +> `= ` + +> Default: `false` + +Enforce checking that P-state transitions by the ACPI cpufreq driver +actually result in the nominated frequency to be established. A warning +message will be logged if that isn't the case. ### acpi\_skip\_timer\_override > `= ` Instruct Xen to ignore timer-interrupt override. -Because responsibility for ACPI processing is shared between Xen and -the domain 0 kernel this option is automatically propagated to the -domain 0 command line - ### acpi\_sleep > `= s3_bios | s3_mode` +`s3_bios` instructs Xen to invoke video BIOS initialization during S3 +resume. + +`s3_mode` instructs Xen to set up the boot time (option `vga=`) video +mode during S3 resume. + ### allowsuperpage > `= ` @@ -964,7 +972,7 @@ This option can be specified more than once (up to 8 times at present). > `= ` ### reboot -> `= t[riple] | k[bd] | n[o] [, [w]arm | [c]old]` +> `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` Default: `0` @@ -974,12 +982,16 @@ Specify the host reboot method. `cold` instructs Xen to set the cold reboot flag. +`no` instructs Xen to not automatically reboot after panics or crashes. + `triple` instructs Xen to reboot the host by causing a triple fault. `kbd` instructs Xen to reboot the host via the keyboard controller. `acpi` instructs Xen to reboot the host using RESET_REG in the ACPI FADT. +`pci` instructs Xen to reboot the host using PCI reset register (port CF9). + ### sched > `= credit | credit2 | sedf | arinc653` diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 4a6aeb3..fa3678d 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -57,8 +57,8 @@ struct acpi_cpufreq_data *cpufreq_drv_data[NR_CPUS]; static struct cpufreq_driver acpi_cpufreq_driver; -static unsigned int __read_mostly acpi_pstate_strict; -integer_param("acpi_pstate_strict", acpi_pstate_strict); +static bool_t __read_mostly acpi_pstate_strict; +boolean_param("acpi_pstate_strict", acpi_pstate_strict); static int check_est_cpu(unsigned int cpuid) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 599cf04..6a814cd 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -73,7 +73,6 @@ boolean_param("dom0pvh", opt_dom0pvh); /* **** Linux config option: propagated to domain0. */ /* "acpi=off": Sisables both ACPI table parsing and interpreter. */ /* "acpi=force": Override the disable blacklist. */ -/* "acpi=strict": Disables out-of-spec workarounds. */ /* "acpi=ht": Limit ACPI just to boot-time to enable HT. */ /* "acpi=noirq": Disables ACPI interrupt routing. */ static void parse_acpi_param(char *s); diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 81dfadf..21f6cf5 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -37,9 +37,10 @@ enum reboot_type { static int reboot_mode; /* - * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] + * reboot=t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag + * no Suppress automatic reboot after panics or crashes * triple Force a triple fault (init) * kbd Use the keyboard controller. cold reset (default) * acpi Use the RESET_REG in the FADT -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLs-0001aJ-6p; Tue, 12 Aug 2014 19:03:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLr-0001a4-JL for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:19 +0000 Received: from [85.158.137.68:3649] by server-12.bemta-3.messagelabs.com id 77/2E-02460-6F46AE35; Tue, 12 Aug 2014 19:03:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1407870197!10864426!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5152 invoked from network); 12 Aug 2014 19:03:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLp-00006K-0g for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLo-0003Lu-Vw for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:16 +0000 Date: Tue, 12 Aug 2014 19:03:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/APIC: command line option adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 793e3480fc1cbed33add75f017495e93c112f4b5 Author: Jan Beulich AuthorDate: Wed Aug 6 18:01:55 2014 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 18:01:55 2014 +0200 x86/APIC: command line option adjustments Improving their documentation, and converting one option to boolean since it has only boolean meaning. Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 13 ++++++++++--- xen/arch/x86/apic.c | 7 +------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4afa84f..4492195 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -674,6 +674,10 @@ debug hypervisor only). > `= ` ### ioapic\_ack +> `= old | new` + +> Default: `new` unless directed-EOI is supported + ### iommu > `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]` @@ -789,10 +793,10 @@ Force the use of `[:]:.` as device ID of IO-APIC ACPI table. ### lapic +> `= ` Force the use of use of the local APIC on a uniprocessor system, even -if left disabled by the BIOS. This option will accept any value at -all. +if left disabled by the BIOS. ### lapic\_timer\_c2\_ok > `= ` @@ -828,6 +832,9 @@ with **crashinfo_maxaddr**. ### max\_gsi\_irqs > `= ` +Specifies the number of interrupts to be use for pin (IO-APIC or legacy PIC) +based interrupts. Any higher IRQs will be available for use via PCI MSI. + ### maxcpus > `= ` @@ -912,7 +919,7 @@ IRQ routing issues. > Default: `false` Ignore the local APIC on a uniprocessor system, even if enabled by the -BIOS. This option will accept value. +BIOS. ### no-real-mode (x86) > `= ` diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index bbcc0a1..9cbfa6a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -815,12 +815,7 @@ static void __init lapic_disable(char *str) setup_clear_cpu_cap(X86_FEATURE_APIC); } custom_param("nolapic", lapic_disable); - -static void __init lapic_enable(char *str) -{ - enable_local_apic = 1; -} -custom_param("lapic", lapic_enable); +boolean_param("lapic", enable_local_apic); static void __init apic_set_verbosity(char *str) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLs-0001aJ-6p; Tue, 12 Aug 2014 19:03:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLr-0001a4-JL for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:19 +0000 Received: from [85.158.137.68:3649] by server-12.bemta-3.messagelabs.com id 77/2E-02460-6F46AE35; Tue, 12 Aug 2014 19:03:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1407870197!10864426!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5152 invoked from network); 12 Aug 2014 19:03:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLp-00006K-0g for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLo-0003Lu-Vw for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:16 +0000 Date: Tue, 12 Aug 2014 19:03:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/APIC: command line option adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 793e3480fc1cbed33add75f017495e93c112f4b5 Author: Jan Beulich AuthorDate: Wed Aug 6 18:01:55 2014 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 18:01:55 2014 +0200 x86/APIC: command line option adjustments Improving their documentation, and converting one option to boolean since it has only boolean meaning. Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 13 ++++++++++--- xen/arch/x86/apic.c | 7 +------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4afa84f..4492195 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -674,6 +674,10 @@ debug hypervisor only). > `= ` ### ioapic\_ack +> `= old | new` + +> Default: `new` unless directed-EOI is supported + ### iommu > `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]` @@ -789,10 +793,10 @@ Force the use of `[:]:.` as device ID of IO-APIC ACPI table. ### lapic +> `= ` Force the use of use of the local APIC on a uniprocessor system, even -if left disabled by the BIOS. This option will accept any value at -all. +if left disabled by the BIOS. ### lapic\_timer\_c2\_ok > `= ` @@ -828,6 +832,9 @@ with **crashinfo_maxaddr**. ### max\_gsi\_irqs > `= ` +Specifies the number of interrupts to be use for pin (IO-APIC or legacy PIC) +based interrupts. Any higher IRQs will be available for use via PCI MSI. + ### maxcpus > `= ` @@ -912,7 +919,7 @@ IRQ routing issues. > Default: `false` Ignore the local APIC on a uniprocessor system, even if enabled by the -BIOS. This option will accept value. +BIOS. ### no-real-mode (x86) > `= ` diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index bbcc0a1..9cbfa6a 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -815,12 +815,7 @@ static void __init lapic_disable(char *str) setup_clear_cpu_cap(X86_FEATURE_APIC); } custom_param("nolapic", lapic_disable); - -static void __init lapic_enable(char *str) -{ - enable_local_apic = 1; -} -custom_param("lapic", lapic_enable); +boolean_param("lapic", enable_local_apic); static void __init apic_set_verbosity(char *str) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHM2-0001c2-9z; Tue, 12 Aug 2014 19:03:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHM1-0001bo-O5 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:29 +0000 Received: from [85.158.139.211:24746] by server-1.bemta-5.messagelabs.com id 5B/0C-17892-1056AE35; Tue, 12 Aug 2014 19:03:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1407870207!10940559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6270 invoked from network); 12 Aug 2014 19:03:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLz-00006Q-7b for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLz-0003MG-5U for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:27 +0000 Date: Tue, 12 Aug 2014 19:03:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: command line option adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 142f87c0dcee0c970c296d54f0f5bf1496fec58d Author: Jan Beulich AuthorDate: Wed Aug 6 18:02:41 2014 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 18:02:41 2014 +0200 x86/HVM: command line option adjustments Adding actual descriptions for them, hiding the hvm_debug= one from non-debug builds (the option was recognized but didn't take any effect so far), and adjusting some debug level specifiers to their purpose. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- docs/misc/xen-command-line.markdown | 24 ++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 12 ++++++------ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4492195..a8cab59 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -661,9 +661,33 @@ supported only when compiled with XSM\_ENABLE=y on x86. ### hvm\_debug > `= ` +The specified value is a bit mask with the individual bits having the +following meaning: + +Bit 0 - debug level 0 (unused at present) +Bit 1 - debug level 1 (Control Register logging) +Bit 2 - debug level 2 (VMX logging of MSR restores when context switching) +Bit 3 - debug level 3 (unused at present) +Bit 4 - I/O operation logging +Bit 5 - vMMU logging +Bit 6 - vLAPIC general logging +Bit 7 - vLAPIC timer logging +Bit 8 - vLAPIC interrupt logging +Bit 9 - vIOAPIC logging +Bit 10 - hypercall logging +Bit 11 - MSR operation logging + +Recognized in debug builds of the hypervisor only. + ### hvm\_port80 > `= ` +> Default: `true` + +Specify whether guests are to be given access to physical port 80 +(often used for debugging purposes), to override the DMI based +detection of systems known to misbehave upon accesses to that port. + ### highmem-start > `= ` diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 31629e7..d2c6942 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -70,8 +70,10 @@ bool_t __read_mostly hvm_enabled; +#ifdef DBG_LEVEL_0 unsigned int opt_hvm_debug_level __read_mostly; integer_param("hvm_debug", opt_hvm_debug_level); +#endif struct hvm_function_table hvm_funcs __read_mostly; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 76616ac..71b8a6a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1692,7 +1692,7 @@ static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) goto gpf; } - HVM_DBG_LOG(DBG_LEVEL_1, "returns: ecx=%x, msr_value=%"PRIx64, + HVM_DBG_LOG(DBG_LEVEL_MSR, "returns: ecx=%x, msr_value=%"PRIx64, msr, *msr_content); return X86EMUL_OKAY; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 8ffc562..4a4f4e1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -721,7 +721,7 @@ void vmx_disable_intercept_for_msr(struct vcpu *v, u32 msr, int type) clear_bit(msr, msr_bitmap + 0xc00/BYTES_PER_LONG); /* write-high */ } else - HVM_DBG_LOG(DBG_LEVEL_0, + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %x is out of the control range" "0x00000000-0x00001fff and 0xc0000000-0xc0001fff" "RDMSR or WRMSR will cause a VM exit", msr); @@ -757,7 +757,7 @@ void vmx_enable_intercept_for_msr(struct vcpu *v, u32 msr, int type) set_bit(msr, msr_bitmap + 0xc00/BYTES_PER_LONG); /* write-high */ } else - HVM_DBG_LOG(DBG_LEVEL_0, + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %x is out of the control range" "0x00000000-0x00001fff and 0xc0000000-0xc0001fff" "RDMSR or WRMSR will cause a VM exit", msr); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2caa04a..fb65c7d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -199,7 +199,7 @@ long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) return HNDL_unhandled; } - HVM_DBG_LOG(DBG_LEVEL_0, "msr %#x content %#"PRIx64, msr, *msr_content); + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %#x content %#"PRIx64, msr, *msr_content); return HNDL_done; } @@ -211,7 +211,7 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) struct vmx_msr_state *guest_msr_state = &v->arch.hvm_vmx.msr_state; struct vmx_msr_state *host_msr_state = &this_cpu(host_msr_state); - HVM_DBG_LOG(DBG_LEVEL_0, "msr %#x content %#"PRIx64, msr, msr_content); + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %#x content %#"PRIx64, msr, msr_content); switch ( msr ) { @@ -254,7 +254,7 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) return HNDL_done; uncanonical_address: - HVM_DBG_LOG(DBG_LEVEL_0, "Not cano address of msr write %x", msr); + HVM_DBG_LOG(DBG_LEVEL_MSR, "Not cano address of msr write %x", msr); hvm_inject_hw_exception(TRAP_gp_fault, 0); return HNDL_exception_raised; } @@ -2046,7 +2046,7 @@ static int is_last_branch_msr(u32 ecx) static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content) { - HVM_DBG_LOG(DBG_LEVEL_1, "ecx=%#x", msr); + HVM_DBG_LOG(DBG_LEVEL_MSR, "ecx=%#x", msr); switch ( msr ) { @@ -2111,7 +2111,7 @@ static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content) } done: - HVM_DBG_LOG(DBG_LEVEL_1, "returns: ecx=%#x, msr_value=%#"PRIx64, + HVM_DBG_LOG(DBG_LEVEL_MSR, "returns: ecx=%#x, msr_value=%#"PRIx64, msr, *msr_content); return X86EMUL_OKAY; @@ -2229,7 +2229,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) { struct vcpu *v = current; - HVM_DBG_LOG(DBG_LEVEL_1, "ecx=%#x, msr_value=%#"PRIx64, msr, msr_content); + HVM_DBG_LOG(DBG_LEVEL_MSR, "ecx=%#x, msr_value=%#"PRIx64, msr, msr_content); switch ( msr ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHM2-0001c2-9z; Tue, 12 Aug 2014 19:03:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHM1-0001bo-O5 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:29 +0000 Received: from [85.158.139.211:24746] by server-1.bemta-5.messagelabs.com id 5B/0C-17892-1056AE35; Tue, 12 Aug 2014 19:03:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1407870207!10940559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6270 invoked from network); 12 Aug 2014 19:03:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHLz-00006Q-7b for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHLz-0003MG-5U for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:27 +0000 Date: Tue, 12 Aug 2014 19:03:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: command line option adjustments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 142f87c0dcee0c970c296d54f0f5bf1496fec58d Author: Jan Beulich AuthorDate: Wed Aug 6 18:02:41 2014 +0200 Commit: Jan Beulich CommitDate: Wed Aug 6 18:02:41 2014 +0200 x86/HVM: command line option adjustments Adding actual descriptions for them, hiding the hvm_debug= one from non-debug builds (the option was recognized but didn't take any effect so far), and adjusting some debug level specifiers to their purpose. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- docs/misc/xen-command-line.markdown | 24 ++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 2 ++ xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/hvm/vmx/vmx.c | 12 ++++++------ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4492195..a8cab59 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -661,9 +661,33 @@ supported only when compiled with XSM\_ENABLE=y on x86. ### hvm\_debug > `= ` +The specified value is a bit mask with the individual bits having the +following meaning: + +Bit 0 - debug level 0 (unused at present) +Bit 1 - debug level 1 (Control Register logging) +Bit 2 - debug level 2 (VMX logging of MSR restores when context switching) +Bit 3 - debug level 3 (unused at present) +Bit 4 - I/O operation logging +Bit 5 - vMMU logging +Bit 6 - vLAPIC general logging +Bit 7 - vLAPIC timer logging +Bit 8 - vLAPIC interrupt logging +Bit 9 - vIOAPIC logging +Bit 10 - hypercall logging +Bit 11 - MSR operation logging + +Recognized in debug builds of the hypervisor only. + ### hvm\_port80 > `= ` +> Default: `true` + +Specify whether guests are to be given access to physical port 80 +(often used for debugging purposes), to override the DMI based +detection of systems known to misbehave upon accesses to that port. + ### highmem-start > `= ` diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 31629e7..d2c6942 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -70,8 +70,10 @@ bool_t __read_mostly hvm_enabled; +#ifdef DBG_LEVEL_0 unsigned int opt_hvm_debug_level __read_mostly; integer_param("hvm_debug", opt_hvm_debug_level); +#endif struct hvm_function_table hvm_funcs __read_mostly; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 76616ac..71b8a6a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1692,7 +1692,7 @@ static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) goto gpf; } - HVM_DBG_LOG(DBG_LEVEL_1, "returns: ecx=%x, msr_value=%"PRIx64, + HVM_DBG_LOG(DBG_LEVEL_MSR, "returns: ecx=%x, msr_value=%"PRIx64, msr, *msr_content); return X86EMUL_OKAY; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 8ffc562..4a4f4e1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -721,7 +721,7 @@ void vmx_disable_intercept_for_msr(struct vcpu *v, u32 msr, int type) clear_bit(msr, msr_bitmap + 0xc00/BYTES_PER_LONG); /* write-high */ } else - HVM_DBG_LOG(DBG_LEVEL_0, + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %x is out of the control range" "0x00000000-0x00001fff and 0xc0000000-0xc0001fff" "RDMSR or WRMSR will cause a VM exit", msr); @@ -757,7 +757,7 @@ void vmx_enable_intercept_for_msr(struct vcpu *v, u32 msr, int type) set_bit(msr, msr_bitmap + 0xc00/BYTES_PER_LONG); /* write-high */ } else - HVM_DBG_LOG(DBG_LEVEL_0, + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %x is out of the control range" "0x00000000-0x00001fff and 0xc0000000-0xc0001fff" "RDMSR or WRMSR will cause a VM exit", msr); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2caa04a..fb65c7d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -199,7 +199,7 @@ long_mode_do_msr_read(unsigned int msr, uint64_t *msr_content) return HNDL_unhandled; } - HVM_DBG_LOG(DBG_LEVEL_0, "msr %#x content %#"PRIx64, msr, *msr_content); + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %#x content %#"PRIx64, msr, *msr_content); return HNDL_done; } @@ -211,7 +211,7 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) struct vmx_msr_state *guest_msr_state = &v->arch.hvm_vmx.msr_state; struct vmx_msr_state *host_msr_state = &this_cpu(host_msr_state); - HVM_DBG_LOG(DBG_LEVEL_0, "msr %#x content %#"PRIx64, msr, msr_content); + HVM_DBG_LOG(DBG_LEVEL_MSR, "msr %#x content %#"PRIx64, msr, msr_content); switch ( msr ) { @@ -254,7 +254,7 @@ long_mode_do_msr_write(unsigned int msr, uint64_t msr_content) return HNDL_done; uncanonical_address: - HVM_DBG_LOG(DBG_LEVEL_0, "Not cano address of msr write %x", msr); + HVM_DBG_LOG(DBG_LEVEL_MSR, "Not cano address of msr write %x", msr); hvm_inject_hw_exception(TRAP_gp_fault, 0); return HNDL_exception_raised; } @@ -2046,7 +2046,7 @@ static int is_last_branch_msr(u32 ecx) static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content) { - HVM_DBG_LOG(DBG_LEVEL_1, "ecx=%#x", msr); + HVM_DBG_LOG(DBG_LEVEL_MSR, "ecx=%#x", msr); switch ( msr ) { @@ -2111,7 +2111,7 @@ static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content) } done: - HVM_DBG_LOG(DBG_LEVEL_1, "returns: ecx=%#x, msr_value=%#"PRIx64, + HVM_DBG_LOG(DBG_LEVEL_MSR, "returns: ecx=%#x, msr_value=%#"PRIx64, msr, *msr_content); return X86EMUL_OKAY; @@ -2229,7 +2229,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) { struct vcpu *v = current; - HVM_DBG_LOG(DBG_LEVEL_1, "ecx=%#x, msr_value=%#"PRIx64, msr, msr_content); + HVM_DBG_LOG(DBG_LEVEL_MSR, "ecx=%#x, msr_value=%#"PRIx64, msr, msr_content); switch ( msr ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMD-0001dv-Cy; Tue, 12 Aug 2014 19:03:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMC-0001di-41 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:40 +0000 Received: from [85.158.137.68:45782] by server-11.bemta-3.messagelabs.com id 38/AA-27768-B056AE35; Tue, 12 Aug 2014 19:03:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1407870217!10864455!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6189 invoked from network); 12 Aug 2014 19:03:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHM9-00006Y-DB for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHM9-0003Mg-Bk for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:37 +0000 Date: Tue, 12 Aug 2014 19:03:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: make logging less verbose X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a84938b444d7f2e393c9be67fbd0019cafbd974c Author: Paul Durrant AuthorDate: Fri Aug 8 09:30:49 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 8 09:30:49 2014 +0200 x86/viridian: make logging less verbose The use of gdprintk() adds uninteresting prefixes to the log lines, and there's really too many lines. This patch reduces the verbosity. Signed-off-by: Paul Durrant --- xen/arch/x86/hvm/viridian.c | 46 +++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 0fcbfd8..b646a8a 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -119,37 +119,37 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, static void dump_guest_os_id(const struct domain *d) { - gdprintk(XENLOG_INFO, "GUEST_OS_ID:\n"); - gdprintk(XENLOG_INFO, "\tvendor: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.vendor); - gdprintk(XENLOG_INFO, "\tos: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.os); - gdprintk(XENLOG_INFO, "\tmajor: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.major); - gdprintk(XENLOG_INFO, "\tminor: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.minor); - gdprintk(XENLOG_INFO, "\tsp: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.service_pack); - gdprintk(XENLOG_INFO, "\tbuild: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.build_number); + const union viridian_guest_os_id *goi; + + goi = &d->arch.hvm_domain.viridian.guest_os_id; + + printk(XENLOG_G_INFO + "d%d: VIRIDIAN GUEST_OS_ID: vendor: %x os: %x major: %x minor: %x sp: %x build: %x\n", + d->domain_id, + goi->fields.vendor, goi->fields.os, + goi->fields.major, goi->fields.minor, + goi->fields.service_pack, goi->fields.build_number); } static void dump_hypercall(const struct domain *d) { - gdprintk(XENLOG_INFO, "HYPERCALL:\n"); - gdprintk(XENLOG_INFO, "\tenabled: %x\n", - d->arch.hvm_domain.viridian.hypercall_gpa.fields.enabled); - gdprintk(XENLOG_INFO, "\tpfn: %lx\n", - (unsigned long)d->arch.hvm_domain.viridian.hypercall_gpa.fields.pfn); + const union viridian_hypercall_gpa *hg; + + hg = &d->arch.hvm_domain.viridian.hypercall_gpa; + + printk(XENLOG_G_INFO "d%d: VIRIDIAN HYPERCALL: enabled: %x pfn: %lx\n", + d->domain_id, + hg->fields.enabled, (unsigned long)hg->fields.pfn); } static void dump_apic_assist(const struct vcpu *v) { - gdprintk(XENLOG_INFO, "APIC_ASSIST[%d]:\n", v->vcpu_id); - gdprintk(XENLOG_INFO, "\tenabled: %x\n", - v->arch.hvm_vcpu.viridian.apic_assist.fields.enabled); - gdprintk(XENLOG_INFO, "\tpfn: %lx\n", - (unsigned long)v->arch.hvm_vcpu.viridian.apic_assist.fields.pfn); + const union viridian_apic_assist *aa; + + aa = &v->arch.hvm_vcpu.viridian.apic_assist; + + printk(XENLOG_G_INFO "%pv: VIRIDIAN APIC_ASSIST: enabled: %x pfn: %lx\n", + v, aa->fields.enabled, (unsigned long)aa->fields.pfn); } static void enable_hypercall_page(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMD-0001dv-Cy; Tue, 12 Aug 2014 19:03:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMC-0001di-41 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:40 +0000 Received: from [85.158.137.68:45782] by server-11.bemta-3.messagelabs.com id 38/AA-27768-B056AE35; Tue, 12 Aug 2014 19:03:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1407870217!10864455!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6189 invoked from network); 12 Aug 2014 19:03:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHM9-00006Y-DB for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHM9-0003Mg-Bk for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:37 +0000 Date: Tue, 12 Aug 2014 19:03:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: make logging less verbose X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a84938b444d7f2e393c9be67fbd0019cafbd974c Author: Paul Durrant AuthorDate: Fri Aug 8 09:30:49 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 8 09:30:49 2014 +0200 x86/viridian: make logging less verbose The use of gdprintk() adds uninteresting prefixes to the log lines, and there's really too many lines. This patch reduces the verbosity. Signed-off-by: Paul Durrant --- xen/arch/x86/hvm/viridian.c | 46 +++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 0fcbfd8..b646a8a 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -119,37 +119,37 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, static void dump_guest_os_id(const struct domain *d) { - gdprintk(XENLOG_INFO, "GUEST_OS_ID:\n"); - gdprintk(XENLOG_INFO, "\tvendor: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.vendor); - gdprintk(XENLOG_INFO, "\tos: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.os); - gdprintk(XENLOG_INFO, "\tmajor: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.major); - gdprintk(XENLOG_INFO, "\tminor: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.minor); - gdprintk(XENLOG_INFO, "\tsp: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.service_pack); - gdprintk(XENLOG_INFO, "\tbuild: %x\n", - d->arch.hvm_domain.viridian.guest_os_id.fields.build_number); + const union viridian_guest_os_id *goi; + + goi = &d->arch.hvm_domain.viridian.guest_os_id; + + printk(XENLOG_G_INFO + "d%d: VIRIDIAN GUEST_OS_ID: vendor: %x os: %x major: %x minor: %x sp: %x build: %x\n", + d->domain_id, + goi->fields.vendor, goi->fields.os, + goi->fields.major, goi->fields.minor, + goi->fields.service_pack, goi->fields.build_number); } static void dump_hypercall(const struct domain *d) { - gdprintk(XENLOG_INFO, "HYPERCALL:\n"); - gdprintk(XENLOG_INFO, "\tenabled: %x\n", - d->arch.hvm_domain.viridian.hypercall_gpa.fields.enabled); - gdprintk(XENLOG_INFO, "\tpfn: %lx\n", - (unsigned long)d->arch.hvm_domain.viridian.hypercall_gpa.fields.pfn); + const union viridian_hypercall_gpa *hg; + + hg = &d->arch.hvm_domain.viridian.hypercall_gpa; + + printk(XENLOG_G_INFO "d%d: VIRIDIAN HYPERCALL: enabled: %x pfn: %lx\n", + d->domain_id, + hg->fields.enabled, (unsigned long)hg->fields.pfn); } static void dump_apic_assist(const struct vcpu *v) { - gdprintk(XENLOG_INFO, "APIC_ASSIST[%d]:\n", v->vcpu_id); - gdprintk(XENLOG_INFO, "\tenabled: %x\n", - v->arch.hvm_vcpu.viridian.apic_assist.fields.enabled); - gdprintk(XENLOG_INFO, "\tpfn: %lx\n", - (unsigned long)v->arch.hvm_vcpu.viridian.apic_assist.fields.pfn); + const union viridian_apic_assist *aa; + + aa = &v->arch.hvm_vcpu.viridian.apic_assist; + + printk(XENLOG_G_INFO "%pv: VIRIDIAN APIC_ASSIST: enabled: %x pfn: %lx\n", + v, aa->fields.enabled, (unsigned long)aa->fields.pfn); } static void enable_hypercall_page(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMN-0001fx-HV; Tue, 12 Aug 2014 19:03:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMM-0001ff-7O for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:50 +0000 Received: from [85.158.139.211:29068] by server-6.bemta-5.messagelabs.com id 10/B2-06284-5156AE35; Tue, 12 Aug 2014 19:03:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1407870227!10971109!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10926 invoked from network); 12 Aug 2014 19:03:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMJ-00006e-IL for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMJ-0003NA-H4 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:47 +0000 Date: Tue, 12 Aug 2014 19:03:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pass-through: fix unbinding of MSI interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf28eecf7b681366ecfbdf250c3c5015ff21fdee Author: Jan Beulich AuthorDate: Fri Aug 8 09:32:58 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 8 09:32:58 2014 +0200 pass-through: fix unbinding of MSI interrupts Commit 568da4f8 ("pt-irq fixes and improvements") went a little too far in its cleaning up of pt_irq_destroy_bind(): While neither of the two lists need any maintenance, the actual unbinding still needs to be done. Fix this and at once - move all variables applying only to the PCI/MSI-translate cases into scopes where they can't be used in error, - limit the final (optional) log message to the cases it actually applies and enhance it to make clear how much cleaning up was actually done. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Tested-by: Boris Ostrovsky Tested-by: Konrad Rzeszutek Wilk Tested-by: Sander Eikelenboom --- xen/drivers/passthrough/io.c | 131 ++++++++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 56 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index a380c9c..ef75b94 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -295,32 +295,31 @@ int pt_irq_destroy_bind( struct hvm_irq_dpci *hvm_irq_dpci; struct hvm_pirq_dpci *pirq_dpci; unsigned int machine_gsi = pt_irq_bind->machine_irq; - unsigned int bus = pt_irq_bind->u.pci.bus; - unsigned int device = pt_irq_bind->u.pci.device; - unsigned int intx = pt_irq_bind->u.pci.intx; - unsigned int guest_gsi = hvm_pci_intx_gsi(device, intx); - unsigned int link = hvm_pci_intx_link(device, intx); - struct dev_intx_gsi_link *digl, *tmp; - struct hvm_girq_dpci_mapping *girq; struct pirq *pirq; + const char *what = NULL; switch ( pt_irq_bind->irq_type ) { case PT_IRQ_TYPE_PCI: case PT_IRQ_TYPE_MSI_TRANSLATE: + if ( iommu_verbose ) + { + unsigned int device = pt_irq_bind->u.pci.device; + unsigned int intx = pt_irq_bind->u.pci.intx; + + dprintk(XENLOG_G_INFO, + "d%d: unbind: m_gsi=%u g_gsi=%u dev=%02x:%02x.%u intx=%u\n", + d->domain_id, machine_gsi, hvm_pci_intx_gsi(device, intx), + pt_irq_bind->u.pci.bus, + PCI_SLOT(device), PCI_FUNC(device), intx); + } break; case PT_IRQ_TYPE_MSI: - return 0; + break; default: return -EOPNOTSUPP; } - if ( iommu_verbose ) - dprintk(XENLOG_G_INFO, - "d%d: unbind: m_gsi=%u g_gsi=%u dev=%02x:%02x.%u intx=%u\n", - d->domain_id, machine_gsi, guest_gsi, bus, - PCI_SLOT(device), PCI_FUNC(device), intx); - spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); @@ -331,63 +330,83 @@ int pt_irq_destroy_bind( return -EINVAL; } - list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - { - if ( girq->bus == bus && - girq->device == device && - girq->intx == intx && - girq->machine_gsi == machine_gsi ) - { - list_del(&girq->list); - xfree(girq); - girq = NULL; - break; - } - } - - if ( girq ) - { - spin_unlock(&d->event_lock); - return -EINVAL; - } - - hvm_irq_dpci->link_cnt[link]--; - pirq = pirq_info(d, machine_gsi); pirq_dpci = pirq_dpci(pirq); - /* clear the mirq info */ - if ( pirq_dpci && (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) + if ( pt_irq_bind->irq_type != PT_IRQ_TYPE_MSI ) { - list_for_each_entry_safe ( digl, tmp, &pirq_dpci->digl_list, list ) + unsigned int bus = pt_irq_bind->u.pci.bus; + unsigned int device = pt_irq_bind->u.pci.device; + unsigned int intx = pt_irq_bind->u.pci.intx; + unsigned int guest_gsi = hvm_pci_intx_gsi(device, intx); + unsigned int link = hvm_pci_intx_link(device, intx); + struct hvm_girq_dpci_mapping *girq; + struct dev_intx_gsi_link *digl, *tmp; + + list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) { - if ( digl->bus == bus && - digl->device == device && - digl->intx == intx ) + if ( girq->bus == bus && + girq->device == device && + girq->intx == intx && + girq->machine_gsi == machine_gsi ) { - list_del(&digl->list); - xfree(digl); + list_del(&girq->list); + xfree(girq); + girq = NULL; + break; } } - if ( list_empty(&pirq_dpci->digl_list) ) + if ( girq ) { - pirq_guest_unbind(d, pirq); - msixtbl_pt_unregister(d, pirq); - if ( pt_irq_need_timer(pirq_dpci->flags) ) - kill_timer(&pirq_dpci->timer); - pirq_dpci->dom = NULL; - pirq_dpci->flags = 0; - pirq_cleanup_check(pirq, d); + spin_unlock(&d->event_lock); + return -EINVAL; } + + hvm_irq_dpci->link_cnt[link]--; + + /* clear the mirq info */ + if ( pirq_dpci && (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) + { + list_for_each_entry_safe ( digl, tmp, &pirq_dpci->digl_list, list ) + { + if ( digl->bus == bus && + digl->device == device && + digl->intx == intx ) + { + list_del(&digl->list); + xfree(digl); + } + } + what = list_empty(&pirq_dpci->digl_list) ? "final" : "partial"; + } + else + what = "bogus"; + } + + if ( pirq_dpci && (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) && + list_empty(&pirq_dpci->digl_list) ) + { + pirq_guest_unbind(d, pirq); + msixtbl_pt_unregister(d, pirq); + if ( pt_irq_need_timer(pirq_dpci->flags) ) + kill_timer(&pirq_dpci->timer); + pirq_dpci->dom = NULL; + pirq_dpci->flags = 0; + pirq_cleanup_check(pirq, d); } + spin_unlock(&d->event_lock); - if ( iommu_verbose ) + if ( what && iommu_verbose ) + { + unsigned int device = pt_irq_bind->u.pci.device; + dprintk(XENLOG_G_INFO, - "d%d unmap: m_irq=%u dev=%02x:%02x.%u intx=%u\n", - d->domain_id, machine_gsi, bus, - PCI_SLOT(device), PCI_FUNC(device), intx); + "d%d %s unmap: m_irq=%u dev=%02x:%02x.%u intx=%u\n", + d->domain_id, what, machine_gsi, pt_irq_bind->u.pci.bus, + PCI_SLOT(device), PCI_FUNC(device), pt_irq_bind->u.pci.intx); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:03:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:03:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMN-0001fx-HV; Tue, 12 Aug 2014 19:03:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMM-0001ff-7O for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:50 +0000 Received: from [85.158.139.211:29068] by server-6.bemta-5.messagelabs.com id 10/B2-06284-5156AE35; Tue, 12 Aug 2014 19:03:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1407870227!10971109!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10926 invoked from network); 12 Aug 2014 19:03:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMJ-00006e-IL for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMJ-0003NA-H4 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:47 +0000 Date: Tue, 12 Aug 2014 19:03:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pass-through: fix unbinding of MSI interrupts X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf28eecf7b681366ecfbdf250c3c5015ff21fdee Author: Jan Beulich AuthorDate: Fri Aug 8 09:32:58 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 8 09:32:58 2014 +0200 pass-through: fix unbinding of MSI interrupts Commit 568da4f8 ("pt-irq fixes and improvements") went a little too far in its cleaning up of pt_irq_destroy_bind(): While neither of the two lists need any maintenance, the actual unbinding still needs to be done. Fix this and at once - move all variables applying only to the PCI/MSI-translate cases into scopes where they can't be used in error, - limit the final (optional) log message to the cases it actually applies and enhance it to make clear how much cleaning up was actually done. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Tested-by: Boris Ostrovsky Tested-by: Konrad Rzeszutek Wilk Tested-by: Sander Eikelenboom --- xen/drivers/passthrough/io.c | 131 ++++++++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 56 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index a380c9c..ef75b94 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -295,32 +295,31 @@ int pt_irq_destroy_bind( struct hvm_irq_dpci *hvm_irq_dpci; struct hvm_pirq_dpci *pirq_dpci; unsigned int machine_gsi = pt_irq_bind->machine_irq; - unsigned int bus = pt_irq_bind->u.pci.bus; - unsigned int device = pt_irq_bind->u.pci.device; - unsigned int intx = pt_irq_bind->u.pci.intx; - unsigned int guest_gsi = hvm_pci_intx_gsi(device, intx); - unsigned int link = hvm_pci_intx_link(device, intx); - struct dev_intx_gsi_link *digl, *tmp; - struct hvm_girq_dpci_mapping *girq; struct pirq *pirq; + const char *what = NULL; switch ( pt_irq_bind->irq_type ) { case PT_IRQ_TYPE_PCI: case PT_IRQ_TYPE_MSI_TRANSLATE: + if ( iommu_verbose ) + { + unsigned int device = pt_irq_bind->u.pci.device; + unsigned int intx = pt_irq_bind->u.pci.intx; + + dprintk(XENLOG_G_INFO, + "d%d: unbind: m_gsi=%u g_gsi=%u dev=%02x:%02x.%u intx=%u\n", + d->domain_id, machine_gsi, hvm_pci_intx_gsi(device, intx), + pt_irq_bind->u.pci.bus, + PCI_SLOT(device), PCI_FUNC(device), intx); + } break; case PT_IRQ_TYPE_MSI: - return 0; + break; default: return -EOPNOTSUPP; } - if ( iommu_verbose ) - dprintk(XENLOG_G_INFO, - "d%d: unbind: m_gsi=%u g_gsi=%u dev=%02x:%02x.%u intx=%u\n", - d->domain_id, machine_gsi, guest_gsi, bus, - PCI_SLOT(device), PCI_FUNC(device), intx); - spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); @@ -331,63 +330,83 @@ int pt_irq_destroy_bind( return -EINVAL; } - list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) - { - if ( girq->bus == bus && - girq->device == device && - girq->intx == intx && - girq->machine_gsi == machine_gsi ) - { - list_del(&girq->list); - xfree(girq); - girq = NULL; - break; - } - } - - if ( girq ) - { - spin_unlock(&d->event_lock); - return -EINVAL; - } - - hvm_irq_dpci->link_cnt[link]--; - pirq = pirq_info(d, machine_gsi); pirq_dpci = pirq_dpci(pirq); - /* clear the mirq info */ - if ( pirq_dpci && (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) + if ( pt_irq_bind->irq_type != PT_IRQ_TYPE_MSI ) { - list_for_each_entry_safe ( digl, tmp, &pirq_dpci->digl_list, list ) + unsigned int bus = pt_irq_bind->u.pci.bus; + unsigned int device = pt_irq_bind->u.pci.device; + unsigned int intx = pt_irq_bind->u.pci.intx; + unsigned int guest_gsi = hvm_pci_intx_gsi(device, intx); + unsigned int link = hvm_pci_intx_link(device, intx); + struct hvm_girq_dpci_mapping *girq; + struct dev_intx_gsi_link *digl, *tmp; + + list_for_each_entry ( girq, &hvm_irq_dpci->girq[guest_gsi], list ) { - if ( digl->bus == bus && - digl->device == device && - digl->intx == intx ) + if ( girq->bus == bus && + girq->device == device && + girq->intx == intx && + girq->machine_gsi == machine_gsi ) { - list_del(&digl->list); - xfree(digl); + list_del(&girq->list); + xfree(girq); + girq = NULL; + break; } } - if ( list_empty(&pirq_dpci->digl_list) ) + if ( girq ) { - pirq_guest_unbind(d, pirq); - msixtbl_pt_unregister(d, pirq); - if ( pt_irq_need_timer(pirq_dpci->flags) ) - kill_timer(&pirq_dpci->timer); - pirq_dpci->dom = NULL; - pirq_dpci->flags = 0; - pirq_cleanup_check(pirq, d); + spin_unlock(&d->event_lock); + return -EINVAL; } + + hvm_irq_dpci->link_cnt[link]--; + + /* clear the mirq info */ + if ( pirq_dpci && (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) + { + list_for_each_entry_safe ( digl, tmp, &pirq_dpci->digl_list, list ) + { + if ( digl->bus == bus && + digl->device == device && + digl->intx == intx ) + { + list_del(&digl->list); + xfree(digl); + } + } + what = list_empty(&pirq_dpci->digl_list) ? "final" : "partial"; + } + else + what = "bogus"; + } + + if ( pirq_dpci && (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) && + list_empty(&pirq_dpci->digl_list) ) + { + pirq_guest_unbind(d, pirq); + msixtbl_pt_unregister(d, pirq); + if ( pt_irq_need_timer(pirq_dpci->flags) ) + kill_timer(&pirq_dpci->timer); + pirq_dpci->dom = NULL; + pirq_dpci->flags = 0; + pirq_cleanup_check(pirq, d); } + spin_unlock(&d->event_lock); - if ( iommu_verbose ) + if ( what && iommu_verbose ) + { + unsigned int device = pt_irq_bind->u.pci.device; + dprintk(XENLOG_G_INFO, - "d%d unmap: m_irq=%u dev=%02x:%02x.%u intx=%u\n", - d->domain_id, machine_gsi, bus, - PCI_SLOT(device), PCI_FUNC(device), intx); + "d%d %s unmap: m_irq=%u dev=%02x:%02x.%u intx=%u\n", + d->domain_id, what, machine_gsi, pt_irq_bind->u.pci.bus, + PCI_SLOT(device), PCI_FUNC(device), pt_irq_bind->u.pci.intx); + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMZ-0001hl-KM; Tue, 12 Aug 2014 19:04:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMX-0001hP-5x for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:01 +0000 Received: from [85.158.143.35:17637] by server-3.bemta-4.messagelabs.com id F2/98-06192-0256AE35; Tue, 12 Aug 2014 19:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1407870237!4600237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16832 invoked from network); 12 Aug 2014 19:03:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMT-00006n-Nh for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMT-0003Nd-MX for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:57 +0000 Date: Tue, 12 Aug 2014 19:03:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3af450fd2d9403f208d3ac6459716f027b8597ad Author: Jan Beulich AuthorDate: Fri Aug 8 09:34:03 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 8 09:34:03 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 0a00d5a..6f67fc7 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -599,23 +599,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -625,19 +634,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -652,20 +659,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -675,19 +681,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -702,21 +706,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -726,7 +729,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -734,17 +737,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -771,20 +772,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -797,19 +797,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -825,19 +823,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -850,19 +847,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -873,6 +868,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e833cdf..50d8965 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3921,7 +3918,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4188,7 +4186,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMZ-0001hl-KM; Tue, 12 Aug 2014 19:04:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMX-0001hP-5x for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:01 +0000 Received: from [85.158.143.35:17637] by server-3.bemta-4.messagelabs.com id F2/98-06192-0256AE35; Tue, 12 Aug 2014 19:04:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1407870237!4600237!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16832 invoked from network); 12 Aug 2014 19:03:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:03:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMT-00006n-Nh for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMT-0003Nd-MX for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:03:57 +0000 Date: Tue, 12 Aug 2014 19:03:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3af450fd2d9403f208d3ac6459716f027b8597ad Author: Jan Beulich AuthorDate: Fri Aug 8 09:34:03 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 8 09:34:03 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 0a00d5a..6f67fc7 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -599,23 +599,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -625,19 +634,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -652,20 +659,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -675,19 +681,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -702,21 +706,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -726,7 +729,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -734,17 +737,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -771,20 +772,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -797,19 +797,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -825,19 +823,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -850,19 +847,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -873,6 +868,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e833cdf..50d8965 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3921,7 +3918,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4188,7 +4186,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMh-0001ix-N7; Tue, 12 Aug 2014 19:04:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMg-0001ii-Ap for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:10 +0000 Content-Length: 2071 Received: from [85.158.137.68:47143] by server-13.bemta-3.messagelabs.com id 08/18-02729-9256AE35; Tue, 12 Aug 2014 19:04:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1407870248!13332528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18656 invoked from network); 12 Aug 2014 19:04:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMd-00007I-Tk for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMd-0003O9-SV for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:07 +0000 Date: Tue, 12 Aug 2014 19:04:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] amd-iommu: disable iommu_hap_pt_share with AMD IOMMUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7870087851036499947==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7870087851036499947== Content-Length: 1658 Content-Transfer-Encoding: quoted-printable commit c2ba3db31ef2d9f1e40e7b6c16cf3be3d671d555 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Aug 11 14:57:09 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 14:57:09 2014 +0200 amd-iommu: disable iommu_hap_pt_share with AMD IOMMUs According to the comment in p2m.h, AMD IOMMUs don't work correctly with page types different than p2m_ram_rw when the p2m is shared between HAP and IOMMU, so disable this sharing when using AMD IOMMUs. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_init.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b2f74ef..56bda00 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1255,6 +1255,14 @@ int __init amd_iommu_init(void) if ( iterate_ivrs_mappings(amd_iommu_setup_device_table) !=3D 0 ) goto error_out; + /* + * Disable sharing HAP page tables with AMD IOMMU, + * since it only supports p2m_ram_rw, and this would + * prevent doing IO to/from mapped grant frames. + */ + iommu_hap_pt_share =3D 0; + printk(XENLOG_DEBUG "AMD-Vi: Disabled HAP memory map sharing with IOMMU\n"); + /* per iommu initialization */ for_each_amd_iommu ( iommu ) if ( amd_iommu_init_one(iommu) !=3D 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7870087851036499947== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7870087851036499947==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMh-0001ix-N7; Tue, 12 Aug 2014 19:04:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMg-0001ii-Ap for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:10 +0000 Content-Length: 2071 Received: from [85.158.137.68:47143] by server-13.bemta-3.messagelabs.com id 08/18-02729-9256AE35; Tue, 12 Aug 2014 19:04:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1407870248!13332528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18656 invoked from network); 12 Aug 2014 19:04:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMd-00007I-Tk for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMd-0003O9-SV for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:07 +0000 Date: Tue, 12 Aug 2014 19:04:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] amd-iommu: disable iommu_hap_pt_share with AMD IOMMUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7870087851036499947==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7870087851036499947== Content-Length: 1658 Content-Transfer-Encoding: quoted-printable commit c2ba3db31ef2d9f1e40e7b6c16cf3be3d671d555 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Aug 11 14:57:09 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 14:57:09 2014 +0200 amd-iommu: disable iommu_hap_pt_share with AMD IOMMUs According to the comment in p2m.h, AMD IOMMUs don't work correctly with page types different than p2m_ram_rw when the p2m is shared between HAP and IOMMU, so disable this sharing when using AMD IOMMUs. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_init.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index b2f74ef..56bda00 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1255,6 +1255,14 @@ int __init amd_iommu_init(void) if ( iterate_ivrs_mappings(amd_iommu_setup_device_table) !=3D 0 ) goto error_out; + /* + * Disable sharing HAP page tables with AMD IOMMU, + * since it only supports p2m_ram_rw, and this would + * prevent doing IO to/from mapped grant frames. + */ + iommu_hap_pt_share =3D 0; + printk(XENLOG_DEBUG "AMD-Vi: Disabled HAP memory map sharing with IOMMU\n"); + /* per iommu initialization */ for_each_amd_iommu ( iommu ) if ( amd_iommu_init_one(iommu) !=3D 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7870087851036499947== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7870087851036499947==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMr-0001kr-SI; Tue, 12 Aug 2014 19:04:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMq-0001kb-Ib for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:20 +0000 Content-Length: 2652 Received: from [85.158.143.35:18679] by server-3.bemta-4.messagelabs.com id C9/C8-06192-3356AE35; Tue, 12 Aug 2014 19:04:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1407870258!12658809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19674 invoked from network); 12 Aug 2014 19:04:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMo-00007V-3i for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMo-0003PP-2X for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:18 +0000 Date: Tue, 12 Aug 2014 19:04:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: expose that grant table mappings update the IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1794540371239512180==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1794540371239512180== Content-Length: 2261 Content-Transfer-Encoding: quoted-printable commit b074b99c34f9ab5bf234b4778a417b5b55690060 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Aug 11 14:58:40 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 14:58:40 2014 +0200 x86/HVM: expose that grant table mappings update the IOMMU Add a new CPUID flag for leaf 4 that indicates that grant/foreign mappings update the IOMMU accordingly. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 10 ++++++++++ xen/include/public/arch-x86/cpuid.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d2c6942..d40c48e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -67,6 +67,7 @@ #include #include #include +#include bool_t __read_mostly hvm_enabled; @@ -4197,6 +4198,15 @@ void hvm_hypervisor_cpuid_leaf(uint32_t sub_idx, *eax =3D *ebx =3D *ecx =3D *edx =3D 0; if ( hvm_funcs.hypervisor_cpuid_leaf ) hvm_funcs.hypervisor_cpuid_leaf(sub_idx, eax, ebx, ecx, edx); + + if ( sub_idx =3D=3D 0 ) + { + /* + * Indicate that memory mapped from other domains (either grants or + * foreign pages) has valid IOMMU entries. + */ + *eax |=3D XEN_HVM_CPUID_IOMMU_MAPPINGS; + } } void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, diff --git a/xen/include/public/arch-x86/cpuid.h b/xen/include/public/arch-x86/cpuid.h index 7135d54..e57a457 100644 --- a/xen/include/public/arch-x86/cpuid.h +++ b/xen/include/public/arch-x86/cpuid.h @@ -73,6 +73,8 @@ /* EAX Features */ #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */ #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */ +/* Memory mapped from other domains has valid IOMMU entries */ +#define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) #define XEN_CPUID_MAX_NUM_LEAVES 4 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1794540371239512180== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============1794540371239512180==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMr-0001kr-SI; Tue, 12 Aug 2014 19:04:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMq-0001kb-Ib for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:20 +0000 Content-Length: 2652 Received: from [85.158.143.35:18679] by server-3.bemta-4.messagelabs.com id C9/C8-06192-3356AE35; Tue, 12 Aug 2014 19:04:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1407870258!12658809!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19674 invoked from network); 12 Aug 2014 19:04:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMo-00007V-3i for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMo-0003PP-2X for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:18 +0000 Date: Tue, 12 Aug 2014 19:04:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: expose that grant table mappings update the IOMMU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1794540371239512180==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1794540371239512180== Content-Length: 2261 Content-Transfer-Encoding: quoted-printable commit b074b99c34f9ab5bf234b4778a417b5b55690060 Author: Roger Pau Monn=C3=A9 AuthorDate: Mon Aug 11 14:58:40 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 14:58:40 2014 +0200 x86/HVM: expose that grant table mappings update the IOMMU Add a new CPUID flag for leaf 4 that indicates that grant/foreign mappings update the IOMMU accordingly. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 10 ++++++++++ xen/include/public/arch-x86/cpuid.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d2c6942..d40c48e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -67,6 +67,7 @@ #include #include #include +#include bool_t __read_mostly hvm_enabled; @@ -4197,6 +4198,15 @@ void hvm_hypervisor_cpuid_leaf(uint32_t sub_idx, *eax =3D *ebx =3D *ecx =3D *edx =3D 0; if ( hvm_funcs.hypervisor_cpuid_leaf ) hvm_funcs.hypervisor_cpuid_leaf(sub_idx, eax, ebx, ecx, edx); + + if ( sub_idx =3D=3D 0 ) + { + /* + * Indicate that memory mapped from other domains (either grants or + * foreign pages) has valid IOMMU entries. + */ + *eax |=3D XEN_HVM_CPUID_IOMMU_MAPPINGS; + } } void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, diff --git a/xen/include/public/arch-x86/cpuid.h b/xen/include/public/arch-x86/cpuid.h index 7135d54..e57a457 100644 --- a/xen/include/public/arch-x86/cpuid.h +++ b/xen/include/public/arch-x86/cpuid.h @@ -73,6 +73,8 @@ /* EAX Features */ #define XEN_HVM_CPUID_APIC_ACCESS_VIRT (1u << 0) /* Virtualized APIC registers */ #define XEN_HVM_CPUID_X2APIC_VIRT (1u << 1) /* Virtualized x2APIC accesses */ +/* Memory mapped from other domains has valid IOMMU entries */ +#define XEN_HVM_CPUID_IOMMU_MAPPINGS (1u << 2) #define XEN_CPUID_MAX_NUM_LEAVES 4 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1794540371239512180== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============1794540371239512180==-- From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHN3-0001me-VI; Tue, 12 Aug 2014 19:04:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHN2-0001mR-HZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:32 +0000 Received: from [85.158.137.68:19141] by server-7.bemta-3.messagelabs.com id D8/D2-01084-F356AE35; Tue, 12 Aug 2014 19:04:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407870268!9559511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10228 invoked from network); 12 Aug 2014 19:04:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMy-00007d-Bf for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMy-0003Pl-85 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:28 +0000 Date: Tue, 12 Aug 2014 19:04:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vHPET: use rwlock instead of simple one X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ded2100990d1688b96c2edc7221887c56c1a8e04 Author: Jan Beulich AuthorDate: Mon Aug 11 15:00:15 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:00:15 2014 +0200 x86/vHPET: use rwlock instead of simple one This namely benefits guests heavily reading the main counter, but not touching the HPET much otherwise. Note that due to the way hpet_get_comparator() works hpet_read() has to special cases reads from the comparator registers and use a write lock there instead of the read one used for all other registers. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/hpet.c | 42 +++++++++++++++++++++++++--------------- xen/arch/x86/hvm/vpt.c | 4 +- xen/include/asm-x86/hvm/vpt.h | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 81ad0d6..bdfc6fc 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -77,7 +77,7 @@ static inline uint64_t hpet_read_maincounter(HPETState *h, uint64_t guest_time) { - ASSERT(spin_is_locked(&h->lock)); + ASSERT(rw_is_locked(&h->lock)); if ( hpet_enabled(h) ) return guest_time + h->mc_offset; @@ -91,6 +91,8 @@ static uint64_t hpet_get_comparator(HPETState *h, unsigned int tn, uint64_t comparator; uint64_t elapsed; + ASSERT(rw_is_write_locked(&h->lock)); + comparator = h->hpet.comparator64[tn]; if ( hpet_enabled(h) && timer_is_periodic(h, tn) ) { @@ -179,16 +181,24 @@ static int hpet_read( goto out; } - spin_lock(&h->lock); + result = addr < HPET_Tn_CMP(0) || + ((addr - HPET_Tn_CMP(0)) % (HPET_Tn_CMP(1) - HPET_Tn_CMP(0))) > 7; + if ( result ) + read_lock(&h->lock); + else + write_lock(&h->lock); val = hpet_read64(h, addr, guest_time_hpet(h)); + if ( result ) + read_unlock(&h->lock); + else + write_unlock(&h->lock); + result = val; if ( length != 8 ) result = (val >> ((addr & 7) * 8)) & ((1ULL << (length * 8)) - 1); - spin_unlock(&h->lock); - out: *pval = result; return X86EMUL_OKAY; @@ -198,7 +208,7 @@ static void hpet_stop_timer(HPETState *h, unsigned int tn, uint64_t guest_time) { ASSERT(tn < HPET_TIMER_NUM); - ASSERT(spin_is_locked(&h->lock)); + ASSERT(rw_is_write_locked(&h->lock)); TRACE_1D(TRC_HVM_EMUL_HPET_STOP_TIMER, tn); destroy_periodic_time(&h->pt[tn]); /* read the comparator to get it updated so a read while stopped will @@ -218,7 +228,7 @@ static void hpet_set_timer(HPETState *h, unsigned int tn, unsigned int oneshot; ASSERT(tn < HPET_TIMER_NUM); - ASSERT(spin_is_locked(&h->lock)); + ASSERT(rw_is_write_locked(&h->lock)); if ( (tn == 0) && (h->hpet.config & HPET_CFG_LEGACY) ) { @@ -304,7 +314,7 @@ static int hpet_write( if ( hpet_check_access_length(addr, length) != 0 ) goto out; - spin_lock(&h->lock); + write_lock(&h->lock); guest_time = guest_time_hpet(h); old_val = hpet_read64(h, addr, guest_time); @@ -473,7 +483,7 @@ static int hpet_write( #undef set_start_timer #undef set_restart_timer - spin_unlock(&h->lock); + write_unlock(&h->lock); out: return X86EMUL_OKAY; @@ -499,7 +509,7 @@ static int hpet_save(struct domain *d, hvm_domain_context_t *h) int rc; uint64_t guest_time; - spin_lock(&hp->lock); + write_lock(&hp->lock); guest_time = guest_time_hpet(hp); /* Write the proper value into the main counter */ @@ -545,7 +555,7 @@ static int hpet_save(struct domain *d, hvm_domain_context_t *h) rec->timers[2].cmp = hp->hpet.comparator64[2]; } - spin_unlock(&hp->lock); + write_unlock(&hp->lock); return rc; } @@ -558,12 +568,12 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) uint64_t guest_time; int i; - spin_lock(&hp->lock); + write_lock(&hp->lock); /* Reload the HPET registers */ if ( _hvm_check_entry(h, HVM_SAVE_CODE(HPET), HVM_SAVE_LENGTH(HPET), 1) ) { - spin_unlock(&hp->lock); + write_unlock(&hp->lock); return -EINVAL; } @@ -604,7 +614,7 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) if ( timer_enabled(hp, i) ) hpet_set_timer(hp, i, guest_time); - spin_unlock(&hp->lock); + write_unlock(&hp->lock); return 0; } @@ -618,7 +628,7 @@ void hpet_init(struct domain *d) memset(h, 0, sizeof(HPETState)); - spin_lock_init(&h->lock); + rwlock_init(&h->lock); h->stime_freq = S_TO_NS; @@ -648,7 +658,7 @@ void hpet_deinit(struct domain *d) int i; HPETState *h = domain_vhpet(d); - spin_lock(&h->lock); + write_lock(&h->lock); if ( hpet_enabled(h) ) { @@ -659,7 +669,7 @@ void hpet_deinit(struct domain *d) hpet_stop_timer(h, i, guest_time); } - spin_unlock(&h->lock); + write_unlock(&h->lock); } void hpet_reset(struct domain *d) diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 38541cf..7c6549c 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -512,10 +512,10 @@ void pt_adjust_global_vcpu_target(struct vcpu *v) pt_adjust_vcpu(&pl_time->vrtc.pt, v); spin_unlock(&pl_time->vrtc.lock); - spin_lock(&pl_time->vhpet.lock); + write_lock(&pl_time->vhpet.lock); for ( i = 0; i < HPET_TIMER_NUM; i++ ) pt_adjust_vcpu(&pl_time->vhpet.pt[i], v); - spin_unlock(&pl_time->vhpet.lock); + write_unlock(&pl_time->vhpet.lock); } diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 105fbdb..8b8b65a 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -96,7 +96,7 @@ typedef struct HPETState { uint64_t hpet_to_ns_limit; /* max hpet ticks convertable to ns */ uint64_t mc_offset; struct periodic_time pt[HPET_TIMER_NUM]; - spinlock_t lock; + rwlock_t lock; } HPETState; typedef struct RTCState { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHN3-0001me-VI; Tue, 12 Aug 2014 19:04:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHN2-0001mR-HZ for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:32 +0000 Received: from [85.158.137.68:19141] by server-7.bemta-3.messagelabs.com id D8/D2-01084-F356AE35; Tue, 12 Aug 2014 19:04:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1407870268!9559511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10228 invoked from network); 12 Aug 2014 19:04:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHMy-00007d-Bf for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHMy-0003Pl-85 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:28 +0000 Date: Tue, 12 Aug 2014 19:04:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vHPET: use rwlock instead of simple one X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ded2100990d1688b96c2edc7221887c56c1a8e04 Author: Jan Beulich AuthorDate: Mon Aug 11 15:00:15 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:00:15 2014 +0200 x86/vHPET: use rwlock instead of simple one This namely benefits guests heavily reading the main counter, but not touching the HPET much otherwise. Note that due to the way hpet_get_comparator() works hpet_read() has to special cases reads from the comparator registers and use a write lock there instead of the read one used for all other registers. Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/hpet.c | 42 +++++++++++++++++++++++++--------------- xen/arch/x86/hvm/vpt.c | 4 +- xen/include/asm-x86/hvm/vpt.h | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 81ad0d6..bdfc6fc 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -77,7 +77,7 @@ static inline uint64_t hpet_read_maincounter(HPETState *h, uint64_t guest_time) { - ASSERT(spin_is_locked(&h->lock)); + ASSERT(rw_is_locked(&h->lock)); if ( hpet_enabled(h) ) return guest_time + h->mc_offset; @@ -91,6 +91,8 @@ static uint64_t hpet_get_comparator(HPETState *h, unsigned int tn, uint64_t comparator; uint64_t elapsed; + ASSERT(rw_is_write_locked(&h->lock)); + comparator = h->hpet.comparator64[tn]; if ( hpet_enabled(h) && timer_is_periodic(h, tn) ) { @@ -179,16 +181,24 @@ static int hpet_read( goto out; } - spin_lock(&h->lock); + result = addr < HPET_Tn_CMP(0) || + ((addr - HPET_Tn_CMP(0)) % (HPET_Tn_CMP(1) - HPET_Tn_CMP(0))) > 7; + if ( result ) + read_lock(&h->lock); + else + write_lock(&h->lock); val = hpet_read64(h, addr, guest_time_hpet(h)); + if ( result ) + read_unlock(&h->lock); + else + write_unlock(&h->lock); + result = val; if ( length != 8 ) result = (val >> ((addr & 7) * 8)) & ((1ULL << (length * 8)) - 1); - spin_unlock(&h->lock); - out: *pval = result; return X86EMUL_OKAY; @@ -198,7 +208,7 @@ static void hpet_stop_timer(HPETState *h, unsigned int tn, uint64_t guest_time) { ASSERT(tn < HPET_TIMER_NUM); - ASSERT(spin_is_locked(&h->lock)); + ASSERT(rw_is_write_locked(&h->lock)); TRACE_1D(TRC_HVM_EMUL_HPET_STOP_TIMER, tn); destroy_periodic_time(&h->pt[tn]); /* read the comparator to get it updated so a read while stopped will @@ -218,7 +228,7 @@ static void hpet_set_timer(HPETState *h, unsigned int tn, unsigned int oneshot; ASSERT(tn < HPET_TIMER_NUM); - ASSERT(spin_is_locked(&h->lock)); + ASSERT(rw_is_write_locked(&h->lock)); if ( (tn == 0) && (h->hpet.config & HPET_CFG_LEGACY) ) { @@ -304,7 +314,7 @@ static int hpet_write( if ( hpet_check_access_length(addr, length) != 0 ) goto out; - spin_lock(&h->lock); + write_lock(&h->lock); guest_time = guest_time_hpet(h); old_val = hpet_read64(h, addr, guest_time); @@ -473,7 +483,7 @@ static int hpet_write( #undef set_start_timer #undef set_restart_timer - spin_unlock(&h->lock); + write_unlock(&h->lock); out: return X86EMUL_OKAY; @@ -499,7 +509,7 @@ static int hpet_save(struct domain *d, hvm_domain_context_t *h) int rc; uint64_t guest_time; - spin_lock(&hp->lock); + write_lock(&hp->lock); guest_time = guest_time_hpet(hp); /* Write the proper value into the main counter */ @@ -545,7 +555,7 @@ static int hpet_save(struct domain *d, hvm_domain_context_t *h) rec->timers[2].cmp = hp->hpet.comparator64[2]; } - spin_unlock(&hp->lock); + write_unlock(&hp->lock); return rc; } @@ -558,12 +568,12 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) uint64_t guest_time; int i; - spin_lock(&hp->lock); + write_lock(&hp->lock); /* Reload the HPET registers */ if ( _hvm_check_entry(h, HVM_SAVE_CODE(HPET), HVM_SAVE_LENGTH(HPET), 1) ) { - spin_unlock(&hp->lock); + write_unlock(&hp->lock); return -EINVAL; } @@ -604,7 +614,7 @@ static int hpet_load(struct domain *d, hvm_domain_context_t *h) if ( timer_enabled(hp, i) ) hpet_set_timer(hp, i, guest_time); - spin_unlock(&hp->lock); + write_unlock(&hp->lock); return 0; } @@ -618,7 +628,7 @@ void hpet_init(struct domain *d) memset(h, 0, sizeof(HPETState)); - spin_lock_init(&h->lock); + rwlock_init(&h->lock); h->stime_freq = S_TO_NS; @@ -648,7 +658,7 @@ void hpet_deinit(struct domain *d) int i; HPETState *h = domain_vhpet(d); - spin_lock(&h->lock); + write_lock(&h->lock); if ( hpet_enabled(h) ) { @@ -659,7 +669,7 @@ void hpet_deinit(struct domain *d) hpet_stop_timer(h, i, guest_time); } - spin_unlock(&h->lock); + write_unlock(&h->lock); } void hpet_reset(struct domain *d) diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 38541cf..7c6549c 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -512,10 +512,10 @@ void pt_adjust_global_vcpu_target(struct vcpu *v) pt_adjust_vcpu(&pl_time->vrtc.pt, v); spin_unlock(&pl_time->vrtc.lock); - spin_lock(&pl_time->vhpet.lock); + write_lock(&pl_time->vhpet.lock); for ( i = 0; i < HPET_TIMER_NUM; i++ ) pt_adjust_vcpu(&pl_time->vhpet.pt[i], v); - spin_unlock(&pl_time->vhpet.lock); + write_unlock(&pl_time->vhpet.lock); } diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h index 105fbdb..8b8b65a 100644 --- a/xen/include/asm-x86/hvm/vpt.h +++ b/xen/include/asm-x86/hvm/vpt.h @@ -96,7 +96,7 @@ typedef struct HPETState { uint64_t hpet_to_ns_limit; /* max hpet ticks convertable to ns */ uint64_t mc_offset; struct periodic_time pt[HPET_TIMER_NUM]; - spinlock_t lock; + rwlock_t lock; } HPETState; typedef struct RTCState { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNE-0001o1-1t; Tue, 12 Aug 2014 19:04:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNC-0001nm-2J for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:42 +0000 Received: from [85.158.143.35:2444] by server-3.bemta-4.messagelabs.com id 7D/F8-06192-9456AE35; Tue, 12 Aug 2014 19:04:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1407870278!12569369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18855 invoked from network); 12 Aug 2014 19:04:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHN8-00007j-Gs for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHN8-0003QB-FG for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:38 +0000 Date: Tue, 12 Aug 2014 19:04:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make struct e820map's nr_map unsigned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca063d4480e618834f142817032a1434077554f5 Author: Tiejun Chen AuthorDate: Mon Aug 11 15:10:07 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:10:07 2014 +0200 x86: make struct e820map's nr_map unsigned nr_map is used to represent the amount of e820entry in e820 so this is never negative. Signed-off-by: Tiejun Chen --- xen/include/asm-x86/e820.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 08b413d..71a804c 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -19,7 +19,7 @@ struct __packed e820entry { #define E820MAX 128 struct e820map { - int nr_map; + unsigned int nr_map; struct e820entry map[E820MAX]; }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNE-0001o1-1t; Tue, 12 Aug 2014 19:04:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNC-0001nm-2J for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:42 +0000 Received: from [85.158.143.35:2444] by server-3.bemta-4.messagelabs.com id 7D/F8-06192-9456AE35; Tue, 12 Aug 2014 19:04:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1407870278!12569369!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18855 invoked from network); 12 Aug 2014 19:04:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHN8-00007j-Gs for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHN8-0003QB-FG for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:38 +0000 Date: Tue, 12 Aug 2014 19:04:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make struct e820map's nr_map unsigned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca063d4480e618834f142817032a1434077554f5 Author: Tiejun Chen AuthorDate: Mon Aug 11 15:10:07 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:10:07 2014 +0200 x86: make struct e820map's nr_map unsigned nr_map is used to represent the amount of e820entry in e820 so this is never negative. Signed-off-by: Tiejun Chen --- xen/include/asm-x86/e820.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 08b413d..71a804c 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -19,7 +19,7 @@ struct __packed e820entry { #define E820MAX 128 struct e820map { - int nr_map; + unsigned int nr_map; struct e820entry map[E820MAX]; }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNN-0001pe-4a; Tue, 12 Aug 2014 19:04:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNL-0001pE-9m for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:51 +0000 Received: from [193.109.254.147:43573] by server-11.bemta-14.messagelabs.com id 19/0D-14213-2556AE35; Tue, 12 Aug 2014 19:04:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1407870288!12106014!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1023 invoked from network); 12 Aug 2014 19:04:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNI-00007p-Mx for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHNI-0003QZ-LG for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:48 +0000 Date: Tue, 12 Aug 2014 19:04:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domain_update_node_affinity: bail out early if no VCPUs are allocated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34155c34aec89ea0dec94c44d714c9085beb6135 Author: Julien Grall AuthorDate: Mon Aug 11 15:11:43 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:11:43 2014 +0200 domain_update_node_affinity: bail out early if no VCPUs are allocated The commit "move domain to cpupool0 before destroying it" make Xen crashes when a domain is destroyed with d->vcpus allocated but no VCPU initialized. Assertion '!cpumask_empty(dom_cpumask)' failed at domain.c:452 Xen call trace: [<00207bd8>] domain_update_node_affinity+0x10c/0x238 (PC) [<00000004>] 00000004 (LR) [<00226870>] sched_move_domain+0x3cc/0x42c [<0020925c>] domain_kill+0xc8/0x178 [<00206a0c>] do_domctl+0xaac/0x15e4 [<002529c0>] do_trap_hypervisor+0xc5c/0xf94 [<002559f0>] return_from_trap+0/0x4 Bail out early if there is d->VCPU is not allocated or VCPU 0 has not been initialized. Signed-off-by: Julien Grall --- xen/common/domain.c | 4 ++++ xen/common/schedule.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d7a84cf..1952070 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -415,6 +415,10 @@ void domain_update_node_affinity(struct domain *d) struct vcpu *v; unsigned int cpu; + /* Do we have vcpus already? If not, no need to update node-affinity. */ + if ( !d->vcpu || !d->vcpu[0] ) + return; + if ( !zalloc_cpumask_var(&dom_cpumask) ) return; if ( !zalloc_cpumask_var(&dom_cpumask_soft) ) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 9a49769..55503e0 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -310,9 +310,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) SCHED_OP(old_ops, free_vdata, vcpudata); } - /* Do we have vcpus already? If not, no need to update node-affinity */ - if ( d->vcpu ) - domain_update_node_affinity(d); + domain_update_node_affinity(d); domain_unpause(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:04:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:04:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNN-0001pe-4a; Tue, 12 Aug 2014 19:04:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNL-0001pE-9m for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:51 +0000 Received: from [193.109.254.147:43573] by server-11.bemta-14.messagelabs.com id 19/0D-14213-2556AE35; Tue, 12 Aug 2014 19:04:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1407870288!12106014!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1023 invoked from network); 12 Aug 2014 19:04:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:04:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNI-00007p-Mx for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHNI-0003QZ-LG for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:48 +0000 Date: Tue, 12 Aug 2014 19:04:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domain_update_node_affinity: bail out early if no VCPUs are allocated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34155c34aec89ea0dec94c44d714c9085beb6135 Author: Julien Grall AuthorDate: Mon Aug 11 15:11:43 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:11:43 2014 +0200 domain_update_node_affinity: bail out early if no VCPUs are allocated The commit "move domain to cpupool0 before destroying it" make Xen crashes when a domain is destroyed with d->vcpus allocated but no VCPU initialized. Assertion '!cpumask_empty(dom_cpumask)' failed at domain.c:452 Xen call trace: [<00207bd8>] domain_update_node_affinity+0x10c/0x238 (PC) [<00000004>] 00000004 (LR) [<00226870>] sched_move_domain+0x3cc/0x42c [<0020925c>] domain_kill+0xc8/0x178 [<00206a0c>] do_domctl+0xaac/0x15e4 [<002529c0>] do_trap_hypervisor+0xc5c/0xf94 [<002559f0>] return_from_trap+0/0x4 Bail out early if there is d->VCPU is not allocated or VCPU 0 has not been initialized. Signed-off-by: Julien Grall --- xen/common/domain.c | 4 ++++ xen/common/schedule.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d7a84cf..1952070 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -415,6 +415,10 @@ void domain_update_node_affinity(struct domain *d) struct vcpu *v; unsigned int cpu; + /* Do we have vcpus already? If not, no need to update node-affinity. */ + if ( !d->vcpu || !d->vcpu[0] ) + return; + if ( !zalloc_cpumask_var(&dom_cpumask) ) return; if ( !zalloc_cpumask_var(&dom_cpumask_soft) ) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 9a49769..55503e0 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -310,9 +310,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) SCHED_OP(old_ops, free_vdata, vcpudata); } - /* Do we have vcpus already? If not, no need to update node-affinity */ - if ( d->vcpu ) - domain_update_node_affinity(d); + domain_update_node_affinity(d); domain_unpause(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:05:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:05:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNX-0001rB-8j; Tue, 12 Aug 2014 19:05:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNW-0001qy-Jq for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:02 +0000 Received: from [85.158.137.68:49594] by server-12.bemta-3.messagelabs.com id 3B/3F-02460-C556AE35; Tue, 12 Aug 2014 19:05:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1407870299!13225582!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 910 invoked from network); 12 Aug 2014 19:05:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:05:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNS-00007y-Tb for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHNS-0003RA-Rg for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:58 +0000 Date: Tue, 12 Aug 2014 19:04:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hap: initialise HAP logdirty function pointers once in hap_domain_init() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc36a12f90c290a09ca515c20dafff6c4436d340 Author: Andrew Cooper AuthorDate: Mon Aug 11 15:12:20 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:12:20 2014 +0200 x86/hap: initialise HAP logdirty function pointers once in hap_domain_init() rather than repeatedly initialising them each time logdirty is enabled or the vram tracking area changes. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 15 +++++---------- xen/arch/x86/mm/paging.c | 2 -- xen/include/asm-x86/hap.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 21f57c1..abf3d7a 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -81,7 +81,6 @@ int hap_track_dirty_vram(struct domain *d, if ( !paging_mode_log_dirty(d) ) { - hap_logdirty_init(d); rc = paging_log_dirty_enable(d, 0); if ( rc ) goto out; @@ -219,15 +218,6 @@ static void hap_clean_dirty_bitmap(struct domain *d) flush_tlb_mask(d->domain_dirty_cpumask); } -void hap_logdirty_init(struct domain *d) -{ - - /* Reinitialize logdirty mechanism */ - paging_log_dirty_init(d, hap_enable_log_dirty, - hap_disable_log_dirty, - hap_clean_dirty_bitmap); -} - /************************************************/ /* HAP SUPPORT FUNCTIONS */ /************************************************/ @@ -438,6 +428,11 @@ static void hap_destroy_monitor_table(struct vcpu* v, mfn_t mmfn) void hap_domain_init(struct domain *d) { INIT_PAGE_LIST_HEAD(&d->arch.paging.hap.freelist); + + /* Use HAP logdirty mechanism. */ + paging_log_dirty_init(d, hap_enable_log_dirty, + hap_disable_log_dirty, + hap_clean_dirty_bitmap); } /* return 0 for success, -errno for failure */ diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 32764ba..455000d 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -594,8 +594,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, break; /* Else fall through... */ case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY: - if ( hap_enabled(d) ) - hap_logdirty_init(d); return paging_log_dirty_enable(d, 1); case XEN_DOMCTL_SHADOW_OP_OFF: diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 5161927..7876527 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -56,7 +56,6 @@ int hap_enable(struct domain *d, u32 mode); void hap_final_teardown(struct domain *d); void hap_teardown(struct domain *d); void hap_vcpu_init(struct vcpu *v); -void hap_logdirty_init(struct domain *d); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:05:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:05:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNX-0001rB-8j; Tue, 12 Aug 2014 19:05:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNW-0001qy-Jq for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:02 +0000 Received: from [85.158.137.68:49594] by server-12.bemta-3.messagelabs.com id 3B/3F-02460-C556AE35; Tue, 12 Aug 2014 19:05:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1407870299!13225582!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 910 invoked from network); 12 Aug 2014 19:05:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:05:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNS-00007y-Tb for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHNS-0003RA-Rg for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:04:58 +0000 Date: Tue, 12 Aug 2014 19:04:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hap: initialise HAP logdirty function pointers once in hap_domain_init() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc36a12f90c290a09ca515c20dafff6c4436d340 Author: Andrew Cooper AuthorDate: Mon Aug 11 15:12:20 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:12:20 2014 +0200 x86/hap: initialise HAP logdirty function pointers once in hap_domain_init() rather than repeatedly initialising them each time logdirty is enabled or the vram tracking area changes. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 15 +++++---------- xen/arch/x86/mm/paging.c | 2 -- xen/include/asm-x86/hap.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 21f57c1..abf3d7a 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -81,7 +81,6 @@ int hap_track_dirty_vram(struct domain *d, if ( !paging_mode_log_dirty(d) ) { - hap_logdirty_init(d); rc = paging_log_dirty_enable(d, 0); if ( rc ) goto out; @@ -219,15 +218,6 @@ static void hap_clean_dirty_bitmap(struct domain *d) flush_tlb_mask(d->domain_dirty_cpumask); } -void hap_logdirty_init(struct domain *d) -{ - - /* Reinitialize logdirty mechanism */ - paging_log_dirty_init(d, hap_enable_log_dirty, - hap_disable_log_dirty, - hap_clean_dirty_bitmap); -} - /************************************************/ /* HAP SUPPORT FUNCTIONS */ /************************************************/ @@ -438,6 +428,11 @@ static void hap_destroy_monitor_table(struct vcpu* v, mfn_t mmfn) void hap_domain_init(struct domain *d) { INIT_PAGE_LIST_HEAD(&d->arch.paging.hap.freelist); + + /* Use HAP logdirty mechanism. */ + paging_log_dirty_init(d, hap_enable_log_dirty, + hap_disable_log_dirty, + hap_clean_dirty_bitmap); } /* return 0 for success, -errno for failure */ diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 32764ba..455000d 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -594,8 +594,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, break; /* Else fall through... */ case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY: - if ( hap_enabled(d) ) - hap_logdirty_init(d); return paging_log_dirty_enable(d, 1); case XEN_DOMCTL_SHADOW_OP_OFF: diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 5161927..7876527 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -56,7 +56,6 @@ int hap_enable(struct domain *d, u32 mode); void hap_final_teardown(struct domain *d); void hap_teardown(struct domain *d); void hap_vcpu_init(struct vcpu *v); -void hap_logdirty_init(struct domain *d); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:05:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:05:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNl-0001tP-NX; Tue, 12 Aug 2014 19:05:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNk-0001tC-MP for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:16 +0000 Received: from [85.158.143.35:23304] by server-1.bemta-4.messagelabs.com id 66/42-05872-B656AE35; Tue, 12 Aug 2014 19:05:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1407870314!12610524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 499 invoked from network); 12 Aug 2014 19:05:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:05:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNd-00008U-44 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHNd-0003Rs-16 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:09 +0000 Date: Tue, 12 Aug 2014 19:05:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: Add newline to the end of graphics mode error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f093fcf90f420b18429dcbc6c91f9393171634ce Author: Daniel Kiper AuthorDate: Mon Aug 11 15:13:04 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:13:04 2014 +0200 x86/EFI: Add newline to the end of graphics mode error message Error message related to graphics mode does not have new line. So, let's fix it. Signed-off-by: Daniel Kiper --- xen/arch/x86/efi/boot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 2b515f2..3bdc158 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1360,7 +1360,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) break; /* fall through */ default: - PrintErr(L"Current graphics mode is unsupported!"); + PrintErr(L"Current graphics mode is unsupported!\r\n"); status = EFI_UNSUPPORTED; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 12 19:05:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Aug 2014 19:05:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNl-0001tP-NX; Tue, 12 Aug 2014 19:05:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNk-0001tC-MP for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:16 +0000 Received: from [85.158.143.35:23304] by server-1.bemta-4.messagelabs.com id 66/42-05872-B656AE35; Tue, 12 Aug 2014 19:05:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1407870314!12610524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 499 invoked from network); 12 Aug 2014 19:05:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Aug 2014 19:05:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XHHNd-00008U-44 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XHHNd-0003Rs-16 for xen-changelog@lists.xensource.com; Tue, 12 Aug 2014 19:05:09 +0000 Date: Tue, 12 Aug 2014 19:05:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: Add newline to the end of graphics mode error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f093fcf90f420b18429dcbc6c91f9393171634ce Author: Daniel Kiper AuthorDate: Mon Aug 11 15:13:04 2014 +0200 Commit: Jan Beulich CommitDate: Mon Aug 11 15:13:04 2014 +0200 x86/EFI: Add newline to the end of graphics mode error message Error message related to graphics mode does not have new line. So, let's fix it. Signed-off-by: Daniel Kiper --- xen/arch/x86/efi/boot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 2b515f2..3bdc158 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1360,7 +1360,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) break; /* fall through */ default: - PrintErr(L"Current graphics mode is unsupported!"); + PrintErr(L"Current graphics mode is unsupported!\r\n"); status = EFI_UNSUPPORTED; break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX1-0005ye-3y; Thu, 21 Aug 2014 02:55:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIWz-0005yY-BB for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:17 +0000 Received: from [193.109.254.147:43033] by server-9.bemta-14.messagelabs.com id 6D/57-31535-49F55F35; Thu, 21 Aug 2014 02:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1408589714!12126346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19400 invoked from network); 21 Aug 2014 02:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIWq-0005uL-P9 for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIWl-000648-Da for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:03 +0000 Date: Thu, 21 Aug 2014 02:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mm/hap: Adjust vram tracking to play nicely with log-dirty. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bba8f285cf5f4248c9057e69aaafee2ec4dd5392 Author: Robert Phillips AuthorDate: Tue Aug 12 16:08:10 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:08:10 2014 +0200 x86/mm/hap: Adjust vram tracking to play nicely with log-dirty. The previous code assumed the guest would be in one of three mutually exclusive modes for bookkeeping dirty pages: (1) shadow, (2) hap utilizing the log dirty bitmap to support functionality such as live migrate, (3) hap utilizing the log dirty bitmap to track dirty vram pages. Races arose when a guest attempted to track dirty vram while performing live migrate. (The dispatch table managed by paging_log_dirty_init() might change in the middle of a log dirty or a vram tracking function.) This change allows hap log dirty and hap vram tracking to be concurrent. Vram tracking no longer uses the log dirty bitmap. Instead it detects dirty vram pages by examining their p2m type. The log dirty bitmap is only used by the log dirty code. Because the two operations use different mechanisms, they are no longer mutually exclusive. Signed-Off-By: Robert Phillips Acked-by: Tim Deegan Minor whitespace changes to conform with coding style Signed-off-by: Tim Deegan master commit: fd91a2a662bc59677e0f217423a7a155d5465886 master date: 2012-12-13 12:10:14 +0000 --- xen/arch/x86/mm/hap/hap.c | 185 ++++++++++++++++++------------------------ xen/arch/x86/mm/paging.c | 167 ++++++-------------------------------- xen/include/asm-x86/config.h | 1 + xen/include/asm-x86/paging.h | 8 +- 4 files changed, 107 insertions(+), 254 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index a9eb35d..c198323 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -56,132 +56,110 @@ /* HAP VRAM TRACKING SUPPORT */ /************************************************/ -static int hap_enable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - /* turn on PG_log_dirty bit in paging mode */ - paging_lock(d); - d->arch.paging.mode |= PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static int hap_disable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - paging_lock(d); - d->arch.paging.mode &= ~PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table with normal mode */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_logdirty, p2m_ram_rw); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static void hap_clean_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return; - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); -} - -static void hap_vram_tracking_init(struct domain *d) -{ - paging_log_dirty_init(d, hap_enable_vram_tracking, - hap_disable_vram_tracking, - hap_clean_vram_tracking); -} +/* + * hap_track_dirty_vram() + * Create the domain's dv_dirty_vram struct on demand. + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is + * first encountered. + * Collect the guest_dirty bitmask, a bit mask of the dirty vram pages, by + * calling paging_log_dirty_range(), which interrogates each vram + * page's p2m type looking for pages that have been made writable. + */ int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) { long rc = 0; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct sh_dirty_vram *dirty_vram; + uint8_t *dirty_bitmap = NULL; if ( nr ) { - if ( paging_mode_log_dirty(d) && dirty_vram ) + int size = (nr + BITS_PER_BYTE - 1) / BITS_PER_BYTE; + + if ( !paging_mode_log_dirty(d) ) { - if ( begin_pfn != dirty_vram->begin_pfn || - begin_pfn + nr != dirty_vram->end_pfn ) - { - paging_log_dirty_disable(d); - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } + hap_logdirty_init(d); + rc = paging_log_dirty_enable(d); + if ( rc ) + goto out; } - else if ( !paging_mode_log_dirty(d) && !dirty_vram ) + + rc = -ENOMEM; + dirty_bitmap = xzalloc_bytes(size); + if ( !dirty_bitmap ) + goto out; + + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( !dirty_vram ) { rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto param_fail; + if ( (dirty_vram = xzalloc(struct sh_dirty_vram)) == NULL ) + { + paging_unlock(d); + goto out; + } + d->arch.hvm_domain.dirty_vram = dirty_vram; + } + + if ( begin_pfn != dirty_vram->begin_pfn || + begin_pfn + nr != dirty_vram->end_pfn ) + { dirty_vram->begin_pfn = begin_pfn; dirty_vram->end_pfn = begin_pfn + nr; - d->arch.hvm_domain.dirty_vram = dirty_vram; - hap_vram_tracking_init(d); - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; + + paging_unlock(d); + + /* set l1e entries of range within P2M table to be read-only. */ + p2m_change_type_range(d, begin_pfn, begin_pfn + nr, + p2m_ram_rw, p2m_ram_logdirty); + + flush_tlb_mask(d->domain_dirty_cpumask); + + memset(dirty_bitmap, 0xff, size); /* consider all pages dirty */ } else { - if ( !paging_mode_log_dirty(d) && dirty_vram ) - rc = -EINVAL; - else - rc = -ENODATA; - goto param_fail; + paging_unlock(d); + + domain_pause(d); + + /* get the bitmap */ + paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + + domain_unpause(d); } - /* get the bitmap */ - rc = paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, dirty_bitmap, size) == 0 ) + rc = 0; } else { - if ( paging_mode_log_dirty(d) && dirty_vram ) { - rc = paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } else - rc = 0; - } + paging_lock(d); - return rc; + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( dirty_vram ) + { + /* + * If zero pages specified while tracking dirty vram + * then stop tracking + */ + xfree(dirty_vram); + d->arch.hvm_domain.dirty_vram = NULL; + } -param_fail: - if ( dirty_vram ) - { - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; + paging_unlock(d); } +out: + if ( dirty_bitmap ) + xfree(dirty_bitmap); + return rc; } @@ -223,13 +201,6 @@ static void hap_clean_dirty_bitmap(struct domain *d) void hap_logdirty_init(struct domain *d) { - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - if ( paging_mode_log_dirty(d) && dirty_vram ) - { - paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } /* Reinitialize logdirty mechanism */ paging_log_dirty_init(d, hap_enable_log_dirty, diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index c93d30f..0fd1199 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -447,157 +447,38 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; } -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) { - int rv = 0; - unsigned long pages = 0; - mfn_t *l4, *l3, *l2; - unsigned long *l1; - int b1, b2, b3, b4; - int i2, i3, i4; - - d->arch.paging.log_dirty.clean_dirty_bitmap(d); - paging_lock(d); - - PAGING_DEBUG(LOGDIRTY, "log-dirty-range: dom %u faults=%u dirty=%u\n", - d->domain_id, - d->arch.paging.log_dirty.fault_count, - d->arch.paging.log_dirty.dirty_count); - - if ( unlikely(d->arch.paging.log_dirty.failed_allocs) ) { - printk("%s: %d failed page allocs while logging dirty pages\n", - __FUNCTION__, d->arch.paging.log_dirty.failed_allocs); - rv = -ENOMEM; - goto out; - } - - if ( !d->arch.paging.log_dirty.fault_count && - !d->arch.paging.log_dirty.dirty_count ) { - unsigned int size = BITS_TO_LONGS(nr); + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int i; + unsigned long pfn; - if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) - rv = -EFAULT; - goto out; - } - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; + /* + * Set l1e entries of P2M table to be read-only. + * + * On first write, it page faults, its entry is changed to read-write, + * and on retry the write succeeds. + * + * We populate dirty_bitmap by looking for entries that have been + * switched to read-write. + */ - b1 = L1_LOGDIRTY_IDX(begin_pfn); - b2 = L2_LOGDIRTY_IDX(begin_pfn); - b3 = L3_LOGDIRTY_IDX(begin_pfn); - b4 = L4_LOGDIRTY_IDX(begin_pfn); - l4 = paging_map_log_dirty_bitmap(d); + p2m_lock(p2m); - for ( i4 = b4; - (pages < nr) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( i = 0, pfn = begin_pfn; pfn < begin_pfn + nr; i++, pfn++ ) { - l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = b3; - (pages < nr) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) - { - l2 = ((l3 && mfn_valid(l3[i3])) ? - map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 = b2; - (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) - { - unsigned int bytes = PAGE_SIZE; - uint8_t *s; - l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : NULL); - - s = ((uint8_t*)l1) + (b1 >> 3); - bytes -= b1 >> 3; - - if ( likely(((nr - pages + 7) >> 3) < bytes) ) - bytes = (unsigned int)((nr - pages + 7) >> 3); - - if ( !l1 ) - { - if ( clear_guest_offset(dirty_bitmap, pages >> 3, - bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - /* begin_pfn is not 32K aligned, hence we have to bit - * shift the bitmap */ - else if ( b1 & 0x7 ) - { - int i, j; - uint32_t *l = (uint32_t*) s; - int bits = b1 & 0x7; - int bitmask = (1 << bits) - 1; - int size = (bytes + BYTES_PER_LONG - 1) / BYTES_PER_LONG; - unsigned long bitmap[size]; - static unsigned long printed = 0; - - if ( printed != begin_pfn ) - { - dprintk(XENLOG_DEBUG, "%s: begin_pfn %lx is not 32K aligned!\n", - __FUNCTION__, begin_pfn); - printed = begin_pfn; - } - - for ( i = 0; i < size - 1; i++, l++ ) { - bitmap[i] = ((*l) >> bits) | - (((*((uint8_t*)(l + 1))) & bitmask) << (sizeof(*l) * 8 - bits)); - } - s = (uint8_t*) l; - size = BYTES_PER_LONG - ((b1 >> 3) & 0x3); - bitmap[i] = 0; - for ( j = 0; j < size; j++, s++ ) - bitmap[i] |= (*s) << (j * 8); - bitmap[i] = (bitmap[i] >> bits) | (bitmask << (size * 8 - bits)); - if ( copy_to_guest_offset(dirty_bitmap, (pages >> 3), - (uint8_t*) bitmap, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - else - { - if ( copy_to_guest_offset(dirty_bitmap, pages >> 3, - s, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - - pages += bytes << 3; - if ( l1 ) - { - clear_page(l1); - unmap_domain_page(l1); - } - b1 = b1 & 0x7; - } - b2 = 0; - if ( l2 ) - unmap_domain_page(l2); - } - b3 = 0; - if ( l3 ) - unmap_domain_page(l3); + p2m_type_t pt; + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); + if ( pt == p2m_ram_rw ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); } - if ( l4 ) - unmap_domain_page(l4); - paging_unlock(d); + p2m_unlock(p2m); - return rv; - - out: - paging_unlock(d); - return rv; + flush_tlb_mask(d->domain_dirty_cpumask); } /* Note that this function takes three function pointers. Callers must supply diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 7bb5f7d..68a8add 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -17,6 +17,7 @@ #define BYTES_PER_LONG (1 << LONG_BYTEORDER) #define BITS_PER_LONG (BYTES_PER_LONG << 3) +#define BITS_PER_BYTE 8 #define CONFIG_X86 1 #define CONFIG_X86_HT 1 diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 7ec438a..1e77e78 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -145,10 +145,10 @@ struct paging_mode { void paging_free_log_dirty_bitmap(struct domain *d); /* get the dirty bitmap for a specific range of pfns */ -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX1-0005ye-3y; Thu, 21 Aug 2014 02:55:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIWz-0005yY-BB for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:17 +0000 Received: from [193.109.254.147:43033] by server-9.bemta-14.messagelabs.com id 6D/57-31535-49F55F35; Thu, 21 Aug 2014 02:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1408589714!12126346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19400 invoked from network); 21 Aug 2014 02:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIWq-0005uL-P9 for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIWl-000648-Da for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:03 +0000 Date: Thu, 21 Aug 2014 02:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mm/hap: Adjust vram tracking to play nicely with log-dirty. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bba8f285cf5f4248c9057e69aaafee2ec4dd5392 Author: Robert Phillips AuthorDate: Tue Aug 12 16:08:10 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:08:10 2014 +0200 x86/mm/hap: Adjust vram tracking to play nicely with log-dirty. The previous code assumed the guest would be in one of three mutually exclusive modes for bookkeeping dirty pages: (1) shadow, (2) hap utilizing the log dirty bitmap to support functionality such as live migrate, (3) hap utilizing the log dirty bitmap to track dirty vram pages. Races arose when a guest attempted to track dirty vram while performing live migrate. (The dispatch table managed by paging_log_dirty_init() might change in the middle of a log dirty or a vram tracking function.) This change allows hap log dirty and hap vram tracking to be concurrent. Vram tracking no longer uses the log dirty bitmap. Instead it detects dirty vram pages by examining their p2m type. The log dirty bitmap is only used by the log dirty code. Because the two operations use different mechanisms, they are no longer mutually exclusive. Signed-Off-By: Robert Phillips Acked-by: Tim Deegan Minor whitespace changes to conform with coding style Signed-off-by: Tim Deegan master commit: fd91a2a662bc59677e0f217423a7a155d5465886 master date: 2012-12-13 12:10:14 +0000 --- xen/arch/x86/mm/hap/hap.c | 185 ++++++++++++++++++------------------------ xen/arch/x86/mm/paging.c | 167 ++++++-------------------------------- xen/include/asm-x86/config.h | 1 + xen/include/asm-x86/paging.h | 8 +- 4 files changed, 107 insertions(+), 254 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index a9eb35d..c198323 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -56,132 +56,110 @@ /* HAP VRAM TRACKING SUPPORT */ /************************************************/ -static int hap_enable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - /* turn on PG_log_dirty bit in paging mode */ - paging_lock(d); - d->arch.paging.mode |= PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static int hap_disable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - paging_lock(d); - d->arch.paging.mode &= ~PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table with normal mode */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_logdirty, p2m_ram_rw); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static void hap_clean_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return; - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); -} - -static void hap_vram_tracking_init(struct domain *d) -{ - paging_log_dirty_init(d, hap_enable_vram_tracking, - hap_disable_vram_tracking, - hap_clean_vram_tracking); -} +/* + * hap_track_dirty_vram() + * Create the domain's dv_dirty_vram struct on demand. + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is + * first encountered. + * Collect the guest_dirty bitmask, a bit mask of the dirty vram pages, by + * calling paging_log_dirty_range(), which interrogates each vram + * page's p2m type looking for pages that have been made writable. + */ int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) { long rc = 0; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct sh_dirty_vram *dirty_vram; + uint8_t *dirty_bitmap = NULL; if ( nr ) { - if ( paging_mode_log_dirty(d) && dirty_vram ) + int size = (nr + BITS_PER_BYTE - 1) / BITS_PER_BYTE; + + if ( !paging_mode_log_dirty(d) ) { - if ( begin_pfn != dirty_vram->begin_pfn || - begin_pfn + nr != dirty_vram->end_pfn ) - { - paging_log_dirty_disable(d); - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } + hap_logdirty_init(d); + rc = paging_log_dirty_enable(d); + if ( rc ) + goto out; } - else if ( !paging_mode_log_dirty(d) && !dirty_vram ) + + rc = -ENOMEM; + dirty_bitmap = xzalloc_bytes(size); + if ( !dirty_bitmap ) + goto out; + + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( !dirty_vram ) { rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto param_fail; + if ( (dirty_vram = xzalloc(struct sh_dirty_vram)) == NULL ) + { + paging_unlock(d); + goto out; + } + d->arch.hvm_domain.dirty_vram = dirty_vram; + } + + if ( begin_pfn != dirty_vram->begin_pfn || + begin_pfn + nr != dirty_vram->end_pfn ) + { dirty_vram->begin_pfn = begin_pfn; dirty_vram->end_pfn = begin_pfn + nr; - d->arch.hvm_domain.dirty_vram = dirty_vram; - hap_vram_tracking_init(d); - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; + + paging_unlock(d); + + /* set l1e entries of range within P2M table to be read-only. */ + p2m_change_type_range(d, begin_pfn, begin_pfn + nr, + p2m_ram_rw, p2m_ram_logdirty); + + flush_tlb_mask(d->domain_dirty_cpumask); + + memset(dirty_bitmap, 0xff, size); /* consider all pages dirty */ } else { - if ( !paging_mode_log_dirty(d) && dirty_vram ) - rc = -EINVAL; - else - rc = -ENODATA; - goto param_fail; + paging_unlock(d); + + domain_pause(d); + + /* get the bitmap */ + paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + + domain_unpause(d); } - /* get the bitmap */ - rc = paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, dirty_bitmap, size) == 0 ) + rc = 0; } else { - if ( paging_mode_log_dirty(d) && dirty_vram ) { - rc = paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } else - rc = 0; - } + paging_lock(d); - return rc; + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( dirty_vram ) + { + /* + * If zero pages specified while tracking dirty vram + * then stop tracking + */ + xfree(dirty_vram); + d->arch.hvm_domain.dirty_vram = NULL; + } -param_fail: - if ( dirty_vram ) - { - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; + paging_unlock(d); } +out: + if ( dirty_bitmap ) + xfree(dirty_bitmap); + return rc; } @@ -223,13 +201,6 @@ static void hap_clean_dirty_bitmap(struct domain *d) void hap_logdirty_init(struct domain *d) { - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - if ( paging_mode_log_dirty(d) && dirty_vram ) - { - paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } /* Reinitialize logdirty mechanism */ paging_log_dirty_init(d, hap_enable_log_dirty, diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index c93d30f..0fd1199 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -447,157 +447,38 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; } -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) { - int rv = 0; - unsigned long pages = 0; - mfn_t *l4, *l3, *l2; - unsigned long *l1; - int b1, b2, b3, b4; - int i2, i3, i4; - - d->arch.paging.log_dirty.clean_dirty_bitmap(d); - paging_lock(d); - - PAGING_DEBUG(LOGDIRTY, "log-dirty-range: dom %u faults=%u dirty=%u\n", - d->domain_id, - d->arch.paging.log_dirty.fault_count, - d->arch.paging.log_dirty.dirty_count); - - if ( unlikely(d->arch.paging.log_dirty.failed_allocs) ) { - printk("%s: %d failed page allocs while logging dirty pages\n", - __FUNCTION__, d->arch.paging.log_dirty.failed_allocs); - rv = -ENOMEM; - goto out; - } - - if ( !d->arch.paging.log_dirty.fault_count && - !d->arch.paging.log_dirty.dirty_count ) { - unsigned int size = BITS_TO_LONGS(nr); + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int i; + unsigned long pfn; - if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) - rv = -EFAULT; - goto out; - } - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; + /* + * Set l1e entries of P2M table to be read-only. + * + * On first write, it page faults, its entry is changed to read-write, + * and on retry the write succeeds. + * + * We populate dirty_bitmap by looking for entries that have been + * switched to read-write. + */ - b1 = L1_LOGDIRTY_IDX(begin_pfn); - b2 = L2_LOGDIRTY_IDX(begin_pfn); - b3 = L3_LOGDIRTY_IDX(begin_pfn); - b4 = L4_LOGDIRTY_IDX(begin_pfn); - l4 = paging_map_log_dirty_bitmap(d); + p2m_lock(p2m); - for ( i4 = b4; - (pages < nr) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( i = 0, pfn = begin_pfn; pfn < begin_pfn + nr; i++, pfn++ ) { - l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = b3; - (pages < nr) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) - { - l2 = ((l3 && mfn_valid(l3[i3])) ? - map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 = b2; - (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) - { - unsigned int bytes = PAGE_SIZE; - uint8_t *s; - l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : NULL); - - s = ((uint8_t*)l1) + (b1 >> 3); - bytes -= b1 >> 3; - - if ( likely(((nr - pages + 7) >> 3) < bytes) ) - bytes = (unsigned int)((nr - pages + 7) >> 3); - - if ( !l1 ) - { - if ( clear_guest_offset(dirty_bitmap, pages >> 3, - bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - /* begin_pfn is not 32K aligned, hence we have to bit - * shift the bitmap */ - else if ( b1 & 0x7 ) - { - int i, j; - uint32_t *l = (uint32_t*) s; - int bits = b1 & 0x7; - int bitmask = (1 << bits) - 1; - int size = (bytes + BYTES_PER_LONG - 1) / BYTES_PER_LONG; - unsigned long bitmap[size]; - static unsigned long printed = 0; - - if ( printed != begin_pfn ) - { - dprintk(XENLOG_DEBUG, "%s: begin_pfn %lx is not 32K aligned!\n", - __FUNCTION__, begin_pfn); - printed = begin_pfn; - } - - for ( i = 0; i < size - 1; i++, l++ ) { - bitmap[i] = ((*l) >> bits) | - (((*((uint8_t*)(l + 1))) & bitmask) << (sizeof(*l) * 8 - bits)); - } - s = (uint8_t*) l; - size = BYTES_PER_LONG - ((b1 >> 3) & 0x3); - bitmap[i] = 0; - for ( j = 0; j < size; j++, s++ ) - bitmap[i] |= (*s) << (j * 8); - bitmap[i] = (bitmap[i] >> bits) | (bitmask << (size * 8 - bits)); - if ( copy_to_guest_offset(dirty_bitmap, (pages >> 3), - (uint8_t*) bitmap, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - else - { - if ( copy_to_guest_offset(dirty_bitmap, pages >> 3, - s, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - - pages += bytes << 3; - if ( l1 ) - { - clear_page(l1); - unmap_domain_page(l1); - } - b1 = b1 & 0x7; - } - b2 = 0; - if ( l2 ) - unmap_domain_page(l2); - } - b3 = 0; - if ( l3 ) - unmap_domain_page(l3); + p2m_type_t pt; + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); + if ( pt == p2m_ram_rw ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); } - if ( l4 ) - unmap_domain_page(l4); - paging_unlock(d); + p2m_unlock(p2m); - return rv; - - out: - paging_unlock(d); - return rv; + flush_tlb_mask(d->domain_dirty_cpumask); } /* Note that this function takes three function pointers. Callers must supply diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 7bb5f7d..68a8add 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -17,6 +17,7 @@ #define BYTES_PER_LONG (1 << LONG_BYTEORDER) #define BITS_PER_LONG (BYTES_PER_LONG << 3) +#define BITS_PER_BYTE 8 #define CONFIG_X86 1 #define CONFIG_X86_HT 1 diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 7ec438a..1e77e78 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -145,10 +145,10 @@ struct paging_mode { void paging_free_log_dirty_bitmap(struct domain *d); /* get the dirty bitmap for a specific range of pfns */ -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX6-0005zD-7u; Thu, 21 Aug 2014 02:55:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX4-0005yn-QF for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:23 +0000 Received: from [85.158.137.68:15632] by server-5.bemta-3.messagelabs.com id 49/F8-30889-A9F55F35; Thu, 21 Aug 2014 02:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1408589719!14760524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8909 invoked from network); 21 Aug 2014 02:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX1-0005uO-0o for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIX0-00064X-Tw for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:18 +0000 Date: Thu, 21 Aug 2014 02:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fbd99d7cc46a91566839e85bffb9bff406adbae Author: Jan Beulich AuthorDate: Tue Aug 12 16:09:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:09:12 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 95e6d82224689fdfd967a093a4d69efc24c17e91 master date: 2014-08-12 15:30:11 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 186 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8f11473..2799e86 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2136,7 +2136,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 48de4bf..e392cca 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -66,6 +66,9 @@ long arch_do_domctl( &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); rcu_unlock_domain(d); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copy_to_guest(u_domctl, domctl, 1); } } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index c198323..acdc192 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -678,8 +678,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 0fd1199..7a7fdf6 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; + } + domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -365,17 +445,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +488,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +543,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -498,12 +610,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -547,6 +653,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -569,6 +676,20 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(d, sc->op); if ( rc ) return rc; @@ -594,13 +715,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -611,18 +732,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0362c85..d5c5905 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3829,8 +3829,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 73842f9..45d90bf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -479,7 +479,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 6c62c25..bd170ed 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -193,6 +193,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 1e77e78..21daf04 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,9 +141,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -153,9 +150,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -218,7 +212,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX6-0005zD-7u; Thu, 21 Aug 2014 02:55:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX4-0005yn-QF for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:23 +0000 Received: from [85.158.137.68:15632] by server-5.bemta-3.messagelabs.com id 49/F8-30889-A9F55F35; Thu, 21 Aug 2014 02:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1408589719!14760524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8909 invoked from network); 21 Aug 2014 02:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIX1-0005uO-0o for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIX0-00064X-Tw for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:18 +0000 Date: Thu, 21 Aug 2014 02:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6fbd99d7cc46a91566839e85bffb9bff406adbae Author: Jan Beulich AuthorDate: Tue Aug 12 16:09:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:09:12 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 95e6d82224689fdfd967a093a4d69efc24c17e91 master date: 2014-08-12 15:30:11 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 186 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8f11473..2799e86 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2136,7 +2136,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 48de4bf..e392cca 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -66,6 +66,9 @@ long arch_do_domctl( &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); rcu_unlock_domain(d); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copy_to_guest(u_domctl, domctl, 1); } } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index c198323..acdc192 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -678,8 +678,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 0fd1199..7a7fdf6 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; + } + domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -365,17 +445,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +488,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +543,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -498,12 +610,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -547,6 +653,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -569,6 +676,20 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(d, sc->op); if ( rc ) return rc; @@ -594,13 +715,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -611,18 +732,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0362c85..d5c5905 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3829,8 +3829,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 73842f9..45d90bf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -479,7 +479,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 6c62c25..bd170ed 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -193,6 +193,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 1e77e78..21daf04 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,9 +141,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -153,9 +150,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -218,7 +212,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXF-00060s-D9; Thu, 21 Aug 2014 02:55:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXE-00060c-Hl for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:32 +0000 Received: from [85.158.139.211:2629] by server-14.bemta-5.messagelabs.com id 50/F7-12422-3AF55F35; Thu, 21 Aug 2014 02:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1408589729!7047971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22531 invoked from network); 21 Aug 2014 02:55:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXB-0005uZ-Av for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIXB-00064u-4k for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:29 +0000 Date: Thu, 21 Aug 2014 02:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35e7ae5f66f34bd93dff089587da3b3665622eff Author: Andrew Cooper AuthorDate: Tue Aug 12 16:10:01 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:10:01 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a1ac4cf52e38386bac7ac3440c7da0099662ca5c master date: 2014-07-29 17:02:25 +0200 --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 44542f4..22fa2a6 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -271,6 +271,9 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; @@ -278,8 +281,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - early_intel_workaround(c); - #ifdef CONFIG_X86_HT c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXF-00060s-D9; Thu, 21 Aug 2014 02:55:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXE-00060c-Hl for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:32 +0000 Received: from [85.158.139.211:2629] by server-14.bemta-5.messagelabs.com id 50/F7-12422-3AF55F35; Thu, 21 Aug 2014 02:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1408589729!7047971!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22531 invoked from network); 21 Aug 2014 02:55:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXB-0005uZ-Av for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIXB-00064u-4k for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:29 +0000 Date: Thu, 21 Aug 2014 02:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35e7ae5f66f34bd93dff089587da3b3665622eff Author: Andrew Cooper AuthorDate: Tue Aug 12 16:10:01 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:10:01 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a1ac4cf52e38386bac7ac3440c7da0099662ca5c master date: 2014-07-29 17:02:25 +0200 --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 44542f4..22fa2a6 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -271,6 +271,9 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; @@ -278,8 +281,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - early_intel_workaround(c); - #ifdef CONFIG_X86_HT c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXQ-00062a-G0; Thu, 21 Aug 2014 02:55:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXO-00062E-S1 for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:43 +0000 Received: from [85.158.143.35:22523] by server-1.bemta-4.messagelabs.com id D7/4F-05872-EAF55F35; Thu, 21 Aug 2014 02:55:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1408589739!12199928!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30119 invoked from network); 21 Aug 2014 02:55:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXL-0005uf-Jk for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIXL-00065k-FW for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:39 +0000 Date: Thu, 21 Aug 2014 02:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09a293a57fa38331dcb70904a0306282a98525e7 Author: Ian Jackson AuthorDate: Tue Aug 19 12:54:06 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:54:06 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit 6fbd99d7cc46a91566839e85bffb9bff406adbae. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 186 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2799e86..8f11473 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2136,9 +2136,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e392cca..48de4bf 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -66,9 +66,6 @@ long arch_do_domctl( &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); rcu_unlock_domain(d); - if ( ret == -EAGAIN ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copy_to_guest(u_domctl, domctl, 1); } } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index acdc192..c198323 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -678,7 +678,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 7a7fdf6..0fd1199 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -EAGAIN; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -EAGAIN; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d) @@ -233,25 +178,15 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -EAGAIN ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -391,9 +326,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -401,22 +334,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -445,15 +365,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -488,51 +410,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -EAGAIN; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -EAGAIN; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -EAGAIN); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -543,7 +432,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -610,6 +498,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -653,7 +547,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -676,20 +569,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current->domain->domain_id, current->vcpu_id, - sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(d, sc->op); if ( rc ) return rc; @@ -715,13 +594,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -732,24 +611,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -EAGAIN ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index d5c5905..0362c85 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3829,7 +3829,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 45d90bf..73842f9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -479,6 +479,7 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index bd170ed..6c62c25 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -193,20 +193,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 21daf04..1e77e78 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,6 +141,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -150,6 +153,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -212,7 +218,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Aug 21 02:55:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 Aug 2014 02:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXQ-00062a-G0; Thu, 21 Aug 2014 02:55:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXO-00062E-S1 for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:43 +0000 Received: from [85.158.143.35:22523] by server-1.bemta-4.messagelabs.com id D7/4F-05872-EAF55F35; Thu, 21 Aug 2014 02:55:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1408589739!12199928!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30119 invoked from network); 21 Aug 2014 02:55:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 21 Aug 2014 02:55:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKIXL-0005uf-Jk for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKIXL-00065k-FW for xen-changelog@lists.xensource.com; Thu, 21 Aug 2014 02:55:39 +0000 Date: Thu, 21 Aug 2014 02:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09a293a57fa38331dcb70904a0306282a98525e7 Author: Ian Jackson AuthorDate: Tue Aug 19 12:54:06 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:54:06 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit 6fbd99d7cc46a91566839e85bffb9bff406adbae. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 186 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2799e86..8f11473 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2136,9 +2136,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e392cca..48de4bf 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -66,9 +66,6 @@ long arch_do_domctl( &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); rcu_unlock_domain(d); - if ( ret == -EAGAIN ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copy_to_guest(u_domctl, domctl, 1); } } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index acdc192..c198323 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -678,7 +678,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 7a7fdf6..0fd1199 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -EAGAIN; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -EAGAIN; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d) @@ -233,25 +178,15 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -EAGAIN ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -391,9 +326,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -401,22 +334,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -445,15 +365,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -488,51 +410,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -EAGAIN; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -EAGAIN; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -EAGAIN); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -543,7 +432,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -610,6 +498,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -653,7 +547,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -676,20 +569,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current->domain->domain_id, current->vcpu_id, - sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(d, sc->op); if ( rc ) return rc; @@ -715,13 +594,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -732,24 +611,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -EAGAIN ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index d5c5905..0362c85 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3829,7 +3829,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 45d90bf..73842f9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -479,6 +479,7 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index bd170ed..6c62c25 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -193,20 +193,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 21daf04..1e77e78 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,6 +141,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -150,6 +153,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -212,7 +218,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsa-0000nh-GA; Fri, 22 Aug 2014 04:55:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsZ-0000nc-8W for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:11 +0000 Received: from [85.158.137.68:13331] by server-17.bemta-3.messagelabs.com id F2/BE-24995-E2DC6F35; Fri, 22 Aug 2014 04:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1408683308!15104550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22022 invoked from network); 22 Aug 2014 04:55:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsW-0005e2-EO for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgsT-0005I5-E2 for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:07 +0000 Date: Fri, 22 Aug 2014 04:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.3-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa072d419ff07be1da974a6cb9548057b221fc38 Author: Jan Beulich AuthorDate: Tue Aug 5 13:42:42 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 13:42:42 2014 +0200 update Xen version to 4.3.3-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 923a697..583ceef 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +QEMU_TAG ?= xen-4.3.3-rc2 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index dd2f757..ae41813 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 = 3 -export XEN_EXTRAVERSION ?= .3-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-rc2$(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.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsa-0000nh-GA; Fri, 22 Aug 2014 04:55:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsZ-0000nc-8W for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:11 +0000 Received: from [85.158.137.68:13331] by server-17.bemta-3.messagelabs.com id F2/BE-24995-E2DC6F35; Fri, 22 Aug 2014 04:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1408683308!15104550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22022 invoked from network); 22 Aug 2014 04:55:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsW-0005e2-EO for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgsT-0005I5-E2 for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:07 +0000 Date: Fri, 22 Aug 2014 04:55:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.3-rc2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aa072d419ff07be1da974a6cb9548057b221fc38 Author: Jan Beulich AuthorDate: Tue Aug 5 13:42:42 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 5 13:42:42 2014 +0200 update Xen version to 4.3.3-rc2 --- Config.mk | 2 +- xen/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 923a697..583ceef 100644 --- a/Config.mk +++ b/Config.mk @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 8a7abb1694f22cb18616ee7a7a544b026c914bf9 +QEMU_TAG ?= xen-4.3.3-rc2 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index dd2f757..ae41813 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 = 3 -export XEN_EXTRAVERSION ?= .3-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3-rc2$(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.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsl-0000oM-Ih; Fri, 22 Aug 2014 04:55:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsk-0000oD-CD for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:22 +0000 Received: from [85.158.139.211:15195] by server-12.bemta-5.messagelabs.com id E9/0C-22251-93DC6F35; Fri, 22 Aug 2014 04:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1408683319!11433334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 810 invoked from network); 22 Aug 2014 04:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsg-0005e5-Sh for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgsg-0005Ia-Ml for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:18 +0000 Date: Fri, 22 Aug 2014 04:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b497ecca359466294d169b07a62b98eef7dc0a36 Author: Jan Beulich AuthorDate: Tue Aug 12 16:03:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:03:12 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 95e6d82224689fdfd967a093a4d69efc24c17e91 master date: 2014-08-12 15:30:11 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 186 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ddf9c64..336cd79 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1867,7 +1867,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 67afe8e..060912e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,6 +61,9 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 66239b7..3817b71 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -565,8 +565,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 21344e5..f713901 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; + } + domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -365,17 +445,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +488,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +543,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -498,12 +610,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -547,6 +653,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -569,6 +676,20 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -594,13 +715,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -611,18 +732,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 72f5718..8f378d6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,8 +3706,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 6dbfaa5..9980d83 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -527,7 +527,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 1df8ea9..d6a4c89 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,6 +186,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index cd7ee3b..ed63987 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,9 +133,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -145,9 +142,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -206,7 +200,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsl-0000oM-Ih; Fri, 22 Aug 2014 04:55:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsk-0000oD-CD for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:22 +0000 Received: from [85.158.139.211:15195] by server-12.bemta-5.messagelabs.com id E9/0C-22251-93DC6F35; Fri, 22 Aug 2014 04:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1408683319!11433334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 810 invoked from network); 22 Aug 2014 04:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsg-0005e5-Sh for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgsg-0005Ia-Ml for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:18 +0000 Date: Fri, 22 Aug 2014 04:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b497ecca359466294d169b07a62b98eef7dc0a36 Author: Jan Beulich AuthorDate: Tue Aug 12 16:03:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:03:12 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 95e6d82224689fdfd967a093a4d69efc24c17e91 master date: 2014-08-12 15:30:11 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 186 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ddf9c64..336cd79 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1867,7 +1867,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 67afe8e..060912e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,6 +61,9 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 66239b7..3817b71 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -565,8 +565,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 21344e5..f713901 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; + } + domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -365,17 +445,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +488,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +543,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -498,12 +610,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -547,6 +653,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -569,6 +676,20 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -594,13 +715,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -611,18 +732,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 72f5718..8f378d6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,8 +3706,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 6dbfaa5..9980d83 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -527,7 +527,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 1df8ea9..d6a4c89 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,6 +186,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index cd7ee3b..ed63987 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,9 +133,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -145,9 +142,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -206,7 +200,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsu-0000pg-LV; Fri, 22 Aug 2014 04:55:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgst-0000pV-NZ for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:31 +0000 Received: from [85.158.143.35:27673] by server-3.bemta-4.messagelabs.com id 16/FC-06192-34DC6F35; Fri, 22 Aug 2014 04:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1408683329!12545892!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24547 invoked from network); 22 Aug 2014 04:55:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsr-0005eG-AI for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgsr-0005Ix-5O for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:29 +0000 Date: Fri, 22 Aug 2014 04:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e68c457e1916cb3f3c002acbc4958848a1a6ab5 Author: Andrew Cooper AuthorDate: Tue Aug 12 16:05:15 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:05:15 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a1ac4cf52e38386bac7ac3440c7da0099662ca5c master date: 2014-07-29 17:02:25 +0200 --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e1220e6..f449a8f 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -231,6 +231,9 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; @@ -238,8 +241,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - early_intel_workaround(c); - #ifdef CONFIG_X86_HT c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsu-0000pg-LV; Fri, 22 Aug 2014 04:55:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgst-0000pV-NZ for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:31 +0000 Received: from [85.158.143.35:27673] by server-3.bemta-4.messagelabs.com id 16/FC-06192-34DC6F35; Fri, 22 Aug 2014 04:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1408683329!12545892!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24547 invoked from network); 22 Aug 2014 04:55:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgsr-0005eG-AI for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgsr-0005Ix-5O for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:29 +0000 Date: Fri, 22 Aug 2014 04:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e68c457e1916cb3f3c002acbc4958848a1a6ab5 Author: Andrew Cooper AuthorDate: Tue Aug 12 16:05:15 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 16:05:15 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a1ac4cf52e38386bac7ac3440c7da0099662ca5c master date: 2014-07-29 17:02:25 +0200 --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e1220e6..f449a8f 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -231,6 +231,9 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; @@ -238,8 +241,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - early_intel_workaround(c); - #ifdef CONFIG_X86_HT c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgt5-0000rK-OK; Fri, 22 Aug 2014 04:55:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgt4-0000r8-Lk for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:42 +0000 Received: from [85.158.137.68:17981] by server-5.bemta-3.messagelabs.com id E6/3F-30889-D4DC6F35; Fri, 22 Aug 2014 04:55:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1408683339!15160721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21818 invoked from network); 22 Aug 2014 04:55:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgt1-0005eM-H0 for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgt1-0005JN-Et for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:39 +0000 Date: Fri, 22 Aug 2014 04:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffd7f8db506c77de5b6141c15f87cd7ce293bf41 Author: Ian Jackson AuthorDate: Tue Aug 19 12:52:25 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:52:25 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit b497ecca359466294d169b07a62b98eef7dc0a36. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 186 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 336cd79..ddf9c64 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1867,9 +1867,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 060912e..67afe8e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,9 +61,6 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); - if ( ret == -EAGAIN ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 3817b71..66239b7 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -565,7 +565,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index f713901..21344e5 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -EAGAIN; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -EAGAIN; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d) @@ -233,25 +178,15 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -EAGAIN ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -391,9 +326,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -401,22 +334,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -445,15 +365,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -488,51 +410,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -EAGAIN; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -EAGAIN; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -EAGAIN); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -543,7 +432,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -610,6 +498,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -653,7 +547,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -676,20 +569,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current->domain->domain_id, current->vcpu_id, - sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -715,13 +594,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -732,24 +611,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -EAGAIN ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 8f378d6..72f5718 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,7 +3706,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 9980d83..6dbfaa5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -527,6 +527,7 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index d6a4c89..1df8ea9 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,20 +186,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index ed63987..cd7ee3b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,6 +133,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -142,6 +145,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -200,7 +206,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 22 04:55:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 Aug 2014 04:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgt5-0000rK-OK; Fri, 22 Aug 2014 04:55:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgt4-0000r8-Lk for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:42 +0000 Received: from [85.158.137.68:17981] by server-5.bemta-3.messagelabs.com id E6/3F-30889-D4DC6F35; Fri, 22 Aug 2014 04:55:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1408683339!15160721!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21818 invoked from network); 22 Aug 2014 04:55:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Aug 2014 04:55:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XKgt1-0005eM-H0 for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XKgt1-0005JN-Et for xen-changelog@lists.xensource.com; Fri, 22 Aug 2014 04:55:39 +0000 Date: Fri, 22 Aug 2014 04:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffd7f8db506c77de5b6141c15f87cd7ce293bf41 Author: Ian Jackson AuthorDate: Tue Aug 19 12:52:25 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:52:25 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit b497ecca359466294d169b07a62b98eef7dc0a36. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 186 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 336cd79..ddf9c64 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1867,9 +1867,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 060912e..67afe8e 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,9 +61,6 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); - if ( ret == -EAGAIN ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 3817b71..66239b7 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -565,7 +565,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index f713901..21344e5 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -EAGAIN; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -EAGAIN; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d) @@ -233,25 +178,15 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -EAGAIN ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -391,9 +326,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -401,22 +334,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -445,15 +365,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -488,51 +410,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -EAGAIN; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -EAGAIN; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -EAGAIN); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -543,7 +432,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -610,6 +498,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -653,7 +547,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -676,20 +569,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current->domain->domain_id, current->vcpu_id, - sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -715,13 +594,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -732,24 +611,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -EAGAIN ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 8f378d6..72f5718 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,7 +3706,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 9980d83..6dbfaa5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -527,6 +527,7 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index d6a4c89..1df8ea9 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,20 +186,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index ed63987..cd7ee3b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,6 +133,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -142,6 +145,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -200,7 +206,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EI-0006p5-K4; Sat, 23 Aug 2014 06:55:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EH-0006ou-Bt for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:13 +0000 Received: from [193.109.254.147:2865] by server-14.bemta-14.messagelabs.com id 62/37-18345-0DA38F35; Sat, 23 Aug 2014 06:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1408776909!12550311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23532 invoked from network); 23 Aug 2014 06:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5E8-0005cX-Dj for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5E8-000419-6y for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:04 +0000 Date: Sat, 23 Aug 2014 06:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89f167e04ed89109c06092b8edf46c1519cab5f3 Author: Jan Beulich AuthorDate: Tue Aug 12 15:44:26 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:44:26 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 95e6d82224689fdfd967a093a4d69efc24c17e91 master date: 2014-08-12 15:30:11 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 186 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 195b07f..789e4a0 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1915,7 +1915,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a967b65..380bf09 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,6 +61,9 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 71227ef..df8cd04 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -572,8 +572,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ab5eacb..ff06878 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; + } + domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -365,17 +445,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +488,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +543,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -499,12 +611,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -548,6 +654,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -570,6 +677,20 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -595,13 +716,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -612,18 +733,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index be095f6..3ff3d93 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,8 +3706,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 1308193..f050af5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -536,7 +536,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 4ff89f0..fed6a69 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,6 +186,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 8dd2a61..fa8a074 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,9 +133,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -145,9 +142,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -207,7 +201,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EI-0006p5-K4; Sat, 23 Aug 2014 06:55:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EH-0006ou-Bt for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:13 +0000 Received: from [193.109.254.147:2865] by server-14.bemta-14.messagelabs.com id 62/37-18345-0DA38F35; Sat, 23 Aug 2014 06:55:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1408776909!12550311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23532 invoked from network); 23 Aug 2014 06:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5E8-0005cX-Dj for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5E8-000419-6y for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:04 +0000 Date: Sat, 23 Aug 2014 06:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89f167e04ed89109c06092b8edf46c1519cab5f3 Author: Jan Beulich AuthorDate: Tue Aug 12 15:44:26 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:44:26 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 95e6d82224689fdfd967a093a4d69efc24c17e91 master date: 2014-08-12 15:30:11 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 186 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 195b07f..789e4a0 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1915,7 +1915,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a967b65..380bf09 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,6 +61,9 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 71227ef..df8cd04 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -572,8 +572,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ab5eacb..ff06878 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; + } + domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -365,17 +445,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +488,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +543,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -499,12 +611,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -548,6 +654,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -570,6 +677,20 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -595,13 +716,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -612,18 +733,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index be095f6..3ff3d93 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,8 +3706,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -EAGAIN; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 1308193..f050af5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -536,7 +536,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 4ff89f0..fed6a69 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,6 +186,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 8dd2a61..fa8a074 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,9 +133,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -145,9 +142,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -207,7 +201,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EM-0006pU-MZ; Sat, 23 Aug 2014 06:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EL-0006pE-FG for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:17 +0000 Received: from [85.158.139.211:42749] by server-9.bemta-5.messagelabs.com id DE/E8-20744-4DA38F35; Sat, 23 Aug 2014 06:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1408776915!3440959!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22605 invoked from network); 23 Aug 2014 06:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EI-0005ca-Nu for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5EI-00041X-Gb for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:14 +0000 Date: Sat, 23 Aug 2014 06:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: handle AArch32 userspace when dumping 64-bit guest state. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99a9f497cb070ba7168d45442ad8ea3604d95dcb Author: Ian Campbell AuthorDate: Tue Aug 12 15:45:49 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:45:49 2014 +0200 xen: arm: handle AArch32 userspace when dumping 64-bit guest state. A 64-bit guest can still be in 32-bit mode when running userspace, handle this case by dumping the correct 32-bit state. Note that on ARM it is not possible to change mode without the help of the next exception level, hence there is no way a 64-bit guest can be running in 32-bit kernel modes. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall master commit: fc0cafeab30fe93963457fafbad7a01c7f55ea5f master date: 2014-08-12 15:32:27 +0200 --- xen/arch/arm/traps.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index e2e2db3..7367399 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -697,7 +697,17 @@ static void _show_registers(struct cpu_user_regs *regs, show_registers_32(regs, ctxt, guest_mode, v); #ifdef CONFIG_ARM_64 else if ( is_pv64_domain(v->domain) ) - show_registers_64(regs, ctxt, guest_mode, v); + { + if ( psr_mode_is_32bit(regs->cpsr) ) + { + BUG_ON(!usr_mode(regs)); + show_registers_32(regs, ctxt, guest_mode, v); + } + else + { + show_registers_64(regs, ctxt, guest_mode, v); + } + } #endif } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EM-0006pU-MZ; Sat, 23 Aug 2014 06:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EL-0006pE-FG for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:17 +0000 Received: from [85.158.139.211:42749] by server-9.bemta-5.messagelabs.com id DE/E8-20744-4DA38F35; Sat, 23 Aug 2014 06:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1408776915!3440959!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22605 invoked from network); 23 Aug 2014 06:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EI-0005ca-Nu for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5EI-00041X-Gb for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:14 +0000 Date: Sat, 23 Aug 2014 06:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: handle AArch32 userspace when dumping 64-bit guest state. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99a9f497cb070ba7168d45442ad8ea3604d95dcb Author: Ian Campbell AuthorDate: Tue Aug 12 15:45:49 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:45:49 2014 +0200 xen: arm: handle AArch32 userspace when dumping 64-bit guest state. A 64-bit guest can still be in 32-bit mode when running userspace, handle this case by dumping the correct 32-bit state. Note that on ARM it is not possible to change mode without the help of the next exception level, hence there is no way a 64-bit guest can be running in 32-bit kernel modes. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall master commit: fc0cafeab30fe93963457fafbad7a01c7f55ea5f master date: 2014-08-12 15:32:27 +0200 --- xen/arch/arm/traps.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index e2e2db3..7367399 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -697,7 +697,17 @@ static void _show_registers(struct cpu_user_regs *regs, show_registers_32(regs, ctxt, guest_mode, v); #ifdef CONFIG_ARM_64 else if ( is_pv64_domain(v->domain) ) - show_registers_64(regs, ctxt, guest_mode, v); + { + if ( psr_mode_is_32bit(regs->cpsr) ) + { + BUG_ON(!usr_mode(regs)); + show_registers_32(regs, ctxt, guest_mode, v); + } + else + { + show_registers_64(regs, ctxt, guest_mode, v); + } + } #endif } else -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EX-0006rH-QW; Sat, 23 Aug 2014 06:55:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EW-0006qx-5k for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:28 +0000 Received: from [193.109.254.147:52100] by server-2.bemta-14.messagelabs.com id EB/03-07861-FDA38F35; Sat, 23 Aug 2014 06:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1408776925!12600314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11282 invoked from network); 23 Aug 2014 06:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5ES-0005cj-Uo for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5ES-00041t-R6 for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:24 +0000 Date: Sat, 23 Aug 2014 06:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Correctly handle exception injection from userspace on 64-bit. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 935d51859a92b1fb88f1fa1bf596782bdf4a80ca Author: Ian Campbell AuthorDate: Tue Aug 12 15:48:28 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:48:28 2014 +0200 xen: arm: Correctly handle exception injection from userspace on 64-bit. Firstly we must be prepared to propagate traps from 32-bit userspace even for 64-bit guests, so wrap the existing inject_undef??_exception into inject_undef_exception and use that when injecting an undef exception. The various other exception cases (aborts etc) already do this. Secondly when injecting the trap we must pick the correct exception vector depending on whether the source of the trap was 32-bit EL0, 64-bit EL0 or EL1. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall master commit: a98669781769e821413dfef4ef99b93171375610 master date: 2014-08-12 15:36:15 +0200 --- xen/arch/arm/traps.c | 57 +++++++++++++++++++++++++++++++------- xen/include/asm-arm/processor.h | 18 +++++++----- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7367399..6536209 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -286,7 +286,7 @@ static void cpsr_switch_mode(struct cpu_user_regs *regs, int mode) regs->cpsr |= PSR_BIG_ENDIAN; } -static vaddr_t exception_handler(vaddr_t offset) +static vaddr_t exception_handler32(vaddr_t offset) { uint32_t sctlr = READ_SYSREG32(SCTLR_EL1); @@ -318,7 +318,7 @@ static void inject_undef32_exception(struct cpu_user_regs *regs) regs->lr_und = regs->pc32 + return_offset; /* Branch to exception vector */ - regs->pc32 = exception_handler(VECTOR32_UND); + regs->pc32 = exception_handler32(VECTOR32_UND); } /* Injects an Abort exception into the current vcpu, PC is the exact @@ -344,7 +344,7 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, regs->spsr_abt = spsr; regs->lr_abt = regs->pc32 + return_offset; - regs->pc32 = exception_handler(prefetch ? VECTOR32_PABT : VECTOR32_DABT); + regs->pc32 = exception_handler32(prefetch ? VECTOR32_PABT : VECTOR32_DABT); /* Inject a debug fault, best we can do right now */ if ( READ_SYSREG(TCR_EL1) & TTBCR_EAE ) @@ -397,9 +397,28 @@ static void inject_pabt32_exception(struct cpu_user_regs *regs, } #ifdef CONFIG_ARM_64 +/* + * Take care to call this while regs contains the original faulting + * state and not the (partially constructed) exception state. + */ +static vaddr_t exception_handler64(struct cpu_user_regs *regs, vaddr_t offset) +{ + vaddr_t base = READ_SYSREG(VBAR_EL1); + + if ( usr_mode(regs) ) + base += VECTOR64_LOWER32_BASE; + else if ( psr_mode(regs->cpsr,PSR_MODE_EL0t) ) + base += VECTOR64_LOWER64_BASE; + else /* Otherwise must be from kernel mode */ + base += VECTOR64_CURRENT_SPx_BASE; + + return base + offset; +} + /* Inject an undefined exception into a 64 bit guest */ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -408,12 +427,14 @@ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) BUG_ON( is_pv32_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG32(esr.bits, ESR_EL1); } @@ -424,6 +445,7 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -445,12 +467,14 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, BUG_ON( is_pv32_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG(addr, FAR_EL1); WRITE_SYSREG32(esr.bits, ESR_EL1); @@ -472,6 +496,17 @@ static void inject_iabt64_exception(struct cpu_user_regs *regs, #endif +static void inject_undef_exception(struct cpu_user_regs *regs, + int instr_len) +{ + if ( is_pv32_domain(current->domain) ) + inject_undef32_exception(regs); +#ifdef CONFIG_ARM_64 + else + inject_undef64_exception(regs, instr_len); +#endif +} + static void inject_iabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) @@ -1440,7 +1475,7 @@ static void do_cp15_32(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } advance_pc(regs, hsr); @@ -1477,7 +1512,7 @@ static void do_cp15_64(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } } @@ -1546,7 +1581,7 @@ bad_cp: gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } @@ -1561,7 +1596,7 @@ static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) return; } - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } static void do_cp(struct cpu_user_regs *regs, union hsr hsr) @@ -1572,7 +1607,7 @@ static void do_cp(struct cpu_user_regs *regs, union hsr hsr) return; } - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } #ifdef CONFIG_ARM_64 @@ -1647,7 +1682,7 @@ static void do_sysreg(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#x\n", hsr.bits & HSR_SYSREG_REGS_MASK); #endif - inject_undef64_exception(regs, sysreg.len); + inject_undef_exception(regs, sysreg.len); } } diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 9267c1b..1f158ce 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -432,14 +432,16 @@ union hsr { #define VECTOR32_PABT 12 #define VECTOR32_DABT 16 /* ... ARM64 */ -#define VECTOR64_CURRENT_SP0_SYNC 0x000 -#define VECTOR64_CURRENT_SP0_IRQ 0x080 -#define VECTOR64_CURRENT_SP0_FIQ 0x100 -#define VECTOR64_CURRENT_SP0_ERROR 0x180 -#define VECTOR64_CURRENT_SPx_SYNC 0x200 -#define VECTOR64_CURRENT_SPx_IRQ 0x280 -#define VECTOR64_CURRENT_SPx_FIQ 0x300 -#define VECTOR64_CURRENT_SPx_ERROR 0x380 +#define VECTOR64_CURRENT_SP0_BASE 0x000 +#define VECTOR64_CURRENT_SPx_BASE 0x200 +#define VECTOR64_LOWER64_BASE 0x400 +#define VECTOR64_LOWER32_BASE 0x600 + +#define VECTOR64_SYNC_OFFSET 0x000 +#define VECTOR64_IRQ_OFFSET 0x080 +#define VECTOR64_FIQ_OFFSET 0x100 +#define VECTOR64_ERROR_OFFSET 0x180 + #if defined(CONFIG_ARM_32) # include -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EX-0006rH-QW; Sat, 23 Aug 2014 06:55:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5EW-0006qx-5k for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:28 +0000 Received: from [193.109.254.147:52100] by server-2.bemta-14.messagelabs.com id EB/03-07861-FDA38F35; Sat, 23 Aug 2014 06:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1408776925!12600314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11282 invoked from network); 23 Aug 2014 06:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5ES-0005cj-Uo for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5ES-00041t-R6 for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:24 +0000 Date: Sat, 23 Aug 2014 06:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Correctly handle exception injection from userspace on 64-bit. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 935d51859a92b1fb88f1fa1bf596782bdf4a80ca Author: Ian Campbell AuthorDate: Tue Aug 12 15:48:28 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:48:28 2014 +0200 xen: arm: Correctly handle exception injection from userspace on 64-bit. Firstly we must be prepared to propagate traps from 32-bit userspace even for 64-bit guests, so wrap the existing inject_undef??_exception into inject_undef_exception and use that when injecting an undef exception. The various other exception cases (aborts etc) already do this. Secondly when injecting the trap we must pick the correct exception vector depending on whether the source of the trap was 32-bit EL0, 64-bit EL0 or EL1. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall master commit: a98669781769e821413dfef4ef99b93171375610 master date: 2014-08-12 15:36:15 +0200 --- xen/arch/arm/traps.c | 57 +++++++++++++++++++++++++++++++------- xen/include/asm-arm/processor.h | 18 +++++++----- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7367399..6536209 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -286,7 +286,7 @@ static void cpsr_switch_mode(struct cpu_user_regs *regs, int mode) regs->cpsr |= PSR_BIG_ENDIAN; } -static vaddr_t exception_handler(vaddr_t offset) +static vaddr_t exception_handler32(vaddr_t offset) { uint32_t sctlr = READ_SYSREG32(SCTLR_EL1); @@ -318,7 +318,7 @@ static void inject_undef32_exception(struct cpu_user_regs *regs) regs->lr_und = regs->pc32 + return_offset; /* Branch to exception vector */ - regs->pc32 = exception_handler(VECTOR32_UND); + regs->pc32 = exception_handler32(VECTOR32_UND); } /* Injects an Abort exception into the current vcpu, PC is the exact @@ -344,7 +344,7 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, regs->spsr_abt = spsr; regs->lr_abt = regs->pc32 + return_offset; - regs->pc32 = exception_handler(prefetch ? VECTOR32_PABT : VECTOR32_DABT); + regs->pc32 = exception_handler32(prefetch ? VECTOR32_PABT : VECTOR32_DABT); /* Inject a debug fault, best we can do right now */ if ( READ_SYSREG(TCR_EL1) & TTBCR_EAE ) @@ -397,9 +397,28 @@ static void inject_pabt32_exception(struct cpu_user_regs *regs, } #ifdef CONFIG_ARM_64 +/* + * Take care to call this while regs contains the original faulting + * state and not the (partially constructed) exception state. + */ +static vaddr_t exception_handler64(struct cpu_user_regs *regs, vaddr_t offset) +{ + vaddr_t base = READ_SYSREG(VBAR_EL1); + + if ( usr_mode(regs) ) + base += VECTOR64_LOWER32_BASE; + else if ( psr_mode(regs->cpsr,PSR_MODE_EL0t) ) + base += VECTOR64_LOWER64_BASE; + else /* Otherwise must be from kernel mode */ + base += VECTOR64_CURRENT_SPx_BASE; + + return base + offset; +} + /* Inject an undefined exception into a 64 bit guest */ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -408,12 +427,14 @@ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) BUG_ON( is_pv32_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG32(esr.bits, ESR_EL1); } @@ -424,6 +445,7 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -445,12 +467,14 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, BUG_ON( is_pv32_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG(addr, FAR_EL1); WRITE_SYSREG32(esr.bits, ESR_EL1); @@ -472,6 +496,17 @@ static void inject_iabt64_exception(struct cpu_user_regs *regs, #endif +static void inject_undef_exception(struct cpu_user_regs *regs, + int instr_len) +{ + if ( is_pv32_domain(current->domain) ) + inject_undef32_exception(regs); +#ifdef CONFIG_ARM_64 + else + inject_undef64_exception(regs, instr_len); +#endif +} + static void inject_iabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) @@ -1440,7 +1475,7 @@ static void do_cp15_32(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } advance_pc(regs, hsr); @@ -1477,7 +1512,7 @@ static void do_cp15_64(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } } @@ -1546,7 +1581,7 @@ bad_cp: gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } @@ -1561,7 +1596,7 @@ static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) return; } - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } static void do_cp(struct cpu_user_regs *regs, union hsr hsr) @@ -1572,7 +1607,7 @@ static void do_cp(struct cpu_user_regs *regs, union hsr hsr) return; } - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } #ifdef CONFIG_ARM_64 @@ -1647,7 +1682,7 @@ static void do_sysreg(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#x\n", hsr.bits & HSR_SYSREG_REGS_MASK); #endif - inject_undef64_exception(regs, sysreg.len); + inject_undef_exception(regs, sysreg.len); } } diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 9267c1b..1f158ce 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -432,14 +432,16 @@ union hsr { #define VECTOR32_PABT 12 #define VECTOR32_DABT 16 /* ... ARM64 */ -#define VECTOR64_CURRENT_SP0_SYNC 0x000 -#define VECTOR64_CURRENT_SP0_IRQ 0x080 -#define VECTOR64_CURRENT_SP0_FIQ 0x100 -#define VECTOR64_CURRENT_SP0_ERROR 0x180 -#define VECTOR64_CURRENT_SPx_SYNC 0x200 -#define VECTOR64_CURRENT_SPx_IRQ 0x280 -#define VECTOR64_CURRENT_SPx_FIQ 0x300 -#define VECTOR64_CURRENT_SPx_ERROR 0x380 +#define VECTOR64_CURRENT_SP0_BASE 0x000 +#define VECTOR64_CURRENT_SPx_BASE 0x200 +#define VECTOR64_LOWER64_BASE 0x400 +#define VECTOR64_LOWER32_BASE 0x600 + +#define VECTOR64_SYNC_OFFSET 0x000 +#define VECTOR64_IRQ_OFFSET 0x080 +#define VECTOR64_FIQ_OFFSET 0x100 +#define VECTOR64_ERROR_OFFSET 0x180 + #if defined(CONFIG_ARM_32) # include -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ei-0006t4-VD; Sat, 23 Aug 2014 06:55:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Eh-0006sk-76 for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:39 +0000 Received: from [85.158.139.211:43309] by server-11.bemta-5.messagelabs.com id 6D/96-31757-AEA38F35; Sat, 23 Aug 2014 06:55:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1408776935!8799670!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9406 invoked from network); 23 Aug 2014 06:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ed-0005cr-2j for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5Ed-00042J-14 for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:35 +0000 Date: Sat, 23 Aug 2014 06:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61460b58192786b206d96cf8d3cb188c364266a6 Author: Ian Campbell AuthorDate: Tue Aug 12 15:49:14 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:49:14 2014 +0200 xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef We are not setup to handle these properly. This turns a host crash into a trap to the guest kernel which will likely result in killing the offending process. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall master commit: c0020e0997024eb741d60de9a480bf2878f891af master date: 2014-08-12 15:37:25 +0200 --- xen/arch/arm/traps.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 6536209..e763f12 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1812,6 +1812,17 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) { union hsr hsr = { .bits = READ_SYSREG32(ESR_EL2) }; + /* + * We currently do not handle 32-bit userspace on 64-bit kernels + * correctly (See XSA-102). Until that is resolved we treat any + * trap from 32-bit userspace on 64-bit kernel as undefined. + */ + if ( is_pv64_domain(current->domain) && psr_mode_is_32bit(regs->cpsr) ) + { + inject_undef_exception(regs, hsr.len); + return; + } + switch (hsr.ec) { case HSR_EC_WFI_WFE: if ( !check_conditional_instr(regs, hsr) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ei-0006t4-VD; Sat, 23 Aug 2014 06:55:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Eh-0006sk-76 for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:39 +0000 Received: from [85.158.139.211:43309] by server-11.bemta-5.messagelabs.com id 6D/96-31757-AEA38F35; Sat, 23 Aug 2014 06:55:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1408776935!8799670!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9406 invoked from network); 23 Aug 2014 06:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ed-0005cr-2j for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5Ed-00042J-14 for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:35 +0000 Date: Sat, 23 Aug 2014 06:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 61460b58192786b206d96cf8d3cb188c364266a6 Author: Ian Campbell AuthorDate: Tue Aug 12 15:49:14 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:49:14 2014 +0200 xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef We are not setup to handle these properly. This turns a host crash into a trap to the guest kernel which will likely result in killing the offending process. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall master commit: c0020e0997024eb741d60de9a480bf2878f891af master date: 2014-08-12 15:37:25 +0200 --- xen/arch/arm/traps.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 6536209..e763f12 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1812,6 +1812,17 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) { union hsr hsr = { .bits = READ_SYSREG32(ESR_EL2) }; + /* + * We currently do not handle 32-bit userspace on 64-bit kernels + * correctly (See XSA-102). Until that is resolved we treat any + * trap from 32-bit userspace on 64-bit kernel as undefined. + */ + if ( is_pv64_domain(current->domain) && psr_mode_is_32bit(regs->cpsr) ) + { + inject_undef_exception(regs, hsr.len); + return; + } + switch (hsr.ec) { case HSR_EC_WFI_WFE: if ( !check_conditional_instr(regs, hsr) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Eq-0006uh-1W; Sat, 23 Aug 2014 06:55:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ep-0006uY-MU for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:47 +0000 Received: from [193.109.254.147:3909] by server-15.bemta-14.messagelabs.com id 8F/A2-30948-3FA38F35; Sat, 23 Aug 2014 06:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1408776945!12560201!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16584 invoked from network); 23 Aug 2014 06:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5En-0005cx-AQ for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5En-00042f-5e for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:45 +0000 Date: Sat, 23 Aug 2014 06:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ddedcb8748f6db39f1825d5b2bb7d09fdabbaf2 Author: Ian Campbell AuthorDate: Tue Aug 12 15:50:13 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:50:13 2014 +0200 xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace The do_sysreg case was missing a return, so it would increment PC and inject the trap to the second instruction of the handler. This is CVE-2014-5148 / XSA-103. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Julien Grall master commit: f2ae8bfa498831ee6343d672066b898d3cd73892 master date: 2014-08-12 15:38:01 +0200 --- xen/arch/arm/traps.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index e763f12..4c910c8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1683,6 +1683,7 @@ static void do_sysreg(struct cpu_user_regs *regs, hsr.bits & HSR_SYSREG_REGS_MASK); #endif inject_undef_exception(regs, sysreg.len); + return; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Eq-0006uh-1W; Sat, 23 Aug 2014 06:55:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ep-0006uY-MU for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:47 +0000 Received: from [193.109.254.147:3909] by server-15.bemta-14.messagelabs.com id 8F/A2-30948-3FA38F35; Sat, 23 Aug 2014 06:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1408776945!12560201!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16584 invoked from network); 23 Aug 2014 06:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5En-0005cx-AQ for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5En-00042f-5e for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:45 +0000 Date: Sat, 23 Aug 2014 06:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ddedcb8748f6db39f1825d5b2bb7d09fdabbaf2 Author: Ian Campbell AuthorDate: Tue Aug 12 15:50:13 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:50:13 2014 +0200 xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace The do_sysreg case was missing a return, so it would increment PC and inject the trap to the second instruction of the handler. This is CVE-2014-5148 / XSA-103. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Julien Grall master commit: f2ae8bfa498831ee6343d672066b898d3cd73892 master date: 2014-08-12 15:38:01 +0200 --- xen/arch/arm/traps.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index e763f12..4c910c8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1683,6 +1683,7 @@ static void do_sysreg(struct cpu_user_regs *regs, hsr.bits & HSR_SYSREG_REGS_MASK); #endif inject_undef_exception(regs, sysreg.len); + return; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5F1-0006wo-4c; Sat, 23 Aug 2014 06:55:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5F0-0006wX-3d for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:58 +0000 Received: from [85.158.143.35:43232] by server-2.bemta-4.messagelabs.com id 22/AF-04525-DFA38F35; Sat, 23 Aug 2014 06:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1408776955!12801323!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27539 invoked from network); 23 Aug 2014 06:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ex-0005d6-IR for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5Ex-00043Y-DB for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:55 +0000 Date: Sat, 23 Aug 2014 06:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c5264902663da247d12a58c9177a969a984f884 Author: Andrew Cooper AuthorDate: Tue Aug 12 15:51:52 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:51:52 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a1ac4cf52e38386bac7ac3440c7da0099662ca5c master date: 2014-07-29 17:02:25 +0200 --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 32ca458..4221826 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -234,6 +234,9 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; @@ -241,8 +244,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - early_intel_workaround(c); - #ifdef CONFIG_X86_HT c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5F1-0006wo-4c; Sat, 23 Aug 2014 06:55:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5F0-0006wX-3d for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:58 +0000 Received: from [85.158.143.35:43232] by server-2.bemta-4.messagelabs.com id 22/AF-04525-DFA38F35; Sat, 23 Aug 2014 06:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1408776955!12801323!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27539 invoked from network); 23 Aug 2014 06:55:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5Ex-0005d6-IR for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5Ex-00043Y-DB for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:55:55 +0000 Date: Sat, 23 Aug 2014 06:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/cpu: undo BIOS CPUID max_leaf limit before querying for features X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c5264902663da247d12a58c9177a969a984f884 Author: Andrew Cooper AuthorDate: Tue Aug 12 15:51:52 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:51:52 2014 +0200 x86/cpu: undo BIOS CPUID max_leaf limit before querying for features If IA32_MISC_ENABLE[22] is set by the BIOS, CPUID.0.EAX will be limited to 3. Lift this limit before considering whether to query CPUID.7[ECX=0].EBX for features. Without this change, dom0 is able to see this feature leaf (as the limit was subsequently lifted), and will set features appropriately in HVM domain cpuid policies. The specific bug XenServer observed was the advertisement of the FSGSBASE feature, but an inability to set CR4.FSGSBASE as Xen considered the bit to be reserved as cpu_has_fsgsbase incorrectly evaluated as false. This is a regression introduced by c/s 44e24f8567 "x86: don't call generic_identify() redundantly" where the redundant call actually resampled CPUID.7[ECX=0] properly to obtain the feature flags. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: a1ac4cf52e38386bac7ac3440c7da0099662ca5c master date: 2014-07-29 17:02:25 +0200 --- xen/arch/x86/cpu/common.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 32ca458..4221826 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -234,6 +234,9 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) paddr_bits = cpuid_eax(0x80000008) & 0xff; } + /* Might lift BIOS max_leaf=3 limit. */ + early_intel_workaround(c); + /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) { u32 dummy; @@ -241,8 +244,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_capability[X86_FEATURE_FSGSBASE / 32] = ebx; } - early_intel_workaround(c); - #ifdef CONFIG_X86_HT c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:56:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:56:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5FC-0006yc-7M; Sat, 23 Aug 2014 06:56:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5FB-0006yP-3m for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:56:09 +0000 Received: from [85.158.139.211:13823] by server-10.bemta-5.messagelabs.com id 94/6D-19806-80B38F35; Sat, 23 Aug 2014 06:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1408776965!3441050!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27157 invoked from network); 23 Aug 2014 06:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5F7-0005df-NT for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5F7-000444-Lb for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:56:05 +0000 Date: Sat, 23 Aug 2014 06:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f161c7d4087b85a1fa937213bf857e098b7685b Author: Ian Jackson AuthorDate: Tue Aug 19 12:50:41 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:50:41 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit 89f167e04ed89109c06092b8edf46c1519cab5f3. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 186 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 789e4a0..195b07f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1915,9 +1915,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 380bf09..a967b65 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,9 +61,6 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); - if ( ret == -EAGAIN ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index df8cd04..71227ef 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -572,7 +572,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ff06878..ab5eacb 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -EAGAIN; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -EAGAIN; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -233,25 +178,15 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -EAGAIN ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -391,9 +326,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -401,22 +334,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -445,15 +365,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -488,51 +410,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -EAGAIN; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -EAGAIN; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -EAGAIN); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -543,7 +432,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -611,6 +499,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -654,7 +548,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -677,20 +570,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current->domain->domain_id, current->vcpu_id, - sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -716,13 +595,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -733,24 +612,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -EAGAIN ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3ff3d93..be095f6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,7 +3706,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index f050af5..1308193 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -536,6 +536,7 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index fed6a69..4ff89f0 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,20 +186,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index fa8a074..8dd2a61 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,6 +133,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -142,6 +145,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -201,7 +207,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 23 06:56:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 Aug 2014 06:56:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5FC-0006yc-7M; Sat, 23 Aug 2014 06:56:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5FB-0006yP-3m for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:56:09 +0000 Received: from [85.158.139.211:13823] by server-10.bemta-5.messagelabs.com id 94/6D-19806-80B38F35; Sat, 23 Aug 2014 06:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1408776965!3441050!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27157 invoked from network); 23 Aug 2014 06:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Aug 2014 06:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XL5F7-0005df-NT for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XL5F7-000444-Lb for xen-changelog@lists.xensource.com; Sat, 23 Aug 2014 06:56:05 +0000 Date: Sat, 23 Aug 2014 06:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f161c7d4087b85a1fa937213bf857e098b7685b Author: Ian Jackson AuthorDate: Tue Aug 19 12:50:41 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:50:41 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit 89f167e04ed89109c06092b8edf46c1519cab5f3. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 199 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 186 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 789e4a0..195b07f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1915,9 +1915,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 380bf09..a967b65 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -61,9 +61,6 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); - if ( ret == -EAGAIN ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index df8cd04..71227ef 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -572,7 +572,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ff06878..ab5eacb 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -EAGAIN; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -EAGAIN; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -233,25 +178,15 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -EAGAIN ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -391,9 +326,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -401,22 +334,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -445,15 +365,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -488,51 +410,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -EAGAIN; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -EAGAIN; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -EAGAIN); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -543,7 +432,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -611,6 +499,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -654,7 +548,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -677,20 +570,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current->domain->domain_id, current->vcpu_id, - sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -716,13 +595,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -733,24 +612,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -EAGAIN ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3ff3d93..be095f6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3706,7 +3706,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -EAGAIN; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index f050af5..1308193 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -536,6 +536,7 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index fed6a69..4ff89f0 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,20 +186,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index fa8a074..8dd2a61 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -133,6 +133,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -142,6 +145,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -201,7 +207,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 14:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 14:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCV-00074Y-97; Sun, 24 Aug 2014 14:55:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCT-00074T-LV for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:21 +0000 Received: from [85.158.137.68:63943] by server-4.bemta-3.messagelabs.com id E4/6A-18709-8DCF9F35; Sun, 24 Aug 2014 14:55:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1408892119!13048541!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17359 invoked from network); 24 Aug 2014 14:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 14:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCL-0000kW-F6 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLZCB-0001mp-C0 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:03 +0000 Date: Sun, 24 Aug 2014 14:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] lz4: check for underruns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4328fdf3873f0a6f77c1ecb61873b103ceb6d8cb Author: Jan Beulich AuthorDate: Fri Aug 22 14:06:20 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:06:20 2014 +0200 lz4: check for underruns While overruns are already being taken care of, underruns (resulting from overflows in the respective "op + length" (or similar) operations weren't. This is CVE-2014-4611. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 9143a6c55ef7e8f630857cb08c03844d372c2345 master date: 2014-08-04 13:43:03 +0200 --- xen/common/lz4/decompress.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 40b3381..5cf8f37 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -84,6 +84,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, ip += length; break; /* EOF */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -142,6 +144,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } @@ -207,6 +211,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, op += length; break;/* Necessarily EOF, due to parsing restrictions */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -270,6 +276,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 14:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 14:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCa-00074l-Cq; Sun, 24 Aug 2014 14:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCY-00074g-SD for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:27 +0000 Received: from [85.158.143.35:8304] by server-3.bemta-4.messagelabs.com id 31/0E-06192-EDCF9F35; Sun, 24 Aug 2014 14:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1408892123!4871701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15689 invoked from network); 24 Aug 2014 14:55:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 14:55:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCV-0000kZ-Ki for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLZCV-0001ny-J9 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:23 +0000 Date: Sun, 24 Aug 2014 14:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91a13bcf99d1a47f6f7ccd364b95b1b8500c2be2 Author: Jan Beulich AuthorDate: Fri Aug 22 14:07:36 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:07:36 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper master commit: 3af450fd2d9403f208d3ac6459716f027b8597ad master date: 2014-08-08 09:34:03 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 7404ee3..3166674 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -597,23 +597,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -623,19 +632,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -650,20 +657,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -673,19 +679,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -700,21 +704,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -724,7 +727,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -732,17 +735,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -769,20 +770,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -795,19 +795,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -823,19 +821,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -848,19 +845,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -871,6 +866,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e833cdf..50d8965 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3921,7 +3918,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4188,7 +4186,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 14:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 14:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCa-00074l-Cq; Sun, 24 Aug 2014 14:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCY-00074g-SD for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:27 +0000 Received: from [85.158.143.35:8304] by server-3.bemta-4.messagelabs.com id 31/0E-06192-EDCF9F35; Sun, 24 Aug 2014 14:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1408892123!4871701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15689 invoked from network); 24 Aug 2014 14:55:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 14:55:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCV-0000kZ-Ki for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLZCV-0001ny-J9 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:23 +0000 Date: Sun, 24 Aug 2014 14:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91a13bcf99d1a47f6f7ccd364b95b1b8500c2be2 Author: Jan Beulich AuthorDate: Fri Aug 22 14:07:36 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:07:36 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper master commit: 3af450fd2d9403f208d3ac6459716f027b8597ad master date: 2014-08-08 09:34:03 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 7404ee3..3166674 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -597,23 +597,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -623,19 +632,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -650,20 +657,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -673,19 +679,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -700,21 +704,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -724,7 +727,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -732,17 +735,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -769,20 +770,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -795,19 +795,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -823,19 +821,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -848,19 +845,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -871,6 +866,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e833cdf..50d8965 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3921,7 +3918,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4188,7 +4186,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 14:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 14:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCV-00074Y-97; Sun, 24 Aug 2014 14:55:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCT-00074T-LV for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:21 +0000 Received: from [85.158.137.68:63943] by server-4.bemta-3.messagelabs.com id E4/6A-18709-8DCF9F35; Sun, 24 Aug 2014 14:55:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1408892119!13048541!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17359 invoked from network); 24 Aug 2014 14:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 14:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZCL-0000kW-F6 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLZCB-0001mp-C0 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 14:55:03 +0000 Date: Sun, 24 Aug 2014 14:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] lz4: check for underruns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4328fdf3873f0a6f77c1ecb61873b103ceb6d8cb Author: Jan Beulich AuthorDate: Fri Aug 22 14:06:20 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:06:20 2014 +0200 lz4: check for underruns While overruns are already being taken care of, underruns (resulting from overflows in the respective "op + length" (or similar) operations weren't. This is CVE-2014-4611. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 9143a6c55ef7e8f630857cb08c03844d372c2345 master date: 2014-08-04 13:43:03 +0200 --- xen/common/lz4/decompress.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 40b3381..5cf8f37 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -84,6 +84,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, ip += length; break; /* EOF */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -142,6 +144,8 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } @@ -207,6 +211,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, op += length; break;/* Necessarily EOF, due to parsing restrictions */ } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_WILDCOPY(ip, op, cpy); ip -= (op - cpy); op = cpy; @@ -270,6 +276,8 @@ static int lz4_uncompress_unknownoutputsize(const unsigned char *source, goto _output_error; continue; } + if (unlikely((unsigned long)cpy < (unsigned long)op)) + goto _output_error; LZ4_SECURECOPY(ref, op, cpy); op = cpy; /* correction */ } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 15:33:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 15:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZn1-0007VD-G1; Sun, 24 Aug 2014 15:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZmz-0007V1-Tp for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 15:33:06 +0000 Received: from [85.158.137.68:4923] by server-1.bemta-3.messagelabs.com id A1/BF-30185-1B50AF35; Sun, 24 Aug 2014 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1408894382!15573422!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16938 invoked from network); 24 Aug 2014 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZmw-0001AF-NW for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 15:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLZmw-0002wn-JL for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 15:33:02 +0000 Date: Sun, 24 Aug 2014 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f182148435fe7f0e5d6c91e35fb1409effca8d2 Author: Jan Beulich AuthorDate: Fri Aug 22 14:10:09 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:10:09 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper master commit: 3af450fd2d9403f208d3ac6459716f027b8597ad master date: 2014-08-08 09:34:03 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 8af30be..0773557 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -541,23 +541,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -567,19 +576,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -594,20 +601,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -617,19 +623,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -644,21 +648,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -668,7 +671,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -676,17 +679,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -713,20 +714,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -739,19 +739,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -767,19 +765,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -792,19 +789,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -815,6 +810,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e390c2a..4fdbfc7 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3929,7 +3926,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4196,7 +4194,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 15:33:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 15:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZn1-0007VD-G1; Sun, 24 Aug 2014 15:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZmz-0007V1-Tp for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 15:33:06 +0000 Received: from [85.158.137.68:4923] by server-1.bemta-3.messagelabs.com id A1/BF-30185-1B50AF35; Sun, 24 Aug 2014 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1408894382!15573422!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16938 invoked from network); 24 Aug 2014 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLZmw-0001AF-NW for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 15:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLZmw-0002wn-JL for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 15:33:02 +0000 Date: Sun, 24 Aug 2014 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f182148435fe7f0e5d6c91e35fb1409effca8d2 Author: Jan Beulich AuthorDate: Fri Aug 22 14:10:09 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:10:09 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper master commit: 3af450fd2d9403f208d3ac6459716f027b8597ad master date: 2014-08-08 09:34:03 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 8af30be..0773557 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -541,23 +541,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -567,19 +576,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -594,20 +601,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -617,19 +623,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -644,21 +648,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -668,7 +671,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -676,17 +679,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -713,20 +714,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -739,19 +739,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -767,19 +765,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -792,19 +789,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -815,6 +810,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index e390c2a..4fdbfc7 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3929,7 +3926,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4196,7 +4194,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 19:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 19:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLdhv-0000Oe-Ub; Sun, 24 Aug 2014 19:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLdhu-0000OU-Tt for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 19:44:07 +0000 Received: from [85.158.137.68:46791] by server-8.bemta-3.messagelabs.com id 56/B9-31195-6804AF35; Sun, 24 Aug 2014 19:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1408909443!11133192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4059 invoked from network); 24 Aug 2014 19:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 19:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLdhr-00049N-E6 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 19:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLdhq-00022x-I7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 19:44:02 +0000 Date: Sun, 24 Aug 2014 19:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e047ad4c67b92905e9340c8d8a6f5dc7097fba1 Author: Jan Beulich AuthorDate: Fri Aug 22 14:13:27 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:13:27 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper master commit: 3af450fd2d9403f208d3ac6459716f027b8597ad master date: 2014-08-08 09:34:03 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 8af30be..0773557 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -541,23 +541,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -567,19 +576,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -594,20 +601,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -617,19 +623,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -644,21 +648,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -668,7 +671,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -676,17 +679,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -713,20 +714,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -739,19 +739,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -767,19 +765,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -792,19 +789,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -815,6 +810,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index deefdb9..b0363de 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3932,7 +3929,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4199,7 +4197,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 19:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 19:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLdhv-0000Oe-Ub; Sun, 24 Aug 2014 19:44:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLdhu-0000OU-Tt for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 19:44:07 +0000 Received: from [85.158.137.68:46791] by server-8.bemta-3.messagelabs.com id 56/B9-31195-6804AF35; Sun, 24 Aug 2014 19:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1408909443!11133192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4059 invoked from network); 24 Aug 2014 19:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 19:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLdhr-00049N-E6 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 19:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLdhq-00022x-I7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 19:44:02 +0000 Date: Sun, 24 Aug 2014 19:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86_emulate: properly do IP updates and other side effects on success X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e047ad4c67b92905e9340c8d8a6f5dc7097fba1 Author: Jan Beulich AuthorDate: Fri Aug 22 14:13:27 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:13:27 2014 +0200 x86_emulate: properly do IP updates and other side effects on success The two MMX/SSE/AVX code blocks failed to update IP properly, and these as well as get_reg_refix(), which "manually" updated IP so far, failed to do the TF and RF processing needed at the end of successfully emulated instructions. Fix the test utility at once to check IP is properly getting updated, and while at it macroize the respective code quite a bit, hopefully making it easier to add further tests when the need arises. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper master commit: 3af450fd2d9403f208d3ac6459716f027b8597ad master date: 2014-08-08 09:34:03 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 140 +++++++++++++------------- xen/arch/x86/x86_emulate/x86_emulate.c | 33 +++--- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 8af30be..0773557 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -541,23 +541,32 @@ int main(int argc, char **argv) printf("skipped\n"); #endif +#define decl_insn(which) extern const unsigned char which[], which##_len[] +#define put_insn(which, insn) ".pushsection .test, \"ax\", @progbits\n" \ + #which ": " insn "\n" \ + ".equ " #which "_len, .-" #which "\n" \ + ".popsection" +#define set_insn(which) (regs.eip = (unsigned long)memcpy(instr, which, \ + (unsigned long)which##_len)) +#define check_eip(which) (regs.eip == (unsigned long)instr + \ + (unsigned long)which##_len) + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_to_mem[]; + decl_insn(movq_to_mem); asm volatile ( "pcmpeqb %%mm3, %%mm3\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_to_mem: movq %%mm3, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movq_to_mem, "movq %%mm3, (%0)") + :: "c" (NULL) ); - memcpy(instr, movq_to_mem, 15); + set_insn(movq_to_mem); memset(res, 0x33, 64); memset(res + 8, 0xff, 8); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movq_to_mem) ) goto fail; printf("okay\n"); } @@ -567,19 +576,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movq (%edx),%mm5..."); if ( stack_exec && cpu_has_mmx ) { - extern const unsigned char movq_from_mem[]; + decl_insn(movq_from_mem); asm volatile ( "pcmpgtb %%mm5, %%mm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movq_from_mem: movq (%0), %%mm5\n" - ".popsection" :: "d" (NULL) ); + put_insn(movq_from_mem, "movq (%0), %%mm5") + :: "d" (NULL) ); - memcpy(instr, movq_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movq_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movq_from_mem) ) goto fail; asm ( "pcmpeqb %%mm3, %%mm3\n\t" "pcmpeqb %%mm5, %%mm3\n\t" @@ -594,20 +601,19 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu %xmm2,(%ecx)..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_to_mem[]; + decl_insn(movdqu_to_mem); asm volatile ( "pcmpeqb %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_to_mem: movdqu %%xmm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(movdqu_to_mem, "movdqu %%xmm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, movdqu_to_mem, 15); + set_insn(movdqu_to_mem); memset(res, 0x55, 64); memset(res + 8, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -617,19 +623,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movdqu (%edx),%xmm4..."); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movdqu_from_mem[]; + decl_insn(movdqu_from_mem); asm volatile ( "pcmpgtb %%xmm4, %%xmm4\n" - ".pushsection .test, \"a\", @progbits\n" - "movdqu_from_mem: movdqu (%0), %%xmm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(movdqu_from_mem, "movdqu (%0), %%xmm4") + :: "d" (NULL) ); - memcpy(instr, movdqu_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movdqu_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movdqu_from_mem) ) goto fail; asm ( "pcmpeqb %%xmm2, %%xmm2\n\t" "pcmpeqb %%xmm4, %%xmm2\n\t" @@ -644,21 +648,20 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu %ymm2,(%ecx)..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_to_mem[]; + decl_insn(vmovdqu_to_mem); asm volatile ( "vpcmpeqb %%xmm2, %%xmm2, %%xmm2\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_to_mem: vmovdqu %%ymm2, (%0)\n" - ".popsection" :: "c" (NULL) ); + put_insn(vmovdqu_to_mem, "vmovdqu %%ymm2, (%0)") + :: "c" (NULL) ); - memcpy(instr, vmovdqu_to_mem, 15); + set_insn(vmovdqu_to_mem); memset(res, 0x55, 128); memset(res + 16, 0xff, 16); memset(res + 20, 0x00, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 16, 64) || + !check_eip(vmovdqu_to_mem) ) goto fail; printf("okay\n"); } @@ -668,7 +671,7 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovdqu (%edx),%ymm4..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovdqu_from_mem[]; + decl_insn(vmovdqu_from_mem); #if 0 /* Don't use AVX2 instructions for now */ asm volatile ( "vpcmpgtb %%ymm4, %%ymm4, %%ymm4\n" @@ -676,17 +679,15 @@ int main(int argc, char **argv) asm volatile ( "vpcmpgtb %%xmm4, %%xmm4, %%xmm4\n\t" "vinsertf128 $1, %%xmm4, %%ymm4, %%ymm4\n" #endif - ".pushsection .test, \"a\", @progbits\n" - "vmovdqu_from_mem: vmovdqu (%0), %%ymm4\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovdqu_from_mem, "vmovdqu (%0), %%ymm4") + :: "d" (NULL) ); - memcpy(instr, vmovdqu_from_mem, 15); + set_insn(vmovdqu_from_mem); memset(res + 4, 0xff, 16); - regs.eip = (unsigned long)&instr[0]; regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovdqu_from_mem) ) goto fail; #if 0 /* Don't use AVX2 instructions for now */ asm ( "vpcmpeqb %%ymm2, %%ymm2, %%ymm2\n\t" @@ -713,20 +714,19 @@ int main(int argc, char **argv) memset(res + 10, 0x66, 8); if ( stack_exec && cpu_has_sse2 ) { - extern const unsigned char movsd_to_mem[]; + decl_insn(movsd_to_mem); asm volatile ( "movlpd %0, %%xmm5\n\t" "movhpd %0, %%xmm5\n" - ".pushsection .test, \"a\", @progbits\n" - "movsd_to_mem: movsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(movsd_to_mem, "movsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, movsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(movsd_to_mem) ) goto fail; printf("okay\n"); } @@ -739,19 +739,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing movaps (%edx),%xmm7..."); if ( stack_exec && cpu_has_sse ) { - extern const unsigned char movaps_from_mem[]; + decl_insn(movaps_from_mem); asm volatile ( "xorps %%xmm7, %%xmm7\n" - ".pushsection .test, \"a\", @progbits\n" - "movaps_from_mem: movaps (%0), %%xmm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(movaps_from_mem, "movaps (%0), %%xmm7") + :: "d" (NULL) ); - memcpy(instr, movaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(movaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(movaps_from_mem) ) goto fail; asm ( "cmpeqps %1, %%xmm7\n\t" "movmskps %%xmm7, %0" : "=r" (rc) : "m" (res[8]) ); @@ -767,19 +765,18 @@ int main(int argc, char **argv) memset(res + 10, 0x77, 8); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovsd_to_mem[]; + decl_insn(vmovsd_to_mem); asm volatile ( "vbroadcastsd %0, %%ymm5\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovsd_to_mem: vmovsd %%xmm5, (%1)\n" - ".popsection" :: "m" (res[10]), "c" (NULL) ); + put_insn(vmovsd_to_mem, "vmovsd %%xmm5, (%1)") + :: "m" (res[10]), "c" (NULL) ); - memcpy(instr, vmovsd_to_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovsd_to_mem); regs.ecx = (unsigned long)(res + 2); regs.edx = 0; rc = x86_emulate(&ctxt, &emulops); - if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) ) + if ( (rc != X86EMUL_OKAY) || memcmp(res, res + 8, 32) || + !check_eip(vmovsd_to_mem) ) goto fail; printf("okay\n"); } @@ -792,19 +789,17 @@ int main(int argc, char **argv) printf("%-40s", "Testing vmovaps (%edx),%ymm7..."); if ( stack_exec && cpu_has_avx ) { - extern const unsigned char vmovaps_from_mem[]; + decl_insn(vmovaps_from_mem); asm volatile ( "vxorps %%ymm7, %%ymm7, %%ymm7\n" - ".pushsection .test, \"a\", @progbits\n" - "vmovaps_from_mem: vmovaps (%0), %%ymm7\n" - ".popsection" :: "d" (NULL) ); + put_insn(vmovaps_from_mem, "vmovaps (%0), %%ymm7") + :: "d" (NULL) ); - memcpy(instr, vmovaps_from_mem, 15); - regs.eip = (unsigned long)&instr[0]; + set_insn(vmovaps_from_mem); regs.ecx = 0; regs.edx = (unsigned long)res; rc = x86_emulate(&ctxt, &emulops); - if ( rc != X86EMUL_OKAY ) + if ( rc != X86EMUL_OKAY || !check_eip(vmovaps_from_mem) ) goto fail; asm ( "vcmpeqps %1, %%ymm7, %%ymm0\n\t" "vmovmskps %%ymm0, %0" : "=r" (rc) : "m" (res[8]) ); @@ -815,6 +810,11 @@ int main(int argc, char **argv) else printf("skipped\n"); +#undef decl_insn +#undef put_insn +#undef set_insn +#undef check_eip + for ( j = 1; j <= 2; j++ ) { #if defined(__i386__) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index deefdb9..b0363de 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -720,29 +720,26 @@ do{ uint8_t stub[] = { _bytes, 0xc3 }; \ put_fpu(&fic); \ } while (0) -static unsigned long __get_rep_prefix( - struct cpu_user_regs *int_regs, - struct cpu_user_regs *ext_regs, +static unsigned long _get_rep_prefix( + const struct cpu_user_regs *int_regs, int ad_bytes) { - unsigned long ecx = ((ad_bytes == 2) ? (uint16_t)int_regs->ecx : - (ad_bytes == 4) ? (uint32_t)int_regs->ecx : - int_regs->ecx); - - /* Skip the instruction if no repetitions are required. */ - if ( ecx == 0 ) - ext_regs->eip = int_regs->eip; - - return ecx; + return (ad_bytes == 2) ? (uint16_t)int_regs->ecx : + (ad_bytes == 4) ? (uint32_t)int_regs->ecx : + int_regs->ecx; } #define get_rep_prefix() ({ \ unsigned long max_reps = 1; \ if ( rep_prefix() ) \ - max_reps = __get_rep_prefix(&_regs, ctxt->regs, ad_bytes); \ + max_reps = _get_rep_prefix(&_regs, ad_bytes); \ if ( max_reps == 0 ) \ - goto done; \ - max_reps; \ + { \ + /* Skip the instruction if no repetitions are required. */ \ + dst.type = OP_NONE; \ + goto writeback; \ + } \ + max_reps; \ }) static void __put_rep_prefix( @@ -3932,7 +3929,8 @@ x86_emulate( if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x20: /* mov cr,reg */ @@ -4199,7 +4197,8 @@ x86_emulate( if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); - goto done; + dst.type = OP_NONE; + break; } case 0x80 ... 0x8f: /* jcc (near) */ { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHY-0004TB-Cz; Sun, 24 Aug 2014 23:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHX-0004T3-3X for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:07 +0000 Received: from [85.158.143.35:48110] by server-2.bemta-4.messagelabs.com id 51/C0-04525-2367AF35; Sun, 24 Aug 2014 23:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1408923183!9538111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32734 invoked from network); 24 Aug 2014 23:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHT-0006lO-MO for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHT-0000ON-7Q for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:03 +0000 Date: Sun, 24 Aug 2014 23:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95e6d82224689fdfd967a093a4d69efc24c17e91 Author: Jan Beulich AuthorDate: Tue Aug 12 15:30:11 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:30:11 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 198 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 185 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f7e0e78..41f7817 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1924,7 +1924,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d1517c4..70da575 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -64,6 +64,9 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); + if ( ret == -ERESTART ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index abf3d7a..101d1a1 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -577,8 +577,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -ERESTART; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 455000d..c8c4918 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -ERESTART; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -ERESTART; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -187,15 +242,25 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -ERESTART ) + return ret; + } + domain_unpause(d); return ret; @@ -335,7 +400,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -343,9 +410,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -374,17 +454,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -419,18 +497,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -ERESTART; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -ERESTART; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -ERESTART); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -441,6 +552,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -504,12 +616,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -553,6 +659,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -575,6 +682,19 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "%pv: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current, sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -598,13 +718,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -615,18 +735,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -ERESTART ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3c803b6..9f2882f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3705,8 +3705,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -ERESTART; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 1952070..5d86e6c 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -615,7 +615,6 @@ int domain_kill(struct domain *d) { if ( rc == -ERESTART ) rc = -EAGAIN; - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 83329ed..87ded49 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,6 +186,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 9b8f8de..89322e4 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -132,9 +132,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -144,9 +141,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -206,7 +200,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHY-0004TB-Cz; Sun, 24 Aug 2014 23:33:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHX-0004T3-3X for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:07 +0000 Received: from [85.158.143.35:48110] by server-2.bemta-4.messagelabs.com id 51/C0-04525-2367AF35; Sun, 24 Aug 2014 23:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1408923183!9538111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32734 invoked from network); 24 Aug 2014 23:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHT-0006lO-MO for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHT-0000ON-7Q for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:03 +0000 Date: Sun, 24 Aug 2014 23:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95e6d82224689fdfd967a093a4d69efc24c17e91 Author: Jan Beulich AuthorDate: Tue Aug 12 15:30:11 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:30:11 2014 +0200 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). This is CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 + xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 198 ++++++++++++++++++++++++++++++++------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 +++ xen/include/asm-x86/paging.h | 8 +-- 8 files changed, 185 insertions(+), 49 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f7e0e78..41f7817 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1924,7 +1924,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d1517c4..70da575 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -64,6 +64,9 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); + if ( ret == -ERESTART ) + return hypercall_create_continuation(__HYPERVISOR_domctl, + "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index abf3d7a..101d1a1 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -577,8 +577,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", - u_domctl); + rc = -ERESTART; else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 455000d..c8c4918 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -ERESTART; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -ERESTART; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.vcpu = NULL; + } + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -187,15 +242,25 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); + { + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -ERESTART ) + return ret; + } + domain_unpause(d); return ret; @@ -335,7 +400,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -343,9 +410,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.vcpu ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -374,17 +454,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -419,18 +497,51 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -ERESTART; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -ERESTART; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + d->arch.paging.preempt.vcpu = NULL; + else + { + d->arch.paging.preempt.vcpu = current; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused for other errors. */ + ASSERT(rv == -ERESTART); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -441,6 +552,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -504,12 +616,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -553,6 +659,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { + bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -575,6 +682,19 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( d->arch.paging.preempt.vcpu ) + { + if ( d->arch.paging.preempt.vcpu != current || + d->arch.paging.preempt.op != sc->op ) + { + printk(XENLOG_G_DEBUG + "%pv: Paging op %#x on Dom%u with unfinished prior op %#x\n", + current, sc->op, d->domain_id, d->arch.paging.preempt.op); + return -EBUSY; + } + resuming = 1; + } + rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -598,13 +718,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -615,18 +735,24 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -ERESTART ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 3c803b6..9f2882f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3705,8 +3705,7 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = hypercall_create_continuation( - __HYPERVISOR_domctl, "h", u_domctl); + rc = -ERESTART; else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 1952070..5d86e6c 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -615,7 +615,6 @@ int domain_kill(struct domain *d) { if ( rc == -ERESTART ) rc = -EAGAIN; - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 83329ed..87ded49 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,6 +186,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + struct vcpu *vcpu; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 9b8f8de..89322e4 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -132,9 +132,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -144,9 +141,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -206,7 +200,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHh-0004U6-HL; Sun, 24 Aug 2014 23:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHg-0004Tx-Ti for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:17 +0000 Received: from [85.158.137.68:64530] by server-5.bemta-3.messagelabs.com id 19/32-30889-C367AF35; Sun, 24 Aug 2014 23:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1408923194!15522138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13622 invoked from network); 24 Aug 2014 23:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHe-0006lR-57 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHd-0000Om-Pu for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:13 +0000 Date: Sun, 24 Aug 2014 23:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle AArch32 userspace when dumping 64-bit guest state. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc0cafeab30fe93963457fafbad7a01c7f55ea5f Author: Ian Campbell AuthorDate: Tue Aug 12 15:32:27 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:32:27 2014 +0200 xen: arm: handle AArch32 userspace when dumping 64-bit guest state. A 64-bit guest can still be in 32-bit mode when running userspace, handle this case by dumping the correct 32-bit state. Note that on ARM it is not possible to change mode without the help of the next exception level, hence there is no way a 64-bit guest can be running in 32-bit kernel modes. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 76a9586..5adf125 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -697,7 +697,17 @@ static void _show_registers(struct cpu_user_regs *regs, show_registers_32(regs, ctxt, guest_mode, v); #ifdef CONFIG_ARM_64 else if ( is_64bit_domain(v->domain) ) - show_registers_64(regs, ctxt, guest_mode, v); + { + if ( psr_mode_is_32bit(regs->cpsr) ) + { + BUG_ON(!usr_mode(regs)); + show_registers_32(regs, ctxt, guest_mode, v); + } + else + { + show_registers_64(regs, ctxt, guest_mode, v); + } + } #endif } else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHh-0004U6-HL; Sun, 24 Aug 2014 23:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHg-0004Tx-Ti for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:17 +0000 Received: from [85.158.137.68:64530] by server-5.bemta-3.messagelabs.com id 19/32-30889-C367AF35; Sun, 24 Aug 2014 23:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1408923194!15522138!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13622 invoked from network); 24 Aug 2014 23:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHe-0006lR-57 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHd-0000Om-Pu for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:13 +0000 Date: Sun, 24 Aug 2014 23:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle AArch32 userspace when dumping 64-bit guest state. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc0cafeab30fe93963457fafbad7a01c7f55ea5f Author: Ian Campbell AuthorDate: Tue Aug 12 15:32:27 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:32:27 2014 +0200 xen: arm: handle AArch32 userspace when dumping 64-bit guest state. A 64-bit guest can still be in 32-bit mode when running userspace, handle this case by dumping the correct 32-bit state. Note that on ARM it is not possible to change mode without the help of the next exception level, hence there is no way a 64-bit guest can be running in 32-bit kernel modes. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 76a9586..5adf125 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -697,7 +697,17 @@ static void _show_registers(struct cpu_user_regs *regs, show_registers_32(regs, ctxt, guest_mode, v); #ifdef CONFIG_ARM_64 else if ( is_64bit_domain(v->domain) ) - show_registers_64(regs, ctxt, guest_mode, v); + { + if ( psr_mode_is_32bit(regs->cpsr) ) + { + BUG_ON(!usr_mode(regs)); + show_registers_32(regs, ctxt, guest_mode, v); + } + else + { + show_registers_64(regs, ctxt, guest_mode, v); + } + } #endif } else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHs-0004Vg-Jx; Sun, 24 Aug 2014 23:33:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHr-0004VT-Bt for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:27 +0000 Received: from [85.158.137.68:10117] by server-11.bemta-3.messagelabs.com id 8B/22-12220-6467AF35; Sun, 24 Aug 2014 23:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1408923204!15605214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23131 invoked from network); 24 Aug 2014 23:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHo-0006la-Dy for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHo-0000P8-9R for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:24 +0000 Date: Sun, 24 Aug 2014 23:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correctly handle exception injection from userspace on 64-bit. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a98669781769e821413dfef4ef99b93171375610 Author: Ian Campbell AuthorDate: Tue Aug 12 15:36:15 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:36:15 2014 +0200 xen: arm: Correctly handle exception injection from userspace on 64-bit. Firstly we must be prepared to propagate traps from 32-bit userspace even for 64-bit guests, so wrap the existing inject_undef??_exception into inject_undef_exception and use that when injecting an undef exception. The various other exception cases (aborts etc) already do this. Secondly when injecting the trap we must pick the correct exception vector depending on whether the source of the trap was 32-bit EL0, 64-bit EL0 or EL1. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 57 +++++++++++++++++++++++++++++++------- xen/include/asm-arm/processor.h | 18 +++++++----- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 5adf125..7f34f1d 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -286,7 +286,7 @@ static void cpsr_switch_mode(struct cpu_user_regs *regs, int mode) regs->cpsr |= PSR_BIG_ENDIAN; } -static vaddr_t exception_handler(vaddr_t offset) +static vaddr_t exception_handler32(vaddr_t offset) { uint32_t sctlr = READ_SYSREG32(SCTLR_EL1); @@ -318,7 +318,7 @@ static void inject_undef32_exception(struct cpu_user_regs *regs) regs->lr_und = regs->pc32 + return_offset; /* Branch to exception vector */ - regs->pc32 = exception_handler(VECTOR32_UND); + regs->pc32 = exception_handler32(VECTOR32_UND); } /* Injects an Abort exception into the current vcpu, PC is the exact @@ -344,7 +344,7 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, regs->spsr_abt = spsr; regs->lr_abt = regs->pc32 + return_offset; - regs->pc32 = exception_handler(prefetch ? VECTOR32_PABT : VECTOR32_DABT); + regs->pc32 = exception_handler32(prefetch ? VECTOR32_PABT : VECTOR32_DABT); /* Inject a debug fault, best we can do right now */ if ( READ_SYSREG(TCR_EL1) & TTBCR_EAE ) @@ -397,9 +397,28 @@ static void inject_pabt32_exception(struct cpu_user_regs *regs, } #ifdef CONFIG_ARM_64 +/* + * Take care to call this while regs contains the original faulting + * state and not the (partially constructed) exception state. + */ +static vaddr_t exception_handler64(struct cpu_user_regs *regs, vaddr_t offset) +{ + vaddr_t base = READ_SYSREG(VBAR_EL1); + + if ( usr_mode(regs) ) + base += VECTOR64_LOWER32_BASE; + else if ( psr_mode(regs->cpsr,PSR_MODE_EL0t) ) + base += VECTOR64_LOWER64_BASE; + else /* Otherwise must be from kernel mode */ + base += VECTOR64_CURRENT_SPx_BASE; + + return base + offset; +} + /* Inject an undefined exception into a 64 bit guest */ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -408,12 +427,14 @@ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) BUG_ON( is_32bit_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG32(esr.bits, ESR_EL1); } @@ -424,6 +445,7 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -445,12 +467,14 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, BUG_ON( is_32bit_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG(addr, FAR_EL1); WRITE_SYSREG32(esr.bits, ESR_EL1); @@ -472,6 +496,17 @@ static void inject_iabt64_exception(struct cpu_user_regs *regs, #endif +static void inject_undef_exception(struct cpu_user_regs *regs, + int instr_len) +{ + if ( is_32bit_domain(current->domain) ) + inject_undef32_exception(regs); +#ifdef CONFIG_ARM_64 + else + inject_undef64_exception(regs, instr_len); +#endif +} + static void inject_iabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) @@ -1441,7 +1476,7 @@ static void do_cp15_32(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } advance_pc(regs, hsr); @@ -1478,7 +1513,7 @@ static void do_cp15_64(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } } @@ -1547,7 +1582,7 @@ bad_cp: gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } @@ -1574,7 +1609,7 @@ static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) gdprintk(XENLOG_ERR, "unhandled 64-bit CP14 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } static void do_cp(struct cpu_user_regs *regs, union hsr hsr) @@ -1593,7 +1628,7 @@ static void do_cp(struct cpu_user_regs *regs, union hsr hsr) ASSERT(!cp.tas); /* We don't trap SIMD instruction */ gdprintk(XENLOG_ERR, "unhandled CP%d access\n", cp.coproc); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } #ifdef CONFIG_ARM_64 @@ -1668,7 +1703,7 @@ static void do_sysreg(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#x\n", hsr.bits & HSR_SYSREG_REGS_MASK); #endif - inject_undef64_exception(regs, sysreg.len); + inject_undef_exception(regs, sysreg.len); } } diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 9d230f3..bf7c94c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -460,14 +460,16 @@ union hsr { #define VECTOR32_PABT 12 #define VECTOR32_DABT 16 /* ... ARM64 */ -#define VECTOR64_CURRENT_SP0_SYNC 0x000 -#define VECTOR64_CURRENT_SP0_IRQ 0x080 -#define VECTOR64_CURRENT_SP0_FIQ 0x100 -#define VECTOR64_CURRENT_SP0_ERROR 0x180 -#define VECTOR64_CURRENT_SPx_SYNC 0x200 -#define VECTOR64_CURRENT_SPx_IRQ 0x280 -#define VECTOR64_CURRENT_SPx_FIQ 0x300 -#define VECTOR64_CURRENT_SPx_ERROR 0x380 +#define VECTOR64_CURRENT_SP0_BASE 0x000 +#define VECTOR64_CURRENT_SPx_BASE 0x200 +#define VECTOR64_LOWER64_BASE 0x400 +#define VECTOR64_LOWER32_BASE 0x600 + +#define VECTOR64_SYNC_OFFSET 0x000 +#define VECTOR64_IRQ_OFFSET 0x080 +#define VECTOR64_FIQ_OFFSET 0x100 +#define VECTOR64_ERROR_OFFSET 0x180 + #if defined(CONFIG_ARM_32) # include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHs-0004Vg-Jx; Sun, 24 Aug 2014 23:33:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHr-0004VT-Bt for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:27 +0000 Received: from [85.158.137.68:10117] by server-11.bemta-3.messagelabs.com id 8B/22-12220-6467AF35; Sun, 24 Aug 2014 23:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1408923204!15605214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23131 invoked from network); 24 Aug 2014 23:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHo-0006la-Dy for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHo-0000P8-9R for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:24 +0000 Date: Sun, 24 Aug 2014 23:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correctly handle exception injection from userspace on 64-bit. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a98669781769e821413dfef4ef99b93171375610 Author: Ian Campbell AuthorDate: Tue Aug 12 15:36:15 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:36:15 2014 +0200 xen: arm: Correctly handle exception injection from userspace on 64-bit. Firstly we must be prepared to propagate traps from 32-bit userspace even for 64-bit guests, so wrap the existing inject_undef??_exception into inject_undef_exception and use that when injecting an undef exception. The various other exception cases (aborts etc) already do this. Secondly when injecting the trap we must pick the correct exception vector depending on whether the source of the trap was 32-bit EL0, 64-bit EL0 or EL1. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 57 +++++++++++++++++++++++++++++++------- xen/include/asm-arm/processor.h | 18 +++++++----- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 5adf125..7f34f1d 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -286,7 +286,7 @@ static void cpsr_switch_mode(struct cpu_user_regs *regs, int mode) regs->cpsr |= PSR_BIG_ENDIAN; } -static vaddr_t exception_handler(vaddr_t offset) +static vaddr_t exception_handler32(vaddr_t offset) { uint32_t sctlr = READ_SYSREG32(SCTLR_EL1); @@ -318,7 +318,7 @@ static void inject_undef32_exception(struct cpu_user_regs *regs) regs->lr_und = regs->pc32 + return_offset; /* Branch to exception vector */ - regs->pc32 = exception_handler(VECTOR32_UND); + regs->pc32 = exception_handler32(VECTOR32_UND); } /* Injects an Abort exception into the current vcpu, PC is the exact @@ -344,7 +344,7 @@ static void inject_abt32_exception(struct cpu_user_regs *regs, regs->spsr_abt = spsr; regs->lr_abt = regs->pc32 + return_offset; - regs->pc32 = exception_handler(prefetch ? VECTOR32_PABT : VECTOR32_DABT); + regs->pc32 = exception_handler32(prefetch ? VECTOR32_PABT : VECTOR32_DABT); /* Inject a debug fault, best we can do right now */ if ( READ_SYSREG(TCR_EL1) & TTBCR_EAE ) @@ -397,9 +397,28 @@ static void inject_pabt32_exception(struct cpu_user_regs *regs, } #ifdef CONFIG_ARM_64 +/* + * Take care to call this while regs contains the original faulting + * state and not the (partially constructed) exception state. + */ +static vaddr_t exception_handler64(struct cpu_user_regs *regs, vaddr_t offset) +{ + vaddr_t base = READ_SYSREG(VBAR_EL1); + + if ( usr_mode(regs) ) + base += VECTOR64_LOWER32_BASE; + else if ( psr_mode(regs->cpsr,PSR_MODE_EL0t) ) + base += VECTOR64_LOWER64_BASE; + else /* Otherwise must be from kernel mode */ + base += VECTOR64_CURRENT_SPx_BASE; + + return base + offset; +} + /* Inject an undefined exception into a 64 bit guest */ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -408,12 +427,14 @@ static void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) BUG_ON( is_32bit_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG32(esr.bits, ESR_EL1); } @@ -424,6 +445,7 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) { + vaddr_t handler; union hsr esr = { .iss = 0, .len = instr_len, @@ -445,12 +467,14 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, BUG_ON( is_32bit_domain(current->domain) ); + handler = exception_handler64(regs, VECTOR64_SYNC_OFFSET); + regs->spsr_el1 = regs->cpsr; regs->elr_el1 = regs->pc; regs->cpsr = PSR_MODE_EL1h | PSR_ABT_MASK | PSR_FIQ_MASK | \ PSR_IRQ_MASK | PSR_DBG_MASK; - regs->pc = READ_SYSREG(VBAR_EL1) + VECTOR64_CURRENT_SPx_SYNC; + regs->pc = handler; WRITE_SYSREG(addr, FAR_EL1); WRITE_SYSREG32(esr.bits, ESR_EL1); @@ -472,6 +496,17 @@ static void inject_iabt64_exception(struct cpu_user_regs *regs, #endif +static void inject_undef_exception(struct cpu_user_regs *regs, + int instr_len) +{ + if ( is_32bit_domain(current->domain) ) + inject_undef32_exception(regs); +#ifdef CONFIG_ARM_64 + else + inject_undef64_exception(regs, instr_len); +#endif +} + static void inject_iabt_exception(struct cpu_user_regs *regs, register_t addr, int instr_len) @@ -1441,7 +1476,7 @@ static void do_cp15_32(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } advance_pc(regs, hsr); @@ -1478,7 +1513,7 @@ static void do_cp15_64(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } } @@ -1547,7 +1582,7 @@ bad_cp: gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#x\n", hsr.bits & HSR_CP32_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); return; } @@ -1574,7 +1609,7 @@ static void do_cp14_dbg(struct cpu_user_regs *regs, union hsr hsr) gdprintk(XENLOG_ERR, "unhandled 64-bit CP14 access %#x\n", hsr.bits & HSR_CP64_REGS_MASK); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } static void do_cp(struct cpu_user_regs *regs, union hsr hsr) @@ -1593,7 +1628,7 @@ static void do_cp(struct cpu_user_regs *regs, union hsr hsr) ASSERT(!cp.tas); /* We don't trap SIMD instruction */ gdprintk(XENLOG_ERR, "unhandled CP%d access\n", cp.coproc); #endif - inject_undef32_exception(regs); + inject_undef_exception(regs, hsr.len); } #ifdef CONFIG_ARM_64 @@ -1668,7 +1703,7 @@ static void do_sysreg(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#x\n", hsr.bits & HSR_SYSREG_REGS_MASK); #endif - inject_undef64_exception(regs, sysreg.len); + inject_undef_exception(regs, sysreg.len); } } diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 9d230f3..bf7c94c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -460,14 +460,16 @@ union hsr { #define VECTOR32_PABT 12 #define VECTOR32_DABT 16 /* ... ARM64 */ -#define VECTOR64_CURRENT_SP0_SYNC 0x000 -#define VECTOR64_CURRENT_SP0_IRQ 0x080 -#define VECTOR64_CURRENT_SP0_FIQ 0x100 -#define VECTOR64_CURRENT_SP0_ERROR 0x180 -#define VECTOR64_CURRENT_SPx_SYNC 0x200 -#define VECTOR64_CURRENT_SPx_IRQ 0x280 -#define VECTOR64_CURRENT_SPx_FIQ 0x300 -#define VECTOR64_CURRENT_SPx_ERROR 0x380 +#define VECTOR64_CURRENT_SP0_BASE 0x000 +#define VECTOR64_CURRENT_SPx_BASE 0x200 +#define VECTOR64_LOWER64_BASE 0x400 +#define VECTOR64_LOWER32_BASE 0x600 + +#define VECTOR64_SYNC_OFFSET 0x000 +#define VECTOR64_IRQ_OFFSET 0x080 +#define VECTOR64_FIQ_OFFSET 0x100 +#define VECTOR64_ERROR_OFFSET 0x180 + #if defined(CONFIG_ARM_32) # include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhI2-0004XD-Ms; Sun, 24 Aug 2014 23:33:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhI1-0004Wu-5n for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:37 +0000 Received: from [85.158.137.68:59988] by server-10.bemta-3.messagelabs.com id E4/B2-01456-0567AF35; Sun, 24 Aug 2014 23:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1408923214!15605231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23322 invoked from network); 24 Aug 2014 23:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHy-0006li-J7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHy-0000PZ-Gd for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:34 +0000 Date: Sun, 24 Aug 2014 23:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0020e0997024eb741d60de9a480bf2878f891af Author: Ian Campbell AuthorDate: Tue Aug 12 15:37:25 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:37:25 2014 +0200 xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef We are not setup to handle these properly. This turns a host crash into a trap to the guest kernel which will likely result in killing the offending process. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7f34f1d..ae594ca 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1841,6 +1841,17 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) enter_hypervisor_head(regs); + /* + * We currently do not handle 32-bit userspace on 64-bit kernels + * correctly (See XSA-102). Until that is resolved we treat any + * trap from 32-bit userspace on 64-bit kernel as undefined. + */ + if ( is_64bit_domain(current->domain) && psr_mode_is_32bit(regs->cpsr) ) + { + inject_undef_exception(regs, hsr.len); + return; + } + switch (hsr.ec) { case HSR_EC_WFI_WFE: if ( !check_conditional_instr(regs, hsr) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhI2-0004XD-Ms; Sun, 24 Aug 2014 23:33:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhI1-0004Wu-5n for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:37 +0000 Received: from [85.158.137.68:59988] by server-10.bemta-3.messagelabs.com id E4/B2-01456-0567AF35; Sun, 24 Aug 2014 23:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1408923214!15605231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23322 invoked from network); 24 Aug 2014 23:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhHy-0006li-J7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhHy-0000PZ-Gd for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:34 +0000 Date: Sun, 24 Aug 2014 23:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0020e0997024eb741d60de9a480bf2878f891af Author: Ian Campbell AuthorDate: Tue Aug 12 15:37:25 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:37:25 2014 +0200 xen: arm: Handle traps from 32-bit userspace on 64-bit kernel as undef We are not setup to handle these properly. This turns a host crash into a trap to the guest kernel which will likely result in killing the offending process. This is part of CVE-2014-5147 / XSA-102. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/traps.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 7f34f1d..ae594ca 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1841,6 +1841,17 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) enter_hypervisor_head(regs); + /* + * We currently do not handle 32-bit userspace on 64-bit kernels + * correctly (See XSA-102). Until that is resolved we treat any + * trap from 32-bit userspace on 64-bit kernel as undefined. + */ + if ( is_64bit_domain(current->domain) && psr_mode_is_32bit(regs->cpsr) ) + { + inject_undef_exception(regs, hsr.len); + return; + } + switch (hsr.ec) { case HSR_EC_WFI_WFE: if ( !check_conditional_instr(regs, hsr) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIC-0004Yk-Q0; Sun, 24 Aug 2014 23:33:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIB-0004YQ-Dw for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:47 +0000 Received: from [85.158.137.68:10589] by server-8.bemta-3.messagelabs.com id 12/52-31195-A567AF35; Sun, 24 Aug 2014 23:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1408923225!15522182!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14396 invoked from network); 24 Aug 2014 23:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhI8-0006lo-Qr for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhI8-0000Pv-Mx for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:44 +0000 Date: Sun, 24 Aug 2014 23:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f2ae8bfa498831ee6343d672066b898d3cd73892 Author: Ian Campbell AuthorDate: Tue Aug 12 15:38:01 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:38:01 2014 +0200 xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace The do_sysreg case was missing a return, so it would increment PC and inject the trap to the second instruction of the handler. This is CVE-2014-5148 / XSA-103. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Julien Grall --- xen/arch/arm/traps.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ae594ca..683b440 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1704,6 +1704,7 @@ static void do_sysreg(struct cpu_user_regs *regs, hsr.bits & HSR_SYSREG_REGS_MASK); #endif inject_undef_exception(regs, sysreg.len); + return; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIC-0004Yk-Q0; Sun, 24 Aug 2014 23:33:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIB-0004YQ-Dw for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:47 +0000 Received: from [85.158.137.68:10589] by server-8.bemta-3.messagelabs.com id 12/52-31195-A567AF35; Sun, 24 Aug 2014 23:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1408923225!15522182!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14396 invoked from network); 24 Aug 2014 23:33:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhI8-0006lo-Qr for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhI8-0000Pv-Mx for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:44 +0000 Date: Sun, 24 Aug 2014 23:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f2ae8bfa498831ee6343d672066b898d3cd73892 Author: Ian Campbell AuthorDate: Tue Aug 12 15:38:01 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 12 15:38:01 2014 +0200 xen: arm: Correctly handle do_sysreg exception injection from 64-bit userspace The do_sysreg case was missing a return, so it would increment PC and inject the trap to the second instruction of the handler. This is CVE-2014-5148 / XSA-103. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson Acked-by: Julien Grall --- xen/arch/arm/traps.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ae594ca..683b440 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1704,6 +1704,7 @@ static void do_sysreg(struct cpu_user_regs *regs, hsr.bits & HSR_SYSREG_REGS_MASK); #endif inject_undef_exception(regs, sysreg.len); + return; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIN-0004aP-TI; Sun, 24 Aug 2014 23:33:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIM-0004a4-ET for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:58 +0000 Received: from [85.158.143.35:49532] by server-1.bemta-4.messagelabs.com id B7/90-05872-5667AF35; Sun, 24 Aug 2014 23:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1408923235!12940884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8181 invoked from network); 24 Aug 2014 23:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhII-0006lx-W7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhII-0000R0-Uk for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:54 +0000 Date: Sun, 24 Aug 2014 23:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 974516cc54e627efea424f963ebd644dc54b55ea Author: Ian Jackson AuthorDate: Tue Aug 19 12:54:59 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:54:59 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit 95e6d82224689fdfd967a093a4d69efc24c17e91. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 198 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 185 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 41f7817..f7e0e78 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1924,9 +1924,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 70da575..d1517c4 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -64,9 +64,6 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); - if ( ret == -ERESTART ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 101d1a1..abf3d7a 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -577,7 +577,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -ERESTART; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index c8c4918..455000d 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -ERESTART; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -ERESTART; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -242,25 +187,15 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -ERESTART ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -400,9 +335,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -410,22 +343,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -454,15 +374,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -497,51 +419,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -ERESTART; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -ERESTART; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -ERESTART); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -552,7 +441,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -616,6 +504,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -659,7 +553,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -682,19 +575,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "%pv: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current, sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -718,13 +598,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -735,24 +615,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -ERESTART ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 9f2882f..3c803b6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3705,7 +3705,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -ERESTART; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 5d86e6c..1952070 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -615,6 +615,7 @@ int domain_kill(struct domain *d) { if ( rc == -ERESTART ) rc = -EAGAIN; + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 87ded49..83329ed 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,20 +186,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 89322e4..9b8f8de 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -132,6 +132,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -141,6 +144,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -200,7 +206,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:33:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:33:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIN-0004aP-TI; Sun, 24 Aug 2014 23:33:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIM-0004a4-ET for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:58 +0000 Received: from [85.158.143.35:49532] by server-1.bemta-4.messagelabs.com id B7/90-05872-5667AF35; Sun, 24 Aug 2014 23:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1408923235!12940884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8181 invoked from network); 24 Aug 2014 23:33:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhII-0006lx-W7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhII-0000R0-Uk for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:33:54 +0000 Date: Sun, 24 Aug 2014 23:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86/paging: make log-dirty operations preemptible" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 974516cc54e627efea424f963ebd644dc54b55ea Author: Ian Jackson AuthorDate: Tue Aug 19 12:54:59 2014 +0100 Commit: Ian Jackson CommitDate: Tue Aug 19 12:54:59 2014 +0100 Revert "x86/paging: make log-dirty operations preemptible" This reverts commit 95e6d82224689fdfd967a093a4d69efc24c17e91. This fix has been discovered to cause regressions. Investigations are ongoing. Revert-reqeuested-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 3 - xen/arch/x86/mm/hap/hap.c | 3 +- xen/arch/x86/mm/paging.c | 198 +++++++-------------------------------- xen/arch/x86/mm/shadow/common.c | 3 +- xen/common/domain.c | 1 + xen/include/asm-x86/domain.h | 14 --- xen/include/asm-x86/paging.h | 8 ++- 8 files changed, 49 insertions(+), 185 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 41f7817..f7e0e78 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1924,9 +1924,7 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - ret = paging_teardown(d); - if ( ret ) - return ret; + paging_teardown(d); /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 70da575..d1517c4 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -64,9 +64,6 @@ long arch_do_domctl( ret = paging_domctl(d, &domctl->u.shadow_op, guest_handle_cast(u_domctl, void)); - if ( ret == -ERESTART ) - return hypercall_create_continuation(__HYPERVISOR_domctl, - "h", u_domctl); copyback = 1; } break; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 101d1a1..abf3d7a 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -577,7 +577,8 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -ERESTART; + rc = hypercall_create_continuation(__HYPERVISOR_domctl, "h", + u_domctl); else /* Finished. Return the new allocation */ sc->mb = hap_get_allocation(d); diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index c8c4918..455000d 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -117,46 +116,26 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -static int paging_free_log_dirty_bitmap(struct domain *d, int rc) +void paging_free_log_dirty_bitmap(struct domain *d) { mfn_t *l4, *l3, *l2; int i4, i3, i2; - paging_lock(d); - if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - { - paging_unlock(d); - return 0; - } + return; - if ( !d->arch.paging.preempt.vcpu ) - { - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - ASSERT(rc <= 0); - d->arch.paging.preempt.log_dirty.done = -rc; - } - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) - { - paging_unlock(d); - return -EBUSY; - } + paging_lock(d); l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - rc = 0; - for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) + for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -169,54 +148,20 @@ static int paging_free_log_dirty_bitmap(struct domain *d, int rc) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); - l3[i3] = _mfn(INVALID_MFN); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i4 = i4; - rc = -ERESTART; - break; - } } unmap_domain_page(l3); - if ( rc ) - break; paging_free_log_dirty_page(d, l4[i4]); - l4[i4] = _mfn(INVALID_MFN); - - if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - rc = -ERESTART; - break; - } } unmap_domain_page(l4); + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - if ( !rc ) - { - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; - - rc = -d->arch.paging.preempt.log_dirty.done; - d->arch.paging.preempt.vcpu = NULL; - } - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; - } + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; paging_unlock(d); - - return rc; } int paging_log_dirty_enable(struct domain *d, bool_t log_global) @@ -242,25 +187,15 @@ int paging_log_dirty_enable(struct domain *d, bool_t log_global) return ret; } -static int paging_log_dirty_disable(struct domain *d, bool_t resuming) +int paging_log_dirty_disable(struct domain *d) { - int ret = 1; - - if ( !resuming ) - { - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - ASSERT(ret <= 0); - } + int ret; + domain_pause(d); + /* Safe because the domain is paused. */ + ret = d->arch.paging.log_dirty.disable_log_dirty(d); if ( !paging_mode_log_dirty(d) ) - { - ret = paging_free_log_dirty_bitmap(d, ret); - if ( ret == -ERESTART ) - return ret; - } - + paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -400,9 +335,7 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -static int paging_log_dirty_op(struct domain *d, - struct xen_domctl_shadow_op *sc, - bool_t resuming) +int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -410,22 +343,9 @@ static int paging_log_dirty_op(struct domain *d, unsigned long *l1 = NULL; int i4, i3, i2; - if ( !resuming ) - domain_pause(d); + domain_pause(d); paging_lock(d); - if ( !d->arch.paging.preempt.vcpu ) - memset(&d->arch.paging.preempt.log_dirty, 0, - sizeof(d->arch.paging.preempt.log_dirty)); - else if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - paging_unlock(d); - ASSERT(!resuming); - domain_unpause(d); - return -EBUSY; - } - clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -454,15 +374,17 @@ static int paging_log_dirty_op(struct domain *d, goto out; } + pages = 0; l4 = paging_map_log_dirty_bitmap(d); - i4 = d->arch.paging.preempt.log_dirty.i4; - i3 = d->arch.paging.preempt.log_dirty.i3; - pages = d->arch.paging.preempt.log_dirty.done; - for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) + for ( i4 = 0; + (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); + i4++ ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( i3 = 0; + (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -497,51 +419,18 @@ static int paging_log_dirty_op(struct domain *d, } if ( l2 ) unmap_domain_page(l2); - - if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - rv = -ERESTART; - break; - } } if ( l3 ) unmap_domain_page(l3); - - if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && - hypercall_preempt_check() ) - { - d->arch.paging.preempt.log_dirty.i4 = i4 + 1; - d->arch.paging.preempt.log_dirty.i3 = 0; - rv = -ERESTART; - } - if ( rv ) - break; } if ( l4 ) unmap_domain_page(l4); - if ( !rv ) - d->arch.paging.preempt.vcpu = NULL; - else - { - d->arch.paging.preempt.vcpu = current; - d->arch.paging.preempt.op = sc->op; - d->arch.paging.preempt.log_dirty.done = pages; - } + if ( pages < sc->pages ) + sc->pages = pages; paging_unlock(d); - if ( rv ) - { - /* Never leave the domain paused for other errors. */ - ASSERT(rv == -ERESTART); - return rv; - } - - if ( pages < sc->pages ) - sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -552,7 +441,6 @@ static int paging_log_dirty_op(struct domain *d, return rv; out: - d->arch.paging.preempt.vcpu = NULL; paging_unlock(d); domain_unpause(d); @@ -616,6 +504,12 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } +/* This function fress log dirty bitmap resources. */ +static void paging_log_dirty_teardown(struct domain*d) +{ + paging_free_log_dirty_bitmap(d); +} + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -659,7 +553,6 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl) { - bool_t resuming = 0; int rc; if ( unlikely(d == current->domain) ) @@ -682,19 +575,6 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } - if ( d->arch.paging.preempt.vcpu ) - { - if ( d->arch.paging.preempt.vcpu != current || - d->arch.paging.preempt.op != sc->op ) - { - printk(XENLOG_G_DEBUG - "%pv: Paging op %#x on Dom%u with unfinished prior op %#x\n", - current, sc->op, d->domain_id, d->arch.paging.preempt.op); - return -EBUSY; - } - resuming = 1; - } - rc = xsm_shadow_control(XSM_HOOK, d, sc->op); if ( rc ) return rc; @@ -718,13 +598,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + if ( (rc = paging_log_dirty_disable(d)) != 0 ) return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc, resuming); + return paging_log_dirty_op(d, sc); } /* Here, dispatch domctl to the appropriate paging code */ @@ -735,24 +615,18 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, } /* Call when destroying a domain */ -int paging_teardown(struct domain *d) +void paging_teardown(struct domain *d) { - int rc; - if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - rc = paging_free_log_dirty_bitmap(d, 0); - if ( rc == -ERESTART ) - return rc; + paging_log_dirty_teardown(d); /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); - - return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 9f2882f..3c803b6 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3705,7 +3705,8 @@ int shadow_domctl(struct domain *d, paging_unlock(d); if ( preempted ) /* Not finished. Set up to re-run the call. */ - rc = -ERESTART; + rc = hypercall_create_continuation( + __HYPERVISOR_domctl, "h", u_domctl); else /* Finished. Return the new allocation */ sc->mb = shadow_get_allocation(d); diff --git a/xen/common/domain.c b/xen/common/domain.c index 5d86e6c..1952070 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -615,6 +615,7 @@ int domain_kill(struct domain *d) { if ( rc == -ERESTART ) rc = -EAGAIN; + BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 87ded49..83329ed 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -186,20 +186,6 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; - - /* preemption handling */ - struct { - struct vcpu *vcpu; - unsigned int op; - union { - struct { - unsigned long done:PADDR_BITS - PAGE_SHIFT; - unsigned long i4:PAGETABLE_ORDER; - unsigned long i3:PAGETABLE_ORDER; - } log_dirty; - }; - } preempt; - /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 89322e4..9b8f8de 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -132,6 +132,9 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +/* free log dirty bitmap resource */ +void paging_free_log_dirty_bitmap(struct domain *d); + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -141,6 +144,9 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d, bool_t log_global); +/* disable log dirty */ +int paging_log_dirty_disable(struct domain *d); + /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d, @@ -200,7 +206,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -int paging_teardown(struct domain *d); +void paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIa-0004cG-1r; Sun, 24 Aug 2014 23:34:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIY-0004c5-8l for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:10 +0000 Received: from [85.158.143.35:51821] by server-1.bemta-4.messagelabs.com id 85/A0-05872-1767AF35; Sun, 24 Aug 2014 23:34:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1408923245!12984119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7899 invoked from network); 24 Aug 2014 23:34:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIT-0006mU-6G for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhIT-0000RW-2s for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:05 +0000 Date: Sun, 24 Aug 2014 23:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm : emulation of arm's PSCI v0.2 standard X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4da570a4deec84b0ab9ee8e97d0148d443d97564 Author: Parth Dixit AuthorDate: Thu Aug 14 12:53:00 2014 +0530 Commit: Ian Campbell CommitDate: Thu Aug 21 23:03:27 2014 +0100 xen/arm : emulation of arm's PSCI v0.2 standard Arm based virtual machines dom0/guest will request power related functionality from xen through PSCI interface. This patch implements version 0.2 of PSCI standard specified by arm for 64bit and 32 bit arm machines. Signed-off-by: Parth Dixit Acked-by: Ian Campbell [ ijc -- switch include n vpsci.c from asm-arm/event.h to asm/event.h ] --- tools/libxl/libxl_arm.c | 2 +- xen/arch/arm/domain_build.c | 5 +- xen/arch/arm/traps.c | 127 +++++++++++++++++++++++++++---------- xen/arch/arm/vpsci.c | 131 +++++++++++++++++++++++++++++++++++++-- xen/include/asm-arm/processor.h | 3 + xen/include/asm-arm/psci.h | 83 ++++++++++++++++++++++--- 6 files changed, 301 insertions(+), 50 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index e19e2f4..3d30242 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -260,7 +260,7 @@ static int make_psci_node(libxl__gc *gc, void *fdt) res = fdt_begin_node(fdt, "psci"); if (res) return res; - res = fdt_property_compat(gc, fdt, 1, "arm,psci"); + res = fdt_property_compat(gc, fdt, 2, "arm,psci-0.2","arm,psci"); if (res) return res; res = fdt_property_string(fdt, "method", "hvc"); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 23261e4..51d793a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -637,6 +637,9 @@ static int make_hypervisor_node(struct domain *d, static int make_psci_node(void *fdt, const struct dt_device_node *parent) { int res; + const char compat[] = + "arm,psci-0.2""\0" + "arm,psci"; DPRINT("Create PSCI node\n"); @@ -645,7 +648,7 @@ static int make_psci_node(void *fdt, const struct dt_device_node *parent) if ( res ) return res; - res = fdt_property_string(fdt, "compatible", "arm,psci"); + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); if ( res ) return res; diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 683b440..019991f 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1082,24 +1082,6 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL_ARM(vcpu_op, 3), }; -typedef int (*arm_psci_fn_t)(uint32_t, register_t); - -typedef struct { - arm_psci_fn_t fn; - int nr_args; -} arm_psci_t; - -#define PSCI(_name, _nr_args) \ - [ PSCI_ ## _name ] = { \ - .fn = (arm_psci_fn_t) &do_psci_ ## _name, \ - .nr_args = _nr_args, \ - } - -static arm_psci_t arm_psci_table[] = { - PSCI(cpu_off, 1), - PSCI(cpu_on, 2), -}; - #ifndef NDEBUG static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) { @@ -1132,33 +1114,108 @@ static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) #endif #ifdef CONFIG_ARM_64 -#define PSCI_OP_REG(r) (r)->x0 -#define PSCI_RESULT_REG(r) (r)->x0 -#define PSCI_ARGS(r) (r)->x1, (r)->x2 +#define PSCI_RESULT_REG(reg) (reg)->x0 +#define PSCI_ARG(reg,n) (reg)->x##n +#define PSCI_ARG32(reg,n) (uint32_t)( (reg)->x##n & 0x00000000FFFFFFFF ) #else -#define PSCI_OP_REG(r) (r)->r0 -#define PSCI_RESULT_REG(r) (r)->r0 -#define PSCI_ARGS(r) (r)->r1, (r)->r2 +#define PSCI_RESULT_REG(reg) (reg)->r0 +#define PSCI_ARG(reg,n) (reg)->r##n +#define PSCI_ARG32(reg,n) PSCI_ARG(reg,n) #endif -static void do_trap_psci(struct cpu_user_regs *regs) +/* helper function for checking arm mode 32/64 bit */ +static inline int psci_mode_check(struct domain *d, register_t fid) { - arm_psci_fn_t psci_call = NULL; + return !( is_64bit_domain(d)^( (fid & PSCI_0_2_64BIT) >> 30 ) ); +} - if ( PSCI_OP_REG(regs) >= ARRAY_SIZE(arm_psci_table) ) - { - domain_crash_synchronous(); - return; - } +static void do_trap_psci(struct cpu_user_regs *regs) +{ + register_t fid = PSCI_ARG(regs,0); - psci_call = arm_psci_table[PSCI_OP_REG(regs)].fn; - if ( psci_call == NULL ) + /* preloading in case psci_mode_check fails */ + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; + switch( fid ) { + case PSCI_cpu_off: + { + uint32_t pstate = PSCI_ARG32(regs,1); + PSCI_RESULT_REG(regs) = do_psci_cpu_off(pstate); + } + break; + case PSCI_cpu_on: + { + uint32_t vcpuid = PSCI_ARG32(regs,1); + register_t epoint = PSCI_ARG(regs,2); + PSCI_RESULT_REG(regs) = do_psci_cpu_on(vcpuid, epoint); + } + break; + case PSCI_0_2_FN_PSCI_VERSION: + PSCI_RESULT_REG(regs) = do_psci_0_2_version(); + break; + case PSCI_0_2_FN_CPU_OFF: + PSCI_RESULT_REG(regs) = do_psci_0_2_cpu_off(); + break; + case PSCI_0_2_FN_MIGRATE_INFO_TYPE: + PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_type(); + break; + case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: + case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU: + if ( psci_mode_check(current->domain, fid) ) + PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_up_cpu(); + break; + case PSCI_0_2_FN_SYSTEM_OFF: + do_psci_0_2_system_off(); + PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; + break; + case PSCI_0_2_FN_SYSTEM_RESET: + do_psci_0_2_system_reset(); + PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; + break; + case PSCI_0_2_FN_CPU_ON: + case PSCI_0_2_FN64_CPU_ON: + if ( psci_mode_check(current->domain, fid) ) + { + register_t vcpuid = PSCI_ARG(regs,1); + register_t epoint = PSCI_ARG(regs,2); + register_t cid = PSCI_ARG(regs,3); + PSCI_RESULT_REG(regs) = + do_psci_0_2_cpu_on(vcpuid, epoint, cid); + } + break; + case PSCI_0_2_FN_CPU_SUSPEND: + case PSCI_0_2_FN64_CPU_SUSPEND: + if ( psci_mode_check(current->domain, fid) ) + { + uint32_t pstate = PSCI_ARG32(regs,1); + register_t epoint = PSCI_ARG(regs,2); + register_t cid = PSCI_ARG(regs,3); + PSCI_RESULT_REG(regs) = + do_psci_0_2_cpu_suspend(pstate, epoint, cid); + } + break; + case PSCI_0_2_FN_AFFINITY_INFO: + case PSCI_0_2_FN64_AFFINITY_INFO: + if ( psci_mode_check(current->domain, fid) ) + { + register_t taff = PSCI_ARG(regs,1); + uint32_t laff = PSCI_ARG32(regs,2); + PSCI_RESULT_REG(regs) = + do_psci_0_2_affinity_info(taff, laff); + } + break; + case PSCI_0_2_FN_MIGRATE: + case PSCI_0_2_FN64_MIGRATE: + if ( psci_mode_check(current->domain, fid) ) + { + uint32_t tcpu = PSCI_ARG32(regs,1); + PSCI_RESULT_REG(regs) = do_psci_0_2_migrate(tcpu); + } + break; + default: domain_crash_synchronous(); return; } - - PSCI_RESULT_REG(regs) = psci_call(PSCI_ARGS(regs)); } #ifdef CONFIG_ARM_64 diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index 80678f6..3f2a482 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -18,24 +18,38 @@ #include #include #include +#include -int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) +#include + +static int do_common_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id,int ver) { struct vcpu *v; struct domain *d = current->domain; struct vcpu_guest_context *ctxt; int rc; int is_thumb = entry_point & 1; + register_t vcpuid; + + if( ver == XEN_PSCI_V_0_2 ) + vcpuid = (target_cpu & MPIDR_HWID_MASK); + else + vcpuid = target_cpu; if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) ) - return PSCI_EINVAL; + return PSCI_INVALID_PARAMETERS; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) - return PSCI_EINVAL; + return PSCI_INVALID_PARAMETERS; /* THUMB set is not allowed with 64-bit domain */ if ( is_64bit_domain(d) && is_thumb ) - return PSCI_EINVAL; + return PSCI_INVALID_PARAMETERS; + + if( ( ver == XEN_PSCI_V_0_2 ) && + ( !test_bit(_VPF_down, &v->pause_flags) ) ) + return PSCI_ALREADY_ON; if ( (ctxt = alloc_vcpu_guest_context()) == NULL ) return PSCI_DENIED; @@ -49,10 +63,18 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ if ( is_32bit_domain(d) ) + { ctxt->user_regs.cpsr = PSR_GUEST32_INIT; + if( ver == XEN_PSCI_V_0_2 ) + ctxt->user_regs.r0_usr = context_id; + } #ifdef CONFIG_ARM_64 else + { ctxt->user_regs.cpsr = PSR_GUEST64_INIT; + if( ver == XEN_PSCI_V_0_2 ) + ctxt->user_regs.x0 = context_id; + } #endif /* Start the VCPU with THUMB set if it's requested by the kernel */ @@ -76,7 +98,12 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) return PSCI_SUCCESS; } -int do_psci_cpu_off(uint32_t power_state) +int32_t do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) +{ + return do_common_cpu_on(vcpuid,entry_point,0,XEN_PSCI_V_0_1); +} + +int32_t do_psci_cpu_off(uint32_t power_state) { struct vcpu *v = current; if ( !test_and_set_bit(_VPF_down, &v->pause_flags) ) @@ -84,6 +111,100 @@ int do_psci_cpu_off(uint32_t power_state) return PSCI_SUCCESS; } +uint32_t do_psci_0_2_version(void) +{ + return XEN_PSCI_V_0_2; +} + +register_t do_psci_0_2_cpu_suspend(uint32_t power_state, register_t entry_point, + register_t context_id) +{ + struct vcpu *v = current; + + /* + * Power off requests are treated as performing standby + * as this simplifies Xen implementation. + */ + + vcpu_block_unless_event_pending(v); + return PSCI_SUCCESS; +} + +int32_t do_psci_0_2_cpu_off(void) +{ + return do_psci_cpu_off(0); +} + +int32_t do_psci_0_2_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id) +{ + return do_common_cpu_on(target_cpu,entry_point,context_id,XEN_PSCI_V_0_2); +} + +static const unsigned long target_affinity_mask[] = { + ( MPIDR_HWID_MASK & AFFINITY_MASK( 0 ) ), + ( MPIDR_HWID_MASK & AFFINITY_MASK( 1 ) ), + ( MPIDR_HWID_MASK & AFFINITY_MASK( 2 ) ) +#ifdef CONFIG_ARM_64 + ,( MPIDR_HWID_MASK & AFFINITY_MASK( 3 ) ) +#endif +}; + +int32_t do_psci_0_2_affinity_info(register_t target_affinity, + uint32_t lowest_affinity_level) +{ + struct domain *d = current->domain; + struct vcpu *v; + uint32_t vcpuid; + unsigned long tmask; + + if ( lowest_affinity_level < ARRAY_SIZE(target_affinity_mask) ) + { + tmask = target_affinity_mask[lowest_affinity_level]; + target_affinity &= tmask; + } + else + return PSCI_INVALID_PARAMETERS; + + for ( vcpuid = 0; vcpuid < d->max_vcpus; vcpuid++ ) + { + v = d->vcpu[vcpuid]; + + if ( ( ( v->arch.vmpidr & tmask ) == target_affinity ) + && ( !test_bit(_VPF_down, &v->pause_flags) ) ) + return PSCI_0_2_AFFINITY_LEVEL_ON; + } + + return PSCI_0_2_AFFINITY_LEVEL_OFF; +} + +int32_t do_psci_0_2_migrate(uint32_t target_cpu) +{ + return PSCI_NOT_SUPPORTED; +} + +uint32_t do_psci_0_2_migrate_info_type(void) +{ + return PSCI_0_2_TOS_MP_OR_NOT_PRESENT; +} + +register_t do_psci_0_2_migrate_info_up_cpu(void) +{ + return PSCI_NOT_SUPPORTED; +} + +void do_psci_0_2_system_off( void ) +{ + struct domain *d = current->domain; + domain_shutdown(d,SHUTDOWN_poweroff); +} + +void do_psci_0_2_system_reset(void) +{ + struct domain *d = current->domain; + domain_shutdown(d,SHUTDOWN_reboot); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index bf7c94c..0b74657 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -16,6 +16,9 @@ #define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) #define MPIDR_HWID_MASK _AC(0xffffff,U) #define MPIDR_INVALID (~MPIDR_HWID_MASK) +#define MPIDR_LEVEL_BITS (8) +#define AFFINITY_MASK(level) ~((_AC(0x1,U) << ((level) * MPIDR_LEVEL_BITS)) - 1) + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE _AC(0x80000000,U) diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index 189964b..9777c03 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -1,10 +1,16 @@ #ifndef __ASM_PSCI_H__ #define __ASM_PSCI_H__ -#define PSCI_SUCCESS 0 -#define PSCI_ENOSYS -1 -#define PSCI_EINVAL -2 -#define PSCI_DENIED -3 +/* PSCI return values (inclusive of all PSCI versions) */ +#define PSCI_SUCCESS 0 +#define PSCI_NOT_SUPPORTED -1 +#define PSCI_INVALID_PARAMETERS -2 +#define PSCI_DENIED -3 +#define PSCI_ALREADY_ON -4 +#define PSCI_ON_PENDING -5 +#define PSCI_INTERNAL_FAILURE -6 +#define PSCI_NOT_PRESENT -7 +#define PSCI_DISABLED -8 /* availability of PSCI on the host for SMP bringup */ extern bool_t psci_available; @@ -13,10 +19,71 @@ int psci_init(void); int call_psci_cpu_on(int cpu); /* functions to handle guest PSCI requests */ -int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point); -int do_psci_cpu_off(uint32_t power_state); -int do_psci_cpu_suspend(uint32_t power_state, register_t entry_point); -int do_psci_migrate(uint32_t vcpuid); +int32_t do_psci_cpu_on(uint32_t vcpuid, register_t entry_point); +int32_t do_psci_cpu_off(uint32_t power_state); +int32_t do_psci_cpu_suspend(uint32_t power_state, register_t entry_point); +int32_t do_psci_migrate(uint32_t vcpuid); + +/* PSCI 0.2 functions to handle guest PSCI requests */ +uint32_t do_psci_0_2_version(void); +register_t do_psci_0_2_cpu_suspend(uint32_t power_state, register_t entry_point, + register_t context_id); +int32_t do_psci_0_2_cpu_off(void); +int32_t do_psci_0_2_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id); +int32_t do_psci_0_2_affinity_info(register_t target_affinity, + uint32_t lowest_affinity_level); +int32_t do_psci_0_2_migrate(uint32_t target_cpu); +uint32_t do_psci_0_2_migrate_info_type(void); +register_t do_psci_0_2_migrate_info_up_cpu(void); +void do_psci_0_2_system_off(void); +void do_psci_0_2_system_reset(void); + +/* PSCI version */ +#define XEN_PSCI_V_0_1 1 +#define XEN_PSCI_V_0_2 2 + +/* PSCI v0.2 interface */ +#define PSCI_0_2_FN_BASE 0x84000000 +#define PSCI_0_2_FN(n) (PSCI_0_2_FN_BASE + (n)) +#define PSCI_0_2_64BIT 0x40000000 +#define PSCI_0_2_FN64_BASE \ + (PSCI_0_2_FN_BASE + PSCI_0_2_64BIT) +#define PSCI_0_2_FN64(n) (PSCI_0_2_FN64_BASE + (n)) + +#define PSCI_0_2_FN_PSCI_VERSION PSCI_0_2_FN(0) +#define PSCI_0_2_FN_CPU_SUSPEND PSCI_0_2_FN(1) +#define PSCI_0_2_FN_CPU_OFF PSCI_0_2_FN(2) +#define PSCI_0_2_FN_CPU_ON PSCI_0_2_FN(3) +#define PSCI_0_2_FN_AFFINITY_INFO PSCI_0_2_FN(4) +#define PSCI_0_2_FN_MIGRATE PSCI_0_2_FN(5) +#define PSCI_0_2_FN_MIGRATE_INFO_TYPE PSCI_0_2_FN(6) +#define PSCI_0_2_FN_MIGRATE_INFO_UP_CPU PSCI_0_2_FN(7) +#define PSCI_0_2_FN_SYSTEM_OFF PSCI_0_2_FN(8) +#define PSCI_0_2_FN_SYSTEM_RESET PSCI_0_2_FN(9) + +#define PSCI_0_2_FN64_CPU_SUSPEND PSCI_0_2_FN64(1) +#define PSCI_0_2_FN64_CPU_ON PSCI_0_2_FN64(3) +#define PSCI_0_2_FN64_AFFINITY_INFO PSCI_0_2_FN64(4) +#define PSCI_0_2_FN64_MIGRATE PSCI_0_2_FN64(5) +#define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU PSCI_0_2_FN64(7) + +/* PSCI v0.2 affinity level state returned by AFFINITY_INFO */ +#define PSCI_0_2_AFFINITY_LEVEL_ON 0 +#define PSCI_0_2_AFFINITY_LEVEL_OFF 1 +#define PSCI_0_2_AFFINITY_LEVEL_ON_PENDING 2 + +/* PSCI v0.2 multicore support in Trusted OS returned by MIGRATE_INFO_TYPE */ +#define PSCI_0_2_TOS_UP_MIGRATE_CAPABLE 0 +#define PSCI_0_2_TOS_UP_NOT_MIGRATE_CAPABLE 1 +#define PSCI_0_2_TOS_MP_OR_NOT_PRESENT 2 + +/* PSCI v0.2 power state encoding for CPU_SUSPEND function */ +#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff +#define PSCI_0_2_POWER_STATE_ID_SHIFT 0 +#define PSCI_0_2_POWER_STATE_TYPE_SHIFT 16 +#define PSCI_0_2_POWER_STATE_TYPE_MASK \ + (0x1 << PSCI_0_2_POWER_STATE_TYPE_SHIFT) #endif /* __ASM_PSCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIa-0004cG-1r; Sun, 24 Aug 2014 23:34:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIY-0004c5-8l for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:10 +0000 Received: from [85.158.143.35:51821] by server-1.bemta-4.messagelabs.com id 85/A0-05872-1767AF35; Sun, 24 Aug 2014 23:34:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1408923245!12984119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7899 invoked from network); 24 Aug 2014 23:34:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIT-0006mU-6G for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhIT-0000RW-2s for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:05 +0000 Date: Sun, 24 Aug 2014 23:34:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm : emulation of arm's PSCI v0.2 standard X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4da570a4deec84b0ab9ee8e97d0148d443d97564 Author: Parth Dixit AuthorDate: Thu Aug 14 12:53:00 2014 +0530 Commit: Ian Campbell CommitDate: Thu Aug 21 23:03:27 2014 +0100 xen/arm : emulation of arm's PSCI v0.2 standard Arm based virtual machines dom0/guest will request power related functionality from xen through PSCI interface. This patch implements version 0.2 of PSCI standard specified by arm for 64bit and 32 bit arm machines. Signed-off-by: Parth Dixit Acked-by: Ian Campbell [ ijc -- switch include n vpsci.c from asm-arm/event.h to asm/event.h ] --- tools/libxl/libxl_arm.c | 2 +- xen/arch/arm/domain_build.c | 5 +- xen/arch/arm/traps.c | 127 +++++++++++++++++++++++++++---------- xen/arch/arm/vpsci.c | 131 +++++++++++++++++++++++++++++++++++++-- xen/include/asm-arm/processor.h | 3 + xen/include/asm-arm/psci.h | 83 ++++++++++++++++++++++--- 6 files changed, 301 insertions(+), 50 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index e19e2f4..3d30242 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -260,7 +260,7 @@ static int make_psci_node(libxl__gc *gc, void *fdt) res = fdt_begin_node(fdt, "psci"); if (res) return res; - res = fdt_property_compat(gc, fdt, 1, "arm,psci"); + res = fdt_property_compat(gc, fdt, 2, "arm,psci-0.2","arm,psci"); if (res) return res; res = fdt_property_string(fdt, "method", "hvc"); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 23261e4..51d793a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -637,6 +637,9 @@ static int make_hypervisor_node(struct domain *d, static int make_psci_node(void *fdt, const struct dt_device_node *parent) { int res; + const char compat[] = + "arm,psci-0.2""\0" + "arm,psci"; DPRINT("Create PSCI node\n"); @@ -645,7 +648,7 @@ static int make_psci_node(void *fdt, const struct dt_device_node *parent) if ( res ) return res; - res = fdt_property_string(fdt, "compatible", "arm,psci"); + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); if ( res ) return res; diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 683b440..019991f 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1082,24 +1082,6 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL_ARM(vcpu_op, 3), }; -typedef int (*arm_psci_fn_t)(uint32_t, register_t); - -typedef struct { - arm_psci_fn_t fn; - int nr_args; -} arm_psci_t; - -#define PSCI(_name, _nr_args) \ - [ PSCI_ ## _name ] = { \ - .fn = (arm_psci_fn_t) &do_psci_ ## _name, \ - .nr_args = _nr_args, \ - } - -static arm_psci_t arm_psci_table[] = { - PSCI(cpu_off, 1), - PSCI(cpu_on, 2), -}; - #ifndef NDEBUG static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) { @@ -1132,33 +1114,108 @@ static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) #endif #ifdef CONFIG_ARM_64 -#define PSCI_OP_REG(r) (r)->x0 -#define PSCI_RESULT_REG(r) (r)->x0 -#define PSCI_ARGS(r) (r)->x1, (r)->x2 +#define PSCI_RESULT_REG(reg) (reg)->x0 +#define PSCI_ARG(reg,n) (reg)->x##n +#define PSCI_ARG32(reg,n) (uint32_t)( (reg)->x##n & 0x00000000FFFFFFFF ) #else -#define PSCI_OP_REG(r) (r)->r0 -#define PSCI_RESULT_REG(r) (r)->r0 -#define PSCI_ARGS(r) (r)->r1, (r)->r2 +#define PSCI_RESULT_REG(reg) (reg)->r0 +#define PSCI_ARG(reg,n) (reg)->r##n +#define PSCI_ARG32(reg,n) PSCI_ARG(reg,n) #endif -static void do_trap_psci(struct cpu_user_regs *regs) +/* helper function for checking arm mode 32/64 bit */ +static inline int psci_mode_check(struct domain *d, register_t fid) { - arm_psci_fn_t psci_call = NULL; + return !( is_64bit_domain(d)^( (fid & PSCI_0_2_64BIT) >> 30 ) ); +} - if ( PSCI_OP_REG(regs) >= ARRAY_SIZE(arm_psci_table) ) - { - domain_crash_synchronous(); - return; - } +static void do_trap_psci(struct cpu_user_regs *regs) +{ + register_t fid = PSCI_ARG(regs,0); - psci_call = arm_psci_table[PSCI_OP_REG(regs)].fn; - if ( psci_call == NULL ) + /* preloading in case psci_mode_check fails */ + PSCI_RESULT_REG(regs) = PSCI_INVALID_PARAMETERS; + switch( fid ) { + case PSCI_cpu_off: + { + uint32_t pstate = PSCI_ARG32(regs,1); + PSCI_RESULT_REG(regs) = do_psci_cpu_off(pstate); + } + break; + case PSCI_cpu_on: + { + uint32_t vcpuid = PSCI_ARG32(regs,1); + register_t epoint = PSCI_ARG(regs,2); + PSCI_RESULT_REG(regs) = do_psci_cpu_on(vcpuid, epoint); + } + break; + case PSCI_0_2_FN_PSCI_VERSION: + PSCI_RESULT_REG(regs) = do_psci_0_2_version(); + break; + case PSCI_0_2_FN_CPU_OFF: + PSCI_RESULT_REG(regs) = do_psci_0_2_cpu_off(); + break; + case PSCI_0_2_FN_MIGRATE_INFO_TYPE: + PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_type(); + break; + case PSCI_0_2_FN_MIGRATE_INFO_UP_CPU: + case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU: + if ( psci_mode_check(current->domain, fid) ) + PSCI_RESULT_REG(regs) = do_psci_0_2_migrate_info_up_cpu(); + break; + case PSCI_0_2_FN_SYSTEM_OFF: + do_psci_0_2_system_off(); + PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; + break; + case PSCI_0_2_FN_SYSTEM_RESET: + do_psci_0_2_system_reset(); + PSCI_RESULT_REG(regs) = PSCI_INTERNAL_FAILURE; + break; + case PSCI_0_2_FN_CPU_ON: + case PSCI_0_2_FN64_CPU_ON: + if ( psci_mode_check(current->domain, fid) ) + { + register_t vcpuid = PSCI_ARG(regs,1); + register_t epoint = PSCI_ARG(regs,2); + register_t cid = PSCI_ARG(regs,3); + PSCI_RESULT_REG(regs) = + do_psci_0_2_cpu_on(vcpuid, epoint, cid); + } + break; + case PSCI_0_2_FN_CPU_SUSPEND: + case PSCI_0_2_FN64_CPU_SUSPEND: + if ( psci_mode_check(current->domain, fid) ) + { + uint32_t pstate = PSCI_ARG32(regs,1); + register_t epoint = PSCI_ARG(regs,2); + register_t cid = PSCI_ARG(regs,3); + PSCI_RESULT_REG(regs) = + do_psci_0_2_cpu_suspend(pstate, epoint, cid); + } + break; + case PSCI_0_2_FN_AFFINITY_INFO: + case PSCI_0_2_FN64_AFFINITY_INFO: + if ( psci_mode_check(current->domain, fid) ) + { + register_t taff = PSCI_ARG(regs,1); + uint32_t laff = PSCI_ARG32(regs,2); + PSCI_RESULT_REG(regs) = + do_psci_0_2_affinity_info(taff, laff); + } + break; + case PSCI_0_2_FN_MIGRATE: + case PSCI_0_2_FN64_MIGRATE: + if ( psci_mode_check(current->domain, fid) ) + { + uint32_t tcpu = PSCI_ARG32(regs,1); + PSCI_RESULT_REG(regs) = do_psci_0_2_migrate(tcpu); + } + break; + default: domain_crash_synchronous(); return; } - - PSCI_RESULT_REG(regs) = psci_call(PSCI_ARGS(regs)); } #ifdef CONFIG_ARM_64 diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index 80678f6..3f2a482 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -18,24 +18,38 @@ #include #include #include +#include -int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) +#include + +static int do_common_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id,int ver) { struct vcpu *v; struct domain *d = current->domain; struct vcpu_guest_context *ctxt; int rc; int is_thumb = entry_point & 1; + register_t vcpuid; + + if( ver == XEN_PSCI_V_0_2 ) + vcpuid = (target_cpu & MPIDR_HWID_MASK); + else + vcpuid = target_cpu; if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) ) - return PSCI_EINVAL; + return PSCI_INVALID_PARAMETERS; if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) - return PSCI_EINVAL; + return PSCI_INVALID_PARAMETERS; /* THUMB set is not allowed with 64-bit domain */ if ( is_64bit_domain(d) && is_thumb ) - return PSCI_EINVAL; + return PSCI_INVALID_PARAMETERS; + + if( ( ver == XEN_PSCI_V_0_2 ) && + ( !test_bit(_VPF_down, &v->pause_flags) ) ) + return PSCI_ALREADY_ON; if ( (ctxt = alloc_vcpu_guest_context()) == NULL ) return PSCI_DENIED; @@ -49,10 +63,18 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) ctxt->ttbr1 = 0; ctxt->ttbcr = 0; /* Defined Reset Value */ if ( is_32bit_domain(d) ) + { ctxt->user_regs.cpsr = PSR_GUEST32_INIT; + if( ver == XEN_PSCI_V_0_2 ) + ctxt->user_regs.r0_usr = context_id; + } #ifdef CONFIG_ARM_64 else + { ctxt->user_regs.cpsr = PSR_GUEST64_INIT; + if( ver == XEN_PSCI_V_0_2 ) + ctxt->user_regs.x0 = context_id; + } #endif /* Start the VCPU with THUMB set if it's requested by the kernel */ @@ -76,7 +98,12 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) return PSCI_SUCCESS; } -int do_psci_cpu_off(uint32_t power_state) +int32_t do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) +{ + return do_common_cpu_on(vcpuid,entry_point,0,XEN_PSCI_V_0_1); +} + +int32_t do_psci_cpu_off(uint32_t power_state) { struct vcpu *v = current; if ( !test_and_set_bit(_VPF_down, &v->pause_flags) ) @@ -84,6 +111,100 @@ int do_psci_cpu_off(uint32_t power_state) return PSCI_SUCCESS; } +uint32_t do_psci_0_2_version(void) +{ + return XEN_PSCI_V_0_2; +} + +register_t do_psci_0_2_cpu_suspend(uint32_t power_state, register_t entry_point, + register_t context_id) +{ + struct vcpu *v = current; + + /* + * Power off requests are treated as performing standby + * as this simplifies Xen implementation. + */ + + vcpu_block_unless_event_pending(v); + return PSCI_SUCCESS; +} + +int32_t do_psci_0_2_cpu_off(void) +{ + return do_psci_cpu_off(0); +} + +int32_t do_psci_0_2_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id) +{ + return do_common_cpu_on(target_cpu,entry_point,context_id,XEN_PSCI_V_0_2); +} + +static const unsigned long target_affinity_mask[] = { + ( MPIDR_HWID_MASK & AFFINITY_MASK( 0 ) ), + ( MPIDR_HWID_MASK & AFFINITY_MASK( 1 ) ), + ( MPIDR_HWID_MASK & AFFINITY_MASK( 2 ) ) +#ifdef CONFIG_ARM_64 + ,( MPIDR_HWID_MASK & AFFINITY_MASK( 3 ) ) +#endif +}; + +int32_t do_psci_0_2_affinity_info(register_t target_affinity, + uint32_t lowest_affinity_level) +{ + struct domain *d = current->domain; + struct vcpu *v; + uint32_t vcpuid; + unsigned long tmask; + + if ( lowest_affinity_level < ARRAY_SIZE(target_affinity_mask) ) + { + tmask = target_affinity_mask[lowest_affinity_level]; + target_affinity &= tmask; + } + else + return PSCI_INVALID_PARAMETERS; + + for ( vcpuid = 0; vcpuid < d->max_vcpus; vcpuid++ ) + { + v = d->vcpu[vcpuid]; + + if ( ( ( v->arch.vmpidr & tmask ) == target_affinity ) + && ( !test_bit(_VPF_down, &v->pause_flags) ) ) + return PSCI_0_2_AFFINITY_LEVEL_ON; + } + + return PSCI_0_2_AFFINITY_LEVEL_OFF; +} + +int32_t do_psci_0_2_migrate(uint32_t target_cpu) +{ + return PSCI_NOT_SUPPORTED; +} + +uint32_t do_psci_0_2_migrate_info_type(void) +{ + return PSCI_0_2_TOS_MP_OR_NOT_PRESENT; +} + +register_t do_psci_0_2_migrate_info_up_cpu(void) +{ + return PSCI_NOT_SUPPORTED; +} + +void do_psci_0_2_system_off( void ) +{ + struct domain *d = current->domain; + domain_shutdown(d,SHUTDOWN_poweroff); +} + +void do_psci_0_2_system_reset(void) +{ + struct domain *d = current->domain; + domain_shutdown(d,SHUTDOWN_reboot); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index bf7c94c..0b74657 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -16,6 +16,9 @@ #define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) #define MPIDR_HWID_MASK _AC(0xffffff,U) #define MPIDR_INVALID (~MPIDR_HWID_MASK) +#define MPIDR_LEVEL_BITS (8) +#define AFFINITY_MASK(level) ~((_AC(0x1,U) << ((level) * MPIDR_LEVEL_BITS)) - 1) + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE _AC(0x80000000,U) diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h index 189964b..9777c03 100644 --- a/xen/include/asm-arm/psci.h +++ b/xen/include/asm-arm/psci.h @@ -1,10 +1,16 @@ #ifndef __ASM_PSCI_H__ #define __ASM_PSCI_H__ -#define PSCI_SUCCESS 0 -#define PSCI_ENOSYS -1 -#define PSCI_EINVAL -2 -#define PSCI_DENIED -3 +/* PSCI return values (inclusive of all PSCI versions) */ +#define PSCI_SUCCESS 0 +#define PSCI_NOT_SUPPORTED -1 +#define PSCI_INVALID_PARAMETERS -2 +#define PSCI_DENIED -3 +#define PSCI_ALREADY_ON -4 +#define PSCI_ON_PENDING -5 +#define PSCI_INTERNAL_FAILURE -6 +#define PSCI_NOT_PRESENT -7 +#define PSCI_DISABLED -8 /* availability of PSCI on the host for SMP bringup */ extern bool_t psci_available; @@ -13,10 +19,71 @@ int psci_init(void); int call_psci_cpu_on(int cpu); /* functions to handle guest PSCI requests */ -int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point); -int do_psci_cpu_off(uint32_t power_state); -int do_psci_cpu_suspend(uint32_t power_state, register_t entry_point); -int do_psci_migrate(uint32_t vcpuid); +int32_t do_psci_cpu_on(uint32_t vcpuid, register_t entry_point); +int32_t do_psci_cpu_off(uint32_t power_state); +int32_t do_psci_cpu_suspend(uint32_t power_state, register_t entry_point); +int32_t do_psci_migrate(uint32_t vcpuid); + +/* PSCI 0.2 functions to handle guest PSCI requests */ +uint32_t do_psci_0_2_version(void); +register_t do_psci_0_2_cpu_suspend(uint32_t power_state, register_t entry_point, + register_t context_id); +int32_t do_psci_0_2_cpu_off(void); +int32_t do_psci_0_2_cpu_on(register_t target_cpu, register_t entry_point, + register_t context_id); +int32_t do_psci_0_2_affinity_info(register_t target_affinity, + uint32_t lowest_affinity_level); +int32_t do_psci_0_2_migrate(uint32_t target_cpu); +uint32_t do_psci_0_2_migrate_info_type(void); +register_t do_psci_0_2_migrate_info_up_cpu(void); +void do_psci_0_2_system_off(void); +void do_psci_0_2_system_reset(void); + +/* PSCI version */ +#define XEN_PSCI_V_0_1 1 +#define XEN_PSCI_V_0_2 2 + +/* PSCI v0.2 interface */ +#define PSCI_0_2_FN_BASE 0x84000000 +#define PSCI_0_2_FN(n) (PSCI_0_2_FN_BASE + (n)) +#define PSCI_0_2_64BIT 0x40000000 +#define PSCI_0_2_FN64_BASE \ + (PSCI_0_2_FN_BASE + PSCI_0_2_64BIT) +#define PSCI_0_2_FN64(n) (PSCI_0_2_FN64_BASE + (n)) + +#define PSCI_0_2_FN_PSCI_VERSION PSCI_0_2_FN(0) +#define PSCI_0_2_FN_CPU_SUSPEND PSCI_0_2_FN(1) +#define PSCI_0_2_FN_CPU_OFF PSCI_0_2_FN(2) +#define PSCI_0_2_FN_CPU_ON PSCI_0_2_FN(3) +#define PSCI_0_2_FN_AFFINITY_INFO PSCI_0_2_FN(4) +#define PSCI_0_2_FN_MIGRATE PSCI_0_2_FN(5) +#define PSCI_0_2_FN_MIGRATE_INFO_TYPE PSCI_0_2_FN(6) +#define PSCI_0_2_FN_MIGRATE_INFO_UP_CPU PSCI_0_2_FN(7) +#define PSCI_0_2_FN_SYSTEM_OFF PSCI_0_2_FN(8) +#define PSCI_0_2_FN_SYSTEM_RESET PSCI_0_2_FN(9) + +#define PSCI_0_2_FN64_CPU_SUSPEND PSCI_0_2_FN64(1) +#define PSCI_0_2_FN64_CPU_ON PSCI_0_2_FN64(3) +#define PSCI_0_2_FN64_AFFINITY_INFO PSCI_0_2_FN64(4) +#define PSCI_0_2_FN64_MIGRATE PSCI_0_2_FN64(5) +#define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU PSCI_0_2_FN64(7) + +/* PSCI v0.2 affinity level state returned by AFFINITY_INFO */ +#define PSCI_0_2_AFFINITY_LEVEL_ON 0 +#define PSCI_0_2_AFFINITY_LEVEL_OFF 1 +#define PSCI_0_2_AFFINITY_LEVEL_ON_PENDING 2 + +/* PSCI v0.2 multicore support in Trusted OS returned by MIGRATE_INFO_TYPE */ +#define PSCI_0_2_TOS_UP_MIGRATE_CAPABLE 0 +#define PSCI_0_2_TOS_UP_NOT_MIGRATE_CAPABLE 1 +#define PSCI_0_2_TOS_MP_OR_NOT_PRESENT 2 + +/* PSCI v0.2 power state encoding for CPU_SUSPEND function */ +#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff +#define PSCI_0_2_POWER_STATE_ID_SHIFT 0 +#define PSCI_0_2_POWER_STATE_TYPE_SHIFT 16 +#define PSCI_0_2_POWER_STATE_TYPE_MASK \ + (0x1 << PSCI_0_2_POWER_STATE_TYPE_SHIFT) #endif /* __ASM_PSCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIh-0004dJ-4e; Sun, 24 Aug 2014 23:34:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIg-0004d5-1A for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:18 +0000 Received: from [193.109.254.147:26257] by server-8.bemta-14.messagelabs.com id 88/B4-01875-9767AF35; Sun, 24 Aug 2014 23:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1408923255!12796525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5622 invoked from network); 24 Aug 2014 23:34:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhId-0006ma-Bp for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhId-0000S1-AR for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:15 +0000 Date: Sun, 24 Aug 2014 23:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove duplicate -g from CFLAGS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3363fc1204a5e9db2bcc4579f86e47956cfce955 Author: Olaf Hering AuthorDate: Mon Jul 28 12:38:18 2014 +0200 Commit: Ian Campbell CommitDate: Thu Aug 21 23:12:27 2014 +0100 tools: remove duplicate -g from CFLAGS CFLAGS+=-g is already provided by Config.mk. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/vhd/lib/Makefile | 1 - tools/flask/utils/Makefile | 2 +- tools/libxc/Makefile | 2 +- tools/memshr/Makefile | 1 - tools/xenpaging/Makefile | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 1129ca1..37c3485 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -9,7 +9,7 @@ QCOW_UTIL = img2qcow qcow-create qcow2raw LOCK_UTIL = lock-util INST_DIR = $(SBINDIR) -CFLAGS += -Werror -g +CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index cdbb86c..99e3cdb 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -17,7 +17,6 @@ CFLAGS += -Wno-unused CFLAGS += -I../../include CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC -CFLAGS += -g ifeq ($(CONFIG_Linux),y) LIBS := -luuid diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 458f9aa..dfeb8f7 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wall -g -Werror +CFLAGS += -Wall -Werror CFLAGS += $(CFLAGS_libxenctrl) TESTDIR = testsuite/tmp diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 22eef8e..3b04027 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -205,7 +205,7 @@ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so - $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) -include $(DEPS) diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile index a2d6b00..2c34f96 100644 --- a/tools/memshr/Makefile +++ b/tools/memshr/Makefile @@ -9,7 +9,6 @@ CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC -CFLAGS += -g LIB-SRCS := interface.c LIB-SRCS += shm.c diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 548d9dd..4ff3375 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -13,7 +13,6 @@ SRCS += pagein.c CFLAGS += -Werror CFLAGS += -Wno-unused -CFLAGS += -g OBJS = $(SRCS:.c=.o) IBINS = xenpaging -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIh-0004dJ-4e; Sun, 24 Aug 2014 23:34:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIg-0004d5-1A for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:18 +0000 Received: from [193.109.254.147:26257] by server-8.bemta-14.messagelabs.com id 88/B4-01875-9767AF35; Sun, 24 Aug 2014 23:34:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1408923255!12796525!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5622 invoked from network); 24 Aug 2014 23:34:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhId-0006ma-Bp for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhId-0000S1-AR for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:15 +0000 Date: Sun, 24 Aug 2014 23:34:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove duplicate -g from CFLAGS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3363fc1204a5e9db2bcc4579f86e47956cfce955 Author: Olaf Hering AuthorDate: Mon Jul 28 12:38:18 2014 +0200 Commit: Ian Campbell CommitDate: Thu Aug 21 23:12:27 2014 +0100 tools: remove duplicate -g from CFLAGS CFLAGS+=-g is already provided by Config.mk. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/vhd/lib/Makefile | 1 - tools/flask/utils/Makefile | 2 +- tools/libxc/Makefile | 2 +- tools/memshr/Makefile | 1 - tools/xenpaging/Makefile | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 1129ca1..37c3485 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -9,7 +9,7 @@ QCOW_UTIL = img2qcow qcow-create qcow2raw LOCK_UTIL = lock-util INST_DIR = $(SBINDIR) -CFLAGS += -Werror -g +CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index cdbb86c..99e3cdb 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -17,7 +17,6 @@ CFLAGS += -Wno-unused CFLAGS += -I../../include CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC -CFLAGS += -g ifeq ($(CONFIG_Linux),y) LIBS := -luuid diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 458f9aa..dfeb8f7 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wall -g -Werror +CFLAGS += -Wall -Werror CFLAGS += $(CFLAGS_libxenctrl) TESTDIR = testsuite/tmp diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 22eef8e..3b04027 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -205,7 +205,7 @@ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so - $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) -include $(DEPS) diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile index a2d6b00..2c34f96 100644 --- a/tools/memshr/Makefile +++ b/tools/memshr/Makefile @@ -9,7 +9,6 @@ CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC -CFLAGS += -g LIB-SRCS := interface.c LIB-SRCS += shm.c diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 548d9dd..4ff3375 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -13,7 +13,6 @@ SRCS += pagein.c CFLAGS += -Werror CFLAGS += -Wno-unused -CFLAGS += -g OBJS = $(SRCS:.c=.o) IBINS = xenpaging -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIr-0004et-7K; Sun, 24 Aug 2014 23:34:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIp-0004ee-PE for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:27 +0000 Received: from [85.158.139.211:48970] by server-1.bemta-5.messagelabs.com id AD/DD-17892-3867AF35; Sun, 24 Aug 2014 23:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1408923265!11883539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15247 invoked from network); 24 Aug 2014 23:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIn-0006mi-He for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhIn-0000SN-FR for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:25 +0000 Date: Sun, 24 Aug 2014 23:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove duplicate -Wall from CFLAGS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbc6fa96ed786a62e3f602235c3c62bfeb05003f Author: Olaf Hering AuthorDate: Mon Jul 28 12:42:52 2014 +0200 Commit: Ian Campbell CommitDate: Thu Aug 21 23:12:39 2014 +0100 tools: remove duplicate -Wall from CFLAGS CFLAGS+=-Wall is already provided by Config.mk WARN_FLAGS is not used. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- tools/flask/utils/Makefile | 2 +- tools/xenstat/libxenstat/Makefile | 2 -- tools/xenstat/xentop/Makefile | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index dfeb8f7..c87f15c 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wall -Werror +CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) TESTDIR = testsuite/tmp diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 15dc22d..f64a45c 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -35,8 +35,6 @@ OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o OBJECTS-$(CONFIG_FreeBSD) += src/xenstat_freebsd.o SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) -WARN_FLAGS=-Wall -Werror - CFLAGS+=-fPIC CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index e78166e..18bccb6 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -18,7 +18,7 @@ ifneq ($(XENSTAT_XENTOP),y) all install xentop: else -CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) +CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) CFLAGS += -DHOST_$(XEN_OS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIr-0004et-7K; Sun, 24 Aug 2014 23:34:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIp-0004ee-PE for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:27 +0000 Received: from [85.158.139.211:48970] by server-1.bemta-5.messagelabs.com id AD/DD-17892-3867AF35; Sun, 24 Aug 2014 23:34:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1408923265!11883539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15247 invoked from network); 24 Aug 2014 23:34:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIn-0006mi-He for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhIn-0000SN-FR for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:25 +0000 Date: Sun, 24 Aug 2014 23:34:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: remove duplicate -Wall from CFLAGS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbc6fa96ed786a62e3f602235c3c62bfeb05003f Author: Olaf Hering AuthorDate: Mon Jul 28 12:42:52 2014 +0200 Commit: Ian Campbell CommitDate: Thu Aug 21 23:12:39 2014 +0100 tools: remove duplicate -Wall from CFLAGS CFLAGS+=-Wall is already provided by Config.mk WARN_FLAGS is not used. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- tools/flask/utils/Makefile | 2 +- tools/xenstat/libxenstat/Makefile | 2 -- tools/xenstat/xentop/Makefile | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index dfeb8f7..c87f15c 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wall -Werror +CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) TESTDIR = testsuite/tmp diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 15dc22d..f64a45c 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -35,8 +35,6 @@ OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o OBJECTS-$(CONFIG_FreeBSD) += src/xenstat_freebsd.o SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) -WARN_FLAGS=-Wall -Werror - CFLAGS+=-fPIC CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index e78166e..18bccb6 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -18,7 +18,7 @@ ifneq ($(XENSTAT_XENTOP),y) all install xentop: else -CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat) +CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) CFLAGS += -DHOST_$(XEN_OS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJ2-0004gn-A5; Sun, 24 Aug 2014 23:34:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJ0-0004gV-ED for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:38 +0000 Received: from [193.109.254.147:52251] by server-8.bemta-14.messagelabs.com id 67/C4-01875-D867AF35; Sun, 24 Aug 2014 23:34:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1408923275!12796554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6459 invoked from network); 24 Aug 2014 23:34:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIx-0006mq-QP for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhIx-0000Sp-LF for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:35 +0000 Date: Sun, 24 Aug 2014 23:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't print out function name in log twice X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cad883eff9247944f3bcc339aaba6ec8a2180329 Author: Wei Liu AuthorDate: Fri Aug 1 12:36:41 2014 +0100 Commit: Ian Campbell CommitDate: Thu Aug 21 23:23:29 2014 +0100 libxl: don't print out function name in log twice The LOG macro already prints out function names. No need to explictly use "__func__" in log message. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index addacdb..69e4d00 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -230,8 +230,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, || b_info->u.hvm.usbdevice_list) { if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { - LOG(ERROR, "%s: Both usbdevice and usbdevice_list set", - __func__); + LOG(ERROR, "Both usbdevice and usbdevice_list set"); return NULL; } flexarray_append(dm_args, "-usb"); @@ -527,8 +526,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, || b_info->u.hvm.usbdevice_list) { if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { - LOG(ERROR, "%s: Both usbdevice and usbdevice_list set", - __func__); + LOG(ERROR, "Both usbdevice and usbdevice_list set"); return NULL; } flexarray_append(dm_args, "-usb"); @@ -565,8 +563,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, "-device", "nec-usb-xhci,id=usb", NULL); break; default: - LOG(ERROR, "%s: usbversion parameter is invalid, " - "must be between 1 and 3", __func__); + LOG(ERROR, "usbversion parameter is invalid, " + "must be between 1 and 3"); return NULL; } if (b_info->u.hvm.spice.usbredirection >= 0 && @@ -577,8 +575,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__sprintf(gc, "usb-redir,chardev=usbrc%d," "id=usbrc%d", i, i), NULL); } else { - LOG(ERROR, "%s: usbredirection parameter is invalid, " - "it must be between 1 and 4", __func__); + LOG(ERROR, "usbredirection parameter is invalid, " + "it must be between 1 and 4"); return NULL; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJ2-0004gn-A5; Sun, 24 Aug 2014 23:34:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJ0-0004gV-ED for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:38 +0000 Received: from [193.109.254.147:52251] by server-8.bemta-14.messagelabs.com id 67/C4-01875-D867AF35; Sun, 24 Aug 2014 23:34:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1408923275!12796554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6459 invoked from network); 24 Aug 2014 23:34:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhIx-0006mq-QP for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhIx-0000Sp-LF for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:35 +0000 Date: Sun, 24 Aug 2014 23:34:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: don't print out function name in log twice X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cad883eff9247944f3bcc339aaba6ec8a2180329 Author: Wei Liu AuthorDate: Fri Aug 1 12:36:41 2014 +0100 Commit: Ian Campbell CommitDate: Thu Aug 21 23:23:29 2014 +0100 libxl: don't print out function name in log twice The LOG macro already prints out function names. No need to explictly use "__func__" in log message. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index addacdb..69e4d00 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -230,8 +230,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, || b_info->u.hvm.usbdevice_list) { if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { - LOG(ERROR, "%s: Both usbdevice and usbdevice_list set", - __func__); + LOG(ERROR, "Both usbdevice and usbdevice_list set"); return NULL; } flexarray_append(dm_args, "-usb"); @@ -527,8 +526,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, || b_info->u.hvm.usbdevice_list) { if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { - LOG(ERROR, "%s: Both usbdevice and usbdevice_list set", - __func__); + LOG(ERROR, "Both usbdevice and usbdevice_list set"); return NULL; } flexarray_append(dm_args, "-usb"); @@ -565,8 +563,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, "-device", "nec-usb-xhci,id=usb", NULL); break; default: - LOG(ERROR, "%s: usbversion parameter is invalid, " - "must be between 1 and 3", __func__); + LOG(ERROR, "usbversion parameter is invalid, " + "must be between 1 and 3"); return NULL; } if (b_info->u.hvm.spice.usbredirection >= 0 && @@ -577,8 +575,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__sprintf(gc, "usb-redir,chardev=usbrc%d," "id=usbrc%d", i, i), NULL); } else { - LOG(ERROR, "%s: usbredirection parameter is invalid, " - "it must be between 1 and 4", __func__); + LOG(ERROR, "usbredirection parameter is invalid, " + "it must be between 1 and 4"); return NULL; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJD-0004jp-Ep; Sun, 24 Aug 2014 23:34:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJC-0004ja-5C for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:50 +0000 Received: from [193.109.254.147:46759] by server-3.bemta-14.messagelabs.com id F3/BC-23707-9967AF35; Sun, 24 Aug 2014 23:34:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1408923286!12815121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12472 invoked from network); 24 Aug 2014 23:34:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJ7-0006mw-Uu for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJ7-0000TK-Sz for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:45 +0000 Date: Sun, 24 Aug 2014 23:34:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: mark do_unexpected_trap as noreturn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe47fa71394dd9147593d823726451d48ba1fc92 Author: Julien Grall AuthorDate: Tue Aug 5 17:30:37 2014 +0100 Commit: Ian Campbell CommitDate: Thu Aug 21 23:27:19 2014 +0100 xen/arm: mark do_unexpected_trap as noreturn Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/processor.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 0b74657..0cc5b6d 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -500,7 +500,7 @@ void show_registers(struct cpu_user_regs *regs); #define cpu_to_core(_cpu) (0) #define cpu_to_socket(_cpu) (0) -void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs); +void noreturn do_unexpected_trap(const char *msg, struct cpu_user_regs *regs); void vcpu_regs_hyp_to_user(const struct vcpu *vcpu, struct vcpu_guest_core_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:34:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:34:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJD-0004jp-Ep; Sun, 24 Aug 2014 23:34:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJC-0004ja-5C for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:50 +0000 Received: from [193.109.254.147:46759] by server-3.bemta-14.messagelabs.com id F3/BC-23707-9967AF35; Sun, 24 Aug 2014 23:34:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1408923286!12815121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12472 invoked from network); 24 Aug 2014 23:34:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJ7-0006mw-Uu for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJ7-0000TK-Sz for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:45 +0000 Date: Sun, 24 Aug 2014 23:34:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: mark do_unexpected_trap as noreturn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe47fa71394dd9147593d823726451d48ba1fc92 Author: Julien Grall AuthorDate: Tue Aug 5 17:30:37 2014 +0100 Commit: Ian Campbell CommitDate: Thu Aug 21 23:27:19 2014 +0100 xen/arm: mark do_unexpected_trap as noreturn Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/processor.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 0b74657..0cc5b6d 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -500,7 +500,7 @@ void show_registers(struct cpu_user_regs *regs); #define cpu_to_core(_cpu) (0) #define cpu_to_socket(_cpu) (0) -void do_unexpected_trap(const char *msg, struct cpu_user_regs *regs); +void noreturn do_unexpected_trap(const char *msg, struct cpu_user_regs *regs); void vcpu_regs_hyp_to_user(const struct vcpu *vcpu, struct vcpu_guest_core_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJM-0004l9-Hs; Sun, 24 Aug 2014 23:35:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJK-0004kr-Ut for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:59 +0000 Received: from [85.158.137.68:18401] by server-2.bemta-3.messagelabs.com id 46/D3-09149-2A67AF35; Sun, 24 Aug 2014 23:34:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1408923296!13088506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29623 invoked from network); 24 Aug 2014 23:34:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJI-0006n5-81 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJI-0000UC-2q for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:56 +0000 Date: Sun, 24 Aug 2014 23:34:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxc: fix Remus failover regression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca0354f90a25be9f4e31dafe6e37b012bb2de7ac Author: Yang Hongyang AuthorDate: Mon Jul 28 12:03:27 2014 +0800 Commit: Ian Campbell CommitDate: Thu Aug 21 23:29:18 2014 +0100 tools: libxc: fix Remus failover regression commit: c2ba706c "tools/libxc: goto correct label on error paths" by Andrew Cooper broke Remus in Xen 4.4 or earlier versions that has this commit backported. With Remus, this jump essentially discards the current incomplete checkpoint received by the backup and restore backup from the last complete checkpoint. This is required for Remus to work and this does not break live migration. It has been around since Xen 4.0. CC: Ian Jackson CC: Ian Campbell CC: Andrew Cooper CC: Shriram Rajagopalan Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index e73e0a2..b9a56d5 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1783,20 +1783,29 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( pagebuf_get(xch, ctx, &pagebuf, io_fd, dom) ) { PERROR("error when buffering batch, finishing"); - goto out; + /* + * Remus: discard the current incomplete checkpoint and restore + * backup from the last complete checkpoint. + */ + goto finish; } memset(&tmptail, 0, sizeof(tmptail)); tmptail.ishvm = hvm; if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap, ext_vcpucontext, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail, finishing"); - goto out; + /* + * Remus: discard the current incomplete checkpoint and restore + * backup from the last complete checkpoint. + */ + goto finish; } tailbuf_free(&tailbuf); memcpy(&tailbuf, &tmptail, sizeof(tailbuf)); goto loadpages; + /* With Remus: restore from last complete checkpoint */ finish: if ( hvm ) goto finish_hvm; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJM-0004l9-Hs; Sun, 24 Aug 2014 23:35:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJK-0004kr-Ut for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:59 +0000 Received: from [85.158.137.68:18401] by server-2.bemta-3.messagelabs.com id 46/D3-09149-2A67AF35; Sun, 24 Aug 2014 23:34:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1408923296!13088506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29623 invoked from network); 24 Aug 2014 23:34:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:34:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJI-0006n5-81 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJI-0000UC-2q for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:34:56 +0000 Date: Sun, 24 Aug 2014 23:34:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxc: fix Remus failover regression X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca0354f90a25be9f4e31dafe6e37b012bb2de7ac Author: Yang Hongyang AuthorDate: Mon Jul 28 12:03:27 2014 +0800 Commit: Ian Campbell CommitDate: Thu Aug 21 23:29:18 2014 +0100 tools: libxc: fix Remus failover regression commit: c2ba706c "tools/libxc: goto correct label on error paths" by Andrew Cooper broke Remus in Xen 4.4 or earlier versions that has this commit backported. With Remus, this jump essentially discards the current incomplete checkpoint received by the backup and restore backup from the last complete checkpoint. This is required for Remus to work and this does not break live migration. It has been around since Xen 4.0. CC: Ian Jackson CC: Ian Campbell CC: Andrew Cooper CC: Shriram Rajagopalan Signed-off-by: Yang Hongyang Acked-by: Shriram Rajagopalan Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index e73e0a2..b9a56d5 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1783,20 +1783,29 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( pagebuf_get(xch, ctx, &pagebuf, io_fd, dom) ) { PERROR("error when buffering batch, finishing"); - goto out; + /* + * Remus: discard the current incomplete checkpoint and restore + * backup from the last complete checkpoint. + */ + goto finish; } memset(&tmptail, 0, sizeof(tmptail)); tmptail.ishvm = hvm; if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap, ext_vcpucontext, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail, finishing"); - goto out; + /* + * Remus: discard the current incomplete checkpoint and restore + * backup from the last complete checkpoint. + */ + goto finish; } tailbuf_free(&tailbuf); memcpy(&tailbuf, &tmptail, sizeof(tailbuf)); goto loadpages; + /* With Remus: restore from last complete checkpoint */ finish: if ( hvm ) goto finish_hvm; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJW-0004m4-KS; Sun, 24 Aug 2014 23:35:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJV-0004ll-9k for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:09 +0000 Received: from [193.109.254.147:27521] by server-9.bemta-14.messagelabs.com id BB/54-31535-CA67AF35; Sun, 24 Aug 2014 23:35:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1408923306!12796241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24417 invoked from network); 24 Aug 2014 23:35:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJS-0006nb-LN for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJS-0000Um-Ba for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:06 +0000 Date: Sun, 24 Aug 2014 23:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug/Linux/init.d: fix wrong path in xendomains init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea878490c5b0b425dc235df1380824ecca77624 Author: Fabio Fantoni AuthorDate: Fri Aug 8 12:46:35 2014 +0200 Commit: Ian Campbell CommitDate: Thu Aug 21 23:32:43 2014 +0100 tools/hotplug/Linux/init.d: fix wrong path in xendomains init Fixed wrong path in xendomains init that make it not working, introduced in commit d8bad9df2544291a0fdc8e4d826b16f9f5394462 (tools/xendomains: move to libexec and use a smaller init helper). Signed-off-by: Fabio Fantoni Reviewed-by: Wei Liu Acked-by: Ian Campbell --- tools/hotplug/Linux/init.d/xendomains | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index d0122fc..3857602 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -20,7 +20,7 @@ # Short-Description: Wrapper to start/stop secondary xen domains # Description: Wrapper for starting / stopping domains automatically # when domain 0 boots / shuts down on systems using init. -# The $SBINDIR/xendomains helper is shared between init and +# The $LIBEXEC/xendomains helper is shared between init and # systemd systems. ### END INIT INFO @@ -28,19 +28,19 @@ case "$1" in start) - $SBINDIR/xendomains start + $LIBEXEC/xendomains start ;; stop) - $SBINDIR/xendomains stop + $LIBEXEC/xendomains stop ;; restart) - $SBINDIR/xendomains restart + $LIBEXEC/xendomains restart ;; reload) - $SBINDIR/xendomains reload + $LIBEXEC/xendomains reload ;; status) - $SBINDIR/xendomains status + $LIBEXEC/xendomains status ;; *) echo "Usage: $0 {start|stop|restart|reload|status}" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJW-0004m4-KS; Sun, 24 Aug 2014 23:35:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJV-0004ll-9k for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:09 +0000 Received: from [193.109.254.147:27521] by server-9.bemta-14.messagelabs.com id BB/54-31535-CA67AF35; Sun, 24 Aug 2014 23:35:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1408923306!12796241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.7 required=7.0 tests=BIZ_TLD X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24417 invoked from network); 24 Aug 2014 23:35:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJS-0006nb-LN for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJS-0000Um-Ba for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:06 +0000 Date: Sun, 24 Aug 2014 23:35:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug/Linux/init.d: fix wrong path in xendomains init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea878490c5b0b425dc235df1380824ecca77624 Author: Fabio Fantoni AuthorDate: Fri Aug 8 12:46:35 2014 +0200 Commit: Ian Campbell CommitDate: Thu Aug 21 23:32:43 2014 +0100 tools/hotplug/Linux/init.d: fix wrong path in xendomains init Fixed wrong path in xendomains init that make it not working, introduced in commit d8bad9df2544291a0fdc8e4d826b16f9f5394462 (tools/xendomains: move to libexec and use a smaller init helper). Signed-off-by: Fabio Fantoni Reviewed-by: Wei Liu Acked-by: Ian Campbell --- tools/hotplug/Linux/init.d/xendomains | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains index d0122fc..3857602 100644 --- a/tools/hotplug/Linux/init.d/xendomains +++ b/tools/hotplug/Linux/init.d/xendomains @@ -20,7 +20,7 @@ # Short-Description: Wrapper to start/stop secondary xen domains # Description: Wrapper for starting / stopping domains automatically # when domain 0 boots / shuts down on systems using init. -# The $SBINDIR/xendomains helper is shared between init and +# The $LIBEXEC/xendomains helper is shared between init and # systemd systems. ### END INIT INFO @@ -28,19 +28,19 @@ case "$1" in start) - $SBINDIR/xendomains start + $LIBEXEC/xendomains start ;; stop) - $SBINDIR/xendomains stop + $LIBEXEC/xendomains stop ;; restart) - $SBINDIR/xendomains restart + $LIBEXEC/xendomains restart ;; reload) - $SBINDIR/xendomains reload + $LIBEXEC/xendomains reload ;; status) - $SBINDIR/xendomains status + $LIBEXEC/xendomains status ;; *) echo "Usage: $0 {start|stop|restart|reload|status}" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJg-0004nx-NM; Sun, 24 Aug 2014 23:35:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJf-0004nk-Qy for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:20 +0000 Received: from [85.158.143.35:53725] by server-1.bemta-4.messagelabs.com id 0D/E0-05872-7B67AF35; Sun, 24 Aug 2014 23:35:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1408923317!9538320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6671 invoked from network); 24 Aug 2014 23:35:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJc-0006nh-Rf for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJc-0000VG-P2 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:16 +0000 Date: Sun, 24 Aug 2014 23:35:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/intel: protect set_cpuidmask() against #GP faults X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 02926b1729849c421d990009343a5456897e214a Author: Andrew Cooper AuthorDate: Fri Aug 22 14:28:12 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:28:12 2014 +0200 x86/intel: protect set_cpuidmask() against #GP faults Virtual environments such as Xen HVM containers and VirtualBox do not necessarily provide support for feature masking MSRs. As their presence is detected by model numbers alone, and their use predicated on command line parameters, use the safe() variants of {wr,rd}msr() to avoid dying with an early #GP fault. While playing in this function, make some further improvements. * Rename the masking MSR names for consistency, and name the CPU models for the benefit of humans reading the code. * Correct the CPU selection as specified in the flexmigration document. All steppings of 0x17 and 0x1a are stated to have masking MSRs. * Provide log messages indicating the masks applied, or lack of masking capabilities. * In the case of faulting support being available and masking command line options specified, provide a log message indicating the lack of masking. References: http://www.intel.com/content/www/us/en/virtualization/virtualization-technology-flexmigration-application-note.html http://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers Signed-off-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/cpu/intel.c | 152 +++++++++++++++++++++++++-------------- xen/include/asm-x86/msr-index.h | 13 ++-- 2 files changed, 106 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index e178b5c..9868cd5 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -51,68 +51,109 @@ void set_cpuid_faulting(bool_t enable) */ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) { - u32 eax, edx; - const char *extra = ""; + static unsigned int msr_basic, msr_ext, msr_xsave; + static enum { not_parsed, no_mask, set_mask } status; + u64 msr_val; + + if (status == no_mask) + return; + + if (status == set_mask) + goto setmask; + + ASSERT((status == not_parsed) && (c == &boot_cpu_data)); + status = no_mask; if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx & - opt_cpuid_mask_xsave_eax)) + opt_cpuid_mask_xsave_eax)) return; - /* Only family 6 supports this feature */ - switch ((c->x86 == 6) * c->x86_model) { - case 0x17: - if ((c->x86_mask & 0x0f) < 4) - break; - /* fall through */ - case 0x1d: - wrmsr(MSR_INTEL_CPUID_FEATURE_MASK, - opt_cpuid_mask_ecx, - opt_cpuid_mask_edx); - if (~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) - extra = "extended "; - else if (~opt_cpuid_mask_xsave_eax) - extra = "xsave "; - else - return; + /* Only family 6 supports this feature. */ + if (c->x86 != 6) { + printk("No CPUID feature masking support available\n"); + return; + } + + switch (c->x86_model) { + case 0x17: /* Yorkfield, Wolfdale, Penryn, Harpertown(DP) */ + case 0x1d: /* Dunnington(MP) */ + msr_basic = MSR_INTEL_MASK_V1_CPUID1; break; -/* - * CPU supports this feature if the processor signature meets the following: - * (CPUID.(EAX=01h):EAX) > 000106A2h, or - * (CPUID.(EAX=01h):EAX) == 000106Exh, 0002065xh, 000206Cxh, 000206Exh, or 000206Fxh - * - */ - case 0x1a: - if ((c->x86_mask & 0x0f) <= 2) - break; - /* fall through */ - case 0x1e: case 0x1f: - case 0x25: case 0x2c: case 0x2e: case 0x2f: - wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK, - opt_cpuid_mask_ecx, - opt_cpuid_mask_edx); - wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK, - opt_cpuid_mask_ext_ecx, - opt_cpuid_mask_ext_edx); - if (!~opt_cpuid_mask_xsave_eax) - return; - extra = "xsave "; + + case 0x1a: /* Bloomfield, Nehalem-EP(Gainestown) */ + case 0x1e: /* Clarksfield, Lynnfield, Jasper Forest */ + case 0x1f: /* Something Nehalem-based - perhaps Auburndale/Havendale? */ + case 0x25: /* Arrandale, Clarksdale */ + case 0x2c: /* Gulftown, Westmere-EP */ + case 0x2e: /* Nehalem-EX(Beckton) */ + case 0x2f: /* Westmere-EX */ + msr_basic = MSR_INTEL_MASK_V2_CPUID1; + msr_ext = MSR_INTEL_MASK_V2_CPUID80000001; + break; + + case 0x2a: /* SandyBridge */ + case 0x2d: /* SandyBridge-E, SandyBridge-EN, SandyBridge-EP */ + msr_basic = MSR_INTEL_MASK_V3_CPUID1; + msr_ext = MSR_INTEL_MASK_V3_CPUID80000001; + msr_xsave = MSR_INTEL_MASK_V3_CPUIDD_01; break; - case 0x2a: case 0x2d: - wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK_V2, - opt_cpuid_mask_ecx, - opt_cpuid_mask_edx); - rdmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, eax, edx); - wrmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, - opt_cpuid_mask_xsave_eax, edx); - wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK_V2, - opt_cpuid_mask_ext_ecx, - opt_cpuid_mask_ext_edx); - return; } - printk(XENLOG_ERR "Cannot set CPU %sfeature mask on CPU#%d\n", - extra, smp_processor_id()); + status = set_mask; + + if (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx)) { + if (msr_basic) + printk("Writing CPUID feature mask ecx:edx -> %08x:%08x\n", + opt_cpuid_mask_ecx, opt_cpuid_mask_edx); + else + printk("No CPUID feature mask available\n"); + } + else + msr_basic = 0; + + if (~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) { + if (msr_ext) + printk("Writing CPUID extended feature mask ecx:edx -> %08x:%08x\n", + opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx); + else + printk("No CPUID extended feature mask available\n"); + } + else + msr_ext = 0; + + if (~opt_cpuid_mask_xsave_eax) { + if (msr_xsave) + printk("Writing CPUID xsave feature mask eax -> %08x\n", + opt_cpuid_mask_xsave_eax); + else + printk("No CPUID xsave feature mask available\n"); + } + else + msr_xsave = 0; + + setmask: + if (msr_basic && + wrmsr_safe(msr_basic, + ((u64)opt_cpuid_mask_edx << 32) | opt_cpuid_mask_ecx)){ + msr_basic = 0; + printk("Failed to set CPUID feature mask\n"); + } + + if (msr_ext && + wrmsr_safe(msr_ext, + ((u64)opt_cpuid_mask_ext_edx << 32) | opt_cpuid_mask_ext_ecx)){ + msr_ext = 0; + printk("Failed to set CPUID extended feature mask\n"); + } + + if (msr_xsave && + (rdmsr_safe(msr_xsave, msr_val) || + wrmsr_safe(msr_xsave, + (msr_val & (~0ULL << 32)) | opt_cpuid_mask_xsave_eax))){ + msr_xsave = 0; + printk("Failed to set CPUID xsave feature mask\n"); + } } void __devinit early_intel_workaround(struct cpuinfo_x86 *c) @@ -222,6 +263,11 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) if (!cpu_has_cpuid_faulting) set_cpuidmask(c); + else if ((c == &boot_cpu_data) && + (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & + opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx & + opt_cpuid_mask_xsave_eax))) + printk("No CPUID feature masking support available\n"); /* Work around errata */ Intel_errata_workarounds(c); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 70a8201..7247497 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -469,13 +469,14 @@ #define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 /* Intel cpuid spoofing MSRs */ -#define MSR_INTEL_CPUID_FEATURE_MASK 0x00000478 -#define MSR_INTEL_CPUID1_FEATURE_MASK 0x00000130 -#define MSR_INTEL_CPUID80000001_FEATURE_MASK 0x00000131 +#define MSR_INTEL_MASK_V1_CPUID1 0x00000478 -#define MSR_INTEL_CPUID1_FEATURE_MASK_V2 0x00000132 -#define MSR_INTEL_CPUID80000001_FEATURE_MASK_V2 0x00000133 -#define MSR_INTEL_CPUIDD_01_FEATURE_MASK 0x00000134 +#define MSR_INTEL_MASK_V2_CPUID1 0x00000130 +#define MSR_INTEL_MASK_V2_CPUID80000001 0x00000131 + +#define MSR_INTEL_MASK_V3_CPUID1 0x00000132 +#define MSR_INTEL_MASK_V3_CPUID80000001 0x00000133 +#define MSR_INTEL_MASK_V3_CPUIDD_01 0x00000134 /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJg-0004nx-NM; Sun, 24 Aug 2014 23:35:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJf-0004nk-Qy for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:20 +0000 Received: from [85.158.143.35:53725] by server-1.bemta-4.messagelabs.com id 0D/E0-05872-7B67AF35; Sun, 24 Aug 2014 23:35:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1408923317!9538320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6671 invoked from network); 24 Aug 2014 23:35:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJc-0006nh-Rf for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJc-0000VG-P2 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:16 +0000 Date: Sun, 24 Aug 2014 23:35:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/intel: protect set_cpuidmask() against #GP faults X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 02926b1729849c421d990009343a5456897e214a Author: Andrew Cooper AuthorDate: Fri Aug 22 14:28:12 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:28:12 2014 +0200 x86/intel: protect set_cpuidmask() against #GP faults Virtual environments such as Xen HVM containers and VirtualBox do not necessarily provide support for feature masking MSRs. As their presence is detected by model numbers alone, and their use predicated on command line parameters, use the safe() variants of {wr,rd}msr() to avoid dying with an early #GP fault. While playing in this function, make some further improvements. * Rename the masking MSR names for consistency, and name the CPU models for the benefit of humans reading the code. * Correct the CPU selection as specified in the flexmigration document. All steppings of 0x17 and 0x1a are stated to have masking MSRs. * Provide log messages indicating the masks applied, or lack of masking capabilities. * In the case of faulting support being available and masking command line options specified, provide a log message indicating the lack of masking. References: http://www.intel.com/content/www/us/en/virtualization/virtualization-technology-flexmigration-application-note.html http://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers Signed-off-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/cpu/intel.c | 152 +++++++++++++++++++++++++-------------- xen/include/asm-x86/msr-index.h | 13 ++-- 2 files changed, 106 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index e178b5c..9868cd5 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -51,68 +51,109 @@ void set_cpuid_faulting(bool_t enable) */ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) { - u32 eax, edx; - const char *extra = ""; + static unsigned int msr_basic, msr_ext, msr_xsave; + static enum { not_parsed, no_mask, set_mask } status; + u64 msr_val; + + if (status == no_mask) + return; + + if (status == set_mask) + goto setmask; + + ASSERT((status == not_parsed) && (c == &boot_cpu_data)); + status = no_mask; if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx & - opt_cpuid_mask_xsave_eax)) + opt_cpuid_mask_xsave_eax)) return; - /* Only family 6 supports this feature */ - switch ((c->x86 == 6) * c->x86_model) { - case 0x17: - if ((c->x86_mask & 0x0f) < 4) - break; - /* fall through */ - case 0x1d: - wrmsr(MSR_INTEL_CPUID_FEATURE_MASK, - opt_cpuid_mask_ecx, - opt_cpuid_mask_edx); - if (~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) - extra = "extended "; - else if (~opt_cpuid_mask_xsave_eax) - extra = "xsave "; - else - return; + /* Only family 6 supports this feature. */ + if (c->x86 != 6) { + printk("No CPUID feature masking support available\n"); + return; + } + + switch (c->x86_model) { + case 0x17: /* Yorkfield, Wolfdale, Penryn, Harpertown(DP) */ + case 0x1d: /* Dunnington(MP) */ + msr_basic = MSR_INTEL_MASK_V1_CPUID1; break; -/* - * CPU supports this feature if the processor signature meets the following: - * (CPUID.(EAX=01h):EAX) > 000106A2h, or - * (CPUID.(EAX=01h):EAX) == 000106Exh, 0002065xh, 000206Cxh, 000206Exh, or 000206Fxh - * - */ - case 0x1a: - if ((c->x86_mask & 0x0f) <= 2) - break; - /* fall through */ - case 0x1e: case 0x1f: - case 0x25: case 0x2c: case 0x2e: case 0x2f: - wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK, - opt_cpuid_mask_ecx, - opt_cpuid_mask_edx); - wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK, - opt_cpuid_mask_ext_ecx, - opt_cpuid_mask_ext_edx); - if (!~opt_cpuid_mask_xsave_eax) - return; - extra = "xsave "; + + case 0x1a: /* Bloomfield, Nehalem-EP(Gainestown) */ + case 0x1e: /* Clarksfield, Lynnfield, Jasper Forest */ + case 0x1f: /* Something Nehalem-based - perhaps Auburndale/Havendale? */ + case 0x25: /* Arrandale, Clarksdale */ + case 0x2c: /* Gulftown, Westmere-EP */ + case 0x2e: /* Nehalem-EX(Beckton) */ + case 0x2f: /* Westmere-EX */ + msr_basic = MSR_INTEL_MASK_V2_CPUID1; + msr_ext = MSR_INTEL_MASK_V2_CPUID80000001; + break; + + case 0x2a: /* SandyBridge */ + case 0x2d: /* SandyBridge-E, SandyBridge-EN, SandyBridge-EP */ + msr_basic = MSR_INTEL_MASK_V3_CPUID1; + msr_ext = MSR_INTEL_MASK_V3_CPUID80000001; + msr_xsave = MSR_INTEL_MASK_V3_CPUIDD_01; break; - case 0x2a: case 0x2d: - wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK_V2, - opt_cpuid_mask_ecx, - opt_cpuid_mask_edx); - rdmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, eax, edx); - wrmsr(MSR_INTEL_CPUIDD_01_FEATURE_MASK, - opt_cpuid_mask_xsave_eax, edx); - wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK_V2, - opt_cpuid_mask_ext_ecx, - opt_cpuid_mask_ext_edx); - return; } - printk(XENLOG_ERR "Cannot set CPU %sfeature mask on CPU#%d\n", - extra, smp_processor_id()); + status = set_mask; + + if (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx)) { + if (msr_basic) + printk("Writing CPUID feature mask ecx:edx -> %08x:%08x\n", + opt_cpuid_mask_ecx, opt_cpuid_mask_edx); + else + printk("No CPUID feature mask available\n"); + } + else + msr_basic = 0; + + if (~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) { + if (msr_ext) + printk("Writing CPUID extended feature mask ecx:edx -> %08x:%08x\n", + opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx); + else + printk("No CPUID extended feature mask available\n"); + } + else + msr_ext = 0; + + if (~opt_cpuid_mask_xsave_eax) { + if (msr_xsave) + printk("Writing CPUID xsave feature mask eax -> %08x\n", + opt_cpuid_mask_xsave_eax); + else + printk("No CPUID xsave feature mask available\n"); + } + else + msr_xsave = 0; + + setmask: + if (msr_basic && + wrmsr_safe(msr_basic, + ((u64)opt_cpuid_mask_edx << 32) | opt_cpuid_mask_ecx)){ + msr_basic = 0; + printk("Failed to set CPUID feature mask\n"); + } + + if (msr_ext && + wrmsr_safe(msr_ext, + ((u64)opt_cpuid_mask_ext_edx << 32) | opt_cpuid_mask_ext_ecx)){ + msr_ext = 0; + printk("Failed to set CPUID extended feature mask\n"); + } + + if (msr_xsave && + (rdmsr_safe(msr_xsave, msr_val) || + wrmsr_safe(msr_xsave, + (msr_val & (~0ULL << 32)) | opt_cpuid_mask_xsave_eax))){ + msr_xsave = 0; + printk("Failed to set CPUID xsave feature mask\n"); + } } void __devinit early_intel_workaround(struct cpuinfo_x86 *c) @@ -222,6 +263,11 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) if (!cpu_has_cpuid_faulting) set_cpuidmask(c); + else if ((c == &boot_cpu_data) && + (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & + opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx & + opt_cpuid_mask_xsave_eax))) + printk("No CPUID feature masking support available\n"); /* Work around errata */ Intel_errata_workarounds(c); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 70a8201..7247497 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -469,13 +469,14 @@ #define MSR_CORE_PERF_GLOBAL_OVF_CTRL 0x00000390 /* Intel cpuid spoofing MSRs */ -#define MSR_INTEL_CPUID_FEATURE_MASK 0x00000478 -#define MSR_INTEL_CPUID1_FEATURE_MASK 0x00000130 -#define MSR_INTEL_CPUID80000001_FEATURE_MASK 0x00000131 +#define MSR_INTEL_MASK_V1_CPUID1 0x00000478 -#define MSR_INTEL_CPUID1_FEATURE_MASK_V2 0x00000132 -#define MSR_INTEL_CPUID80000001_FEATURE_MASK_V2 0x00000133 -#define MSR_INTEL_CPUIDD_01_FEATURE_MASK 0x00000134 +#define MSR_INTEL_MASK_V2_CPUID1 0x00000130 +#define MSR_INTEL_MASK_V2_CPUID80000001 0x00000131 + +#define MSR_INTEL_MASK_V3_CPUID1 0x00000132 +#define MSR_INTEL_MASK_V3_CPUID80000001 0x00000133 +#define MSR_INTEL_MASK_V3_CPUIDD_01 0x00000134 /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJq-0004pg-Rd; Sun, 24 Aug 2014 23:35:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJp-0004pL-R7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:29 +0000 Received: from [85.158.137.68:16655] by server-2.bemta-3.messagelabs.com id 66/04-09149-1C67AF35; Sun, 24 Aug 2014 23:35:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1408923327!15623302!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29473 invoked from network); 24 Aug 2014 23:35:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJn-0006np-1U for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJm-0000Vx-WC for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:27 +0000 Date: Sun, 24 Aug 2014 23:35:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: fix DebugCtl MSR clearing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfa625e15f3d6c374637f2bb789e1f444c2781c3 Author: Jan Beulich AuthorDate: Fri Aug 22 14:29:37 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:29:37 2014 +0200 VMX: fix DebugCtl MSR clearing The previous shortcut was wrong, as it bypassed the necessary vmwrite: All we really want to avoid if the guest writes zero is to add the MSR to the host-load list. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fb65c7d..46eeee2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2246,8 +2246,6 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) int i, rc = 0; uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF; - if ( !msr_content ) - break; if ( msr_content & ~supported ) { /* Perhaps some other bits are supported in vpmu. */ @@ -2267,12 +2265,10 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) } if ( (rc < 0) || - (vmx_add_host_load_msr(msr) < 0) ) + (msr_content && (vmx_add_host_load_msr(msr) < 0)) ) hvm_inject_hw_exception(TRAP_machine_check, 0); else - { __vmwrite(GUEST_IA32_DEBUGCTL, msr_content); - } break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJq-0004pg-Rd; Sun, 24 Aug 2014 23:35:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJp-0004pL-R7 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:29 +0000 Received: from [85.158.137.68:16655] by server-2.bemta-3.messagelabs.com id 66/04-09149-1C67AF35; Sun, 24 Aug 2014 23:35:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1408923327!15623302!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29473 invoked from network); 24 Aug 2014 23:35:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJn-0006np-1U for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJm-0000Vx-WC for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:27 +0000 Date: Sun, 24 Aug 2014 23:35:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: fix DebugCtl MSR clearing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dfa625e15f3d6c374637f2bb789e1f444c2781c3 Author: Jan Beulich AuthorDate: Fri Aug 22 14:29:37 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:29:37 2014 +0200 VMX: fix DebugCtl MSR clearing The previous shortcut was wrong, as it bypassed the necessary vmwrite: All we really want to avoid if the guest writes zero is to add the MSR to the host-load list. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fb65c7d..46eeee2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2246,8 +2246,6 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) int i, rc = 0; uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF; - if ( !msr_content ) - break; if ( msr_content & ~supported ) { /* Perhaps some other bits are supported in vpmu. */ @@ -2267,12 +2265,10 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) } if ( (rc < 0) || - (vmx_add_host_load_msr(msr) < 0) ) + (msr_content && (vmx_add_host_load_msr(msr) < 0)) ) hvm_inject_hw_exception(TRAP_machine_check, 0); else - { __vmwrite(GUEST_IA32_DEBUGCTL, msr_content); - } break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhK0-0004rC-UF; Sun, 24 Aug 2014 23:35:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJz-0004r0-Uq for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:40 +0000 Received: from [85.158.139.211:26425] by server-13.bemta-5.messagelabs.com id 79/69-20082-BC67AF35; Sun, 24 Aug 2014 23:35:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1408923337!6598545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 792 invoked from network); 24 Aug 2014 23:35:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJx-0006ny-70 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJx-0000Wa-5b for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:37 +0000 Date: Sun, 24 Aug 2014 23:35:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX/vPMU: fix DebugCtl MSR handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d9b91f1aeaa08a8cc261efae3d9c8dca56edf4d Author: Jan Beulich AuthorDate: Fri Aug 22 14:30:27 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:30:27 2014 +0200 VMX/vPMU: fix DebugCtl MSR handling - writes with one of the vPMU-supported flags and some unsupported one set got accepted, leading to a VM entry failure - writes with one of the vPMU-supported flags set but the Debug Store feature unavailable produced a #GP (other than other writes to this MSR with unsupported bits set) Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/svm/vpmu.c | 5 ++++- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/arch/x86/hvm/vmx/vpmu_core2.c | 25 ++++++++++++++----------- xen/arch/x86/hvm/vpmu.c | 4 ++-- xen/include/asm-x86/hvm/vpmu.h | 5 +++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 71b8a6a..98b6b13 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1789,7 +1789,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: - vpmu_do_wrmsr(msr, msr_content); + vpmu_do_wrmsr(msr, msr_content, 0); break; case MSR_IA32_MCx_MISC(4): /* Threshold register */ diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 3ac7d53..8e07a98 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -278,11 +278,14 @@ static void context_update(unsigned int msr, u64 msr_content) } } -static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) +static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, + uint64_t supported) { struct vcpu *v = current; struct vpmu_struct *vpmu = vcpu_vpmu(v); + ASSERT(!supported); + /* For all counters, enable guest only mode for HVM guest */ if ( (get_pmu_reg_type(msr) == MSR_TYPE_CTRL) && !(is_guest_mode(msr_content)) ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 46eeee2..f2496c4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2249,7 +2249,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) if ( msr_content & ~supported ) { /* Perhaps some other bits are supported in vpmu. */ - if ( !vpmu_do_wrmsr(msr, msr_content) ) + if ( !vpmu_do_wrmsr(msr, msr_content, supported) ) break; } if ( msr_content & IA32_DEBUGCTLMSR_LBR ) @@ -2278,7 +2278,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) goto gp_fault; break; default: - if ( vpmu_do_wrmsr(msr, msr_content) ) + if ( vpmu_do_wrmsr(msr, msr_content, 0) ) return X86EMUL_OKAY; if ( passive_domain_do_wrmsr(msr, msr_content) ) return X86EMUL_OKAY; diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index ccd14d9..e4b9d7b 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -454,7 +454,8 @@ 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) +static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, + uint64_t supported) { u64 global_ctrl, non_global_ctrl; char pmu_enable = 0; @@ -469,24 +470,26 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) /* Special handling for BTS */ if ( msr == MSR_IA32_DEBUGCTLMSR ) { - uint64_t supported = IA32_DEBUGCTLMSR_TR | IA32_DEBUGCTLMSR_BTS | - IA32_DEBUGCTLMSR_BTINT; + supported |= IA32_DEBUGCTLMSR_TR | IA32_DEBUGCTLMSR_BTS | + IA32_DEBUGCTLMSR_BTINT; if ( cpu_has(¤t_cpu_data, X86_FEATURE_DSCPL) ) supported |= IA32_DEBUGCTLMSR_BTS_OFF_OS | IA32_DEBUGCTLMSR_BTS_OFF_USR; - if ( msr_content & supported ) - { - if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_BTS) ) - return 1; - gdprintk(XENLOG_WARNING, "Debug Store is not supported on this cpu\n"); - hvm_inject_hw_exception(TRAP_gp_fault, 0); - return 0; - } + if ( !(msr_content & ~supported) && + vpmu_is_set(vpmu, VPMU_CPU_HAS_BTS) ) + return 1; + if ( (msr_content & supported) && + !vpmu_is_set(vpmu, VPMU_CPU_HAS_BTS) ) + printk(XENLOG_G_WARNING + "%pv: Debug Store unsupported on this CPU\n", + current); } return 0; } + ASSERT(!supported); + core2_vpmu_cxt = vpmu->context; switch ( msr ) { diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 63765fa..15d5b6f 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -64,12 +64,12 @@ static void __init parse_vpmu_param(char *s) } } -int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) +int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, uint64_t supported) { struct vpmu_struct *vpmu = vcpu_vpmu(current); if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->do_wrmsr ) - return vpmu->arch_vpmu_ops->do_wrmsr(msr, msr_content); + return vpmu->arch_vpmu_ops->do_wrmsr(msr, msr_content, supported); return 0; } diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 40f63fb..9a5ac01 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -45,7 +45,8 @@ /* Arch specific operations shared by all vpmus */ struct arch_vpmu_ops { - int (*do_wrmsr)(unsigned int msr, uint64_t msr_content); + int (*do_wrmsr)(unsigned int msr, uint64_t msr_content, + uint64_t supported); int (*do_rdmsr)(unsigned int msr, uint64_t *msr_content); int (*do_interrupt)(struct cpu_user_regs *regs); void (*do_cpuid)(unsigned int input, @@ -86,7 +87,7 @@ struct vpmu_struct { #define vpmu_is_set(_vpmu, _x) ((_vpmu)->flags & (_x)) #define vpmu_clear(_vpmu) ((_vpmu)->flags = 0) -int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content); +int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, uint64_t supported); int vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content); int vpmu_do_interrupt(struct cpu_user_regs *regs); void vpmu_do_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhK0-0004rC-UF; Sun, 24 Aug 2014 23:35:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJz-0004r0-Uq for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:40 +0000 Received: from [85.158.139.211:26425] by server-13.bemta-5.messagelabs.com id 79/69-20082-BC67AF35; Sun, 24 Aug 2014 23:35:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1408923337!6598545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 792 invoked from network); 24 Aug 2014 23:35:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhJx-0006ny-70 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhJx-0000Wa-5b for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:37 +0000 Date: Sun, 24 Aug 2014 23:35:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX/vPMU: fix DebugCtl MSR handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d9b91f1aeaa08a8cc261efae3d9c8dca56edf4d Author: Jan Beulich AuthorDate: Fri Aug 22 14:30:27 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:30:27 2014 +0200 VMX/vPMU: fix DebugCtl MSR handling - writes with one of the vPMU-supported flags and some unsupported one set got accepted, leading to a VM entry failure - writes with one of the vPMU-supported flags set but the Debug Store feature unavailable produced a #GP (other than other writes to this MSR with unsupported bits set) Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/svm/vpmu.c | 5 ++++- xen/arch/x86/hvm/vmx/vmx.c | 4 ++-- xen/arch/x86/hvm/vmx/vpmu_core2.c | 25 ++++++++++++++----------- xen/arch/x86/hvm/vpmu.c | 4 ++-- xen/include/asm-x86/hvm/vpmu.h | 5 +++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 71b8a6a..98b6b13 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1789,7 +1789,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: - vpmu_do_wrmsr(msr, msr_content); + vpmu_do_wrmsr(msr, msr_content, 0); break; case MSR_IA32_MCx_MISC(4): /* Threshold register */ diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 3ac7d53..8e07a98 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -278,11 +278,14 @@ static void context_update(unsigned int msr, u64 msr_content) } } -static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) +static int amd_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, + uint64_t supported) { struct vcpu *v = current; struct vpmu_struct *vpmu = vcpu_vpmu(v); + ASSERT(!supported); + /* For all counters, enable guest only mode for HVM guest */ if ( (get_pmu_reg_type(msr) == MSR_TYPE_CTRL) && !(is_guest_mode(msr_content)) ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 46eeee2..f2496c4 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2249,7 +2249,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) if ( msr_content & ~supported ) { /* Perhaps some other bits are supported in vpmu. */ - if ( !vpmu_do_wrmsr(msr, msr_content) ) + if ( !vpmu_do_wrmsr(msr, msr_content, supported) ) break; } if ( msr_content & IA32_DEBUGCTLMSR_LBR ) @@ -2278,7 +2278,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) goto gp_fault; break; default: - if ( vpmu_do_wrmsr(msr, msr_content) ) + if ( vpmu_do_wrmsr(msr, msr_content, 0) ) return X86EMUL_OKAY; if ( passive_domain_do_wrmsr(msr, msr_content) ) return X86EMUL_OKAY; diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index ccd14d9..e4b9d7b 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -454,7 +454,8 @@ 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) +static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, + uint64_t supported) { u64 global_ctrl, non_global_ctrl; char pmu_enable = 0; @@ -469,24 +470,26 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) /* Special handling for BTS */ if ( msr == MSR_IA32_DEBUGCTLMSR ) { - uint64_t supported = IA32_DEBUGCTLMSR_TR | IA32_DEBUGCTLMSR_BTS | - IA32_DEBUGCTLMSR_BTINT; + supported |= IA32_DEBUGCTLMSR_TR | IA32_DEBUGCTLMSR_BTS | + IA32_DEBUGCTLMSR_BTINT; if ( cpu_has(¤t_cpu_data, X86_FEATURE_DSCPL) ) supported |= IA32_DEBUGCTLMSR_BTS_OFF_OS | IA32_DEBUGCTLMSR_BTS_OFF_USR; - if ( msr_content & supported ) - { - if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_BTS) ) - return 1; - gdprintk(XENLOG_WARNING, "Debug Store is not supported on this cpu\n"); - hvm_inject_hw_exception(TRAP_gp_fault, 0); - return 0; - } + if ( !(msr_content & ~supported) && + vpmu_is_set(vpmu, VPMU_CPU_HAS_BTS) ) + return 1; + if ( (msr_content & supported) && + !vpmu_is_set(vpmu, VPMU_CPU_HAS_BTS) ) + printk(XENLOG_G_WARNING + "%pv: Debug Store unsupported on this CPU\n", + current); } return 0; } + ASSERT(!supported); + core2_vpmu_cxt = vpmu->context; switch ( msr ) { diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 63765fa..15d5b6f 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -64,12 +64,12 @@ static void __init parse_vpmu_param(char *s) } } -int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content) +int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, uint64_t supported) { struct vpmu_struct *vpmu = vcpu_vpmu(current); if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->do_wrmsr ) - return vpmu->arch_vpmu_ops->do_wrmsr(msr, msr_content); + return vpmu->arch_vpmu_ops->do_wrmsr(msr, msr_content, supported); return 0; } diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h index 40f63fb..9a5ac01 100644 --- a/xen/include/asm-x86/hvm/vpmu.h +++ b/xen/include/asm-x86/hvm/vpmu.h @@ -45,7 +45,8 @@ /* Arch specific operations shared by all vpmus */ struct arch_vpmu_ops { - int (*do_wrmsr)(unsigned int msr, uint64_t msr_content); + int (*do_wrmsr)(unsigned int msr, uint64_t msr_content, + uint64_t supported); int (*do_rdmsr)(unsigned int msr, uint64_t *msr_content); int (*do_interrupt)(struct cpu_user_regs *regs); void (*do_cpuid)(unsigned int input, @@ -86,7 +87,7 @@ struct vpmu_struct { #define vpmu_is_set(_vpmu, _x) ((_vpmu)->flags & (_x)) #define vpmu_clear(_vpmu) ((_vpmu)->flags = 0) -int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content); +int vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, uint64_t supported); int vpmu_do_rdmsr(unsigned int msr, uint64_t *msr_content); int vpmu_do_interrupt(struct cpu_user_regs *regs); void vpmu_do_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKA-0004tx-T3; Sun, 24 Aug 2014 23:35:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKA-0004tl-Fc for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:50 +0000 Received: from [85.158.139.211:55182] by server-14.bemta-5.messagelabs.com id 95/B8-12422-5D67AF35; Sun, 24 Aug 2014 23:35:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1408923347!8040744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8058 invoked from network); 24 Aug 2014 23:35:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhK7-0006o4-Jt for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhK7-0000XE-B4 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:47 +0000 Date: Sun, 24 Aug 2014 23:35:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: allow RTM advanced debugging to be used by guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6df080467cde47d9ec5e81fde967567953619a25 Author: Jan Beulich AuthorDate: Fri Aug 22 14:31:18 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:31:18 2014 +0200 VMX: allow RTM advanced debugging to be used by guests All that is needed here is allowing the respective DebugCtl MSR bit to be set by the guest. At once - even if PV guests can't currently use it due to missing DebugCtl MSR virtualization - make the respective adjustments to debugreg.h. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 2 ++ xen/include/asm-x86/debugreg.h | 2 ++ xen/include/asm-x86/msr-index.h | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f2496c4..dc18a72 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2246,6 +2246,8 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) int i, rc = 0; uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF; + if ( boot_cpu_has(X86_FEATURE_RTM) ) + supported |= IA32_DEBUGCTLMSR_RTM; if ( msr_content & ~supported ) { /* Perhaps some other bits are supported in vpmu. */ diff --git a/xen/include/asm-x86/debugreg.h b/xen/include/asm-x86/debugreg.h index 62007bb..a5b2838 100644 --- a/xen/include/asm-x86/debugreg.h +++ b/xen/include/asm-x86/debugreg.h @@ -20,6 +20,7 @@ #define DR_TRAP3 (0x8) /* db3 */ #define DR_STEP (0x4000) /* single-step */ #define DR_SWITCH (0x8000) /* task switch */ +#define DR_NOT_RTM (0x10000) /* clear: #BP inside RTM region */ /* Now define a bunch of things for manipulating the control register. The top two bytes of the control register consist of 4 fields of 4 @@ -62,6 +63,7 @@ #define DR_CONTROL_RESERVED_ONE (0x00000400ul) /* Reserved, read as one */ #define DR_LOCAL_EXACT_ENABLE (0x00000100ul) /* Local exact enable */ #define DR_GLOBAL_EXACT_ENABLE (0x00000200ul) /* Global exact enable */ +#define DR_RTM_ENABLE (0x00000800ul) /* RTM debugging enable */ #define DR_GENERAL_DETECT (0x00002000ul) /* General detect enable */ #define write_debugreg(reg, val) do { \ diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 7247497..da732b7 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -79,6 +79,7 @@ #define IA32_DEBUGCTLMSR_BTINT (1<<8) /* Branch Trace Interrupt */ #define IA32_DEBUGCTLMSR_BTS_OFF_OS (1<<9) /* BTS off if CPL 0 */ #define IA32_DEBUGCTLMSR_BTS_OFF_USR (1<<10) /* BTS off if CPL > 0 */ +#define IA32_DEBUGCTLMSR_RTM (1<<15) /* RTM debugging enable */ #define MSR_IA32_LASTBRANCHFROMIP 0x000001db #define MSR_IA32_LASTBRANCHTOIP 0x000001dc -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:35:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:35:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKA-0004tx-T3; Sun, 24 Aug 2014 23:35:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKA-0004tl-Fc for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:50 +0000 Received: from [85.158.139.211:55182] by server-14.bemta-5.messagelabs.com id 95/B8-12422-5D67AF35; Sun, 24 Aug 2014 23:35:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1408923347!8040744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8058 invoked from network); 24 Aug 2014 23:35:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhK7-0006o4-Jt for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhK7-0000XE-B4 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:47 +0000 Date: Sun, 24 Aug 2014 23:35:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: allow RTM advanced debugging to be used by guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6df080467cde47d9ec5e81fde967567953619a25 Author: Jan Beulich AuthorDate: Fri Aug 22 14:31:18 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:31:18 2014 +0200 VMX: allow RTM advanced debugging to be used by guests All that is needed here is allowing the respective DebugCtl MSR bit to be set by the guest. At once - even if PV guests can't currently use it due to missing DebugCtl MSR virtualization - make the respective adjustments to debugreg.h. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 2 ++ xen/include/asm-x86/debugreg.h | 2 ++ xen/include/asm-x86/msr-index.h | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f2496c4..dc18a72 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2246,6 +2246,8 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) int i, rc = 0; uint64_t supported = IA32_DEBUGCTLMSR_LBR | IA32_DEBUGCTLMSR_BTF; + if ( boot_cpu_has(X86_FEATURE_RTM) ) + supported |= IA32_DEBUGCTLMSR_RTM; if ( msr_content & ~supported ) { /* Perhaps some other bits are supported in vpmu. */ diff --git a/xen/include/asm-x86/debugreg.h b/xen/include/asm-x86/debugreg.h index 62007bb..a5b2838 100644 --- a/xen/include/asm-x86/debugreg.h +++ b/xen/include/asm-x86/debugreg.h @@ -20,6 +20,7 @@ #define DR_TRAP3 (0x8) /* db3 */ #define DR_STEP (0x4000) /* single-step */ #define DR_SWITCH (0x8000) /* task switch */ +#define DR_NOT_RTM (0x10000) /* clear: #BP inside RTM region */ /* Now define a bunch of things for manipulating the control register. The top two bytes of the control register consist of 4 fields of 4 @@ -62,6 +63,7 @@ #define DR_CONTROL_RESERVED_ONE (0x00000400ul) /* Reserved, read as one */ #define DR_LOCAL_EXACT_ENABLE (0x00000100ul) /* Local exact enable */ #define DR_GLOBAL_EXACT_ENABLE (0x00000200ul) /* Global exact enable */ +#define DR_RTM_ENABLE (0x00000800ul) /* RTM debugging enable */ #define DR_GENERAL_DETECT (0x00002000ul) /* General detect enable */ #define write_debugreg(reg, val) do { \ diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 7247497..da732b7 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -79,6 +79,7 @@ #define IA32_DEBUGCTLMSR_BTINT (1<<8) /* Branch Trace Interrupt */ #define IA32_DEBUGCTLMSR_BTS_OFF_OS (1<<9) /* BTS off if CPL 0 */ #define IA32_DEBUGCTLMSR_BTS_OFF_USR (1<<10) /* BTS off if CPL > 0 */ +#define IA32_DEBUGCTLMSR_RTM (1<<15) /* RTM debugging enable */ #define MSR_IA32_LASTBRANCHFROMIP 0x000001db #define MSR_IA32_LASTBRANCHTOIP 0x000001dc -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKK-0004wQ-Vd; Sun, 24 Aug 2014 23:36:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKK-0004w5-B8 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:00 +0000 Received: from [85.158.143.35:54897] by server-2.bemta-4.messagelabs.com id 98/71-04525-FD67AF35; Sun, 24 Aug 2014 23:35:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1408923357!4913738!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19505 invoked from network); 24 Aug 2014 23:35:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKH-0006oG-PP for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKH-0000YY-OJ for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:57 +0000 Date: Sun, 24 Aug 2014 23:35:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX/vPMU: reduce core2_vpmu_initialise() verbosity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 451a1eacc5690375b8f22c949a497b7a34e86c27 Author: Jan Beulich AuthorDate: Fri Aug 22 14:32:07 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:32:07 2014 +0200 VMX/vPMU: reduce core2_vpmu_initialise() verbosity No need to print these messages for each vCPU, even more, no need to print them for each domain - they all depend on CPU features that are either there or not. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index e4b9d7b..56f5059 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -764,19 +764,19 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { struct vpmu_struct *vpmu = vcpu_vpmu(v); u64 msr_content; - struct cpuinfo_x86 *c = ¤t_cpu_data; + static bool_t ds_warned; if ( !(vpmu_flags & VPMU_BOOT_BTS) ) goto func_out; /* Check the 'Debug Store' feature in the CPUID.EAX[1]:EDX[21] */ - if ( cpu_has(c, X86_FEATURE_DS) ) + while ( boot_cpu_has(X86_FEATURE_DS) ) { - if ( !cpu_has(c, X86_FEATURE_DTES64) ) + if ( !boot_cpu_has(X86_FEATURE_DTES64) ) { - printk(XENLOG_G_WARNING "CPU doesn't support 64-bit DS Area" - " - Debug Store disabled for %pv\n", - v); - goto func_out; + if ( !ds_warned ) + printk(XENLOG_G_WARNING "CPU doesn't support 64-bit DS Area" + " - Debug Store disabled for guests\n"); + break; } vpmu_set(vpmu, VPMU_CPU_HAS_DS); rdmsrl(MSR_IA32_MISC_ENABLE, msr_content); @@ -784,14 +784,16 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { /* If BTS_UNAVAIL is set reset the DS feature. */ vpmu_reset(vpmu, VPMU_CPU_HAS_DS); - printk(XENLOG_G_WARNING "CPU has set BTS_UNAVAIL" - " - Debug Store disabled for %pv\n", - v); + if ( !ds_warned ) + printk(XENLOG_G_WARNING "CPU has set BTS_UNAVAIL" + " - Debug Store disabled for guests\n"); + break; } - else + + vpmu_set(vpmu, VPMU_CPU_HAS_BTS); + if ( !ds_warned ) { - vpmu_set(vpmu, VPMU_CPU_HAS_BTS); - if ( !cpu_has(c, X86_FEATURE_DSCPL) ) + if ( !boot_cpu_has(X86_FEATURE_DSCPL) ) printk(XENLOG_G_INFO "vpmu: CPU doesn't support CPL-Qualified BTS\n"); printk("******************************************************\n"); @@ -803,8 +805,10 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) printk("** It is NOT recommended for production use! **\n"); printk("******************************************************\n"); } + break; } -func_out: + ds_warned = 1; + func_out: check_pmc_quirk(); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKK-0004wQ-Vd; Sun, 24 Aug 2014 23:36:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKK-0004w5-B8 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:00 +0000 Received: from [85.158.143.35:54897] by server-2.bemta-4.messagelabs.com id 98/71-04525-FD67AF35; Sun, 24 Aug 2014 23:35:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1408923357!4913738!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19505 invoked from network); 24 Aug 2014 23:35:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:35:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKH-0006oG-PP for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKH-0000YY-OJ for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:35:57 +0000 Date: Sun, 24 Aug 2014 23:35:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX/vPMU: reduce core2_vpmu_initialise() verbosity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 451a1eacc5690375b8f22c949a497b7a34e86c27 Author: Jan Beulich AuthorDate: Fri Aug 22 14:32:07 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:32:07 2014 +0200 VMX/vPMU: reduce core2_vpmu_initialise() verbosity No need to print these messages for each vCPU, even more, no need to print them for each domain - they all depend on CPU features that are either there or not. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index e4b9d7b..56f5059 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -764,19 +764,19 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { struct vpmu_struct *vpmu = vcpu_vpmu(v); u64 msr_content; - struct cpuinfo_x86 *c = ¤t_cpu_data; + static bool_t ds_warned; if ( !(vpmu_flags & VPMU_BOOT_BTS) ) goto func_out; /* Check the 'Debug Store' feature in the CPUID.EAX[1]:EDX[21] */ - if ( cpu_has(c, X86_FEATURE_DS) ) + while ( boot_cpu_has(X86_FEATURE_DS) ) { - if ( !cpu_has(c, X86_FEATURE_DTES64) ) + if ( !boot_cpu_has(X86_FEATURE_DTES64) ) { - printk(XENLOG_G_WARNING "CPU doesn't support 64-bit DS Area" - " - Debug Store disabled for %pv\n", - v); - goto func_out; + if ( !ds_warned ) + printk(XENLOG_G_WARNING "CPU doesn't support 64-bit DS Area" + " - Debug Store disabled for guests\n"); + break; } vpmu_set(vpmu, VPMU_CPU_HAS_DS); rdmsrl(MSR_IA32_MISC_ENABLE, msr_content); @@ -784,14 +784,16 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { /* If BTS_UNAVAIL is set reset the DS feature. */ vpmu_reset(vpmu, VPMU_CPU_HAS_DS); - printk(XENLOG_G_WARNING "CPU has set BTS_UNAVAIL" - " - Debug Store disabled for %pv\n", - v); + if ( !ds_warned ) + printk(XENLOG_G_WARNING "CPU has set BTS_UNAVAIL" + " - Debug Store disabled for guests\n"); + break; } - else + + vpmu_set(vpmu, VPMU_CPU_HAS_BTS); + if ( !ds_warned ) { - vpmu_set(vpmu, VPMU_CPU_HAS_BTS); - if ( !cpu_has(c, X86_FEATURE_DSCPL) ) + if ( !boot_cpu_has(X86_FEATURE_DSCPL) ) printk(XENLOG_G_INFO "vpmu: CPU doesn't support CPL-Qualified BTS\n"); printk("******************************************************\n"); @@ -803,8 +805,10 @@ static int core2_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) printk("** It is NOT recommended for production use! **\n"); printk("******************************************************\n"); } + break; } -func_out: + ds_warned = 1; + func_out: check_pmc_quirk(); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKV-0004yi-1y; Sun, 24 Aug 2014 23:36:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKU-0004yT-Gj for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:10 +0000 Received: from [193.109.254.147:60348] by server-1.bemta-14.messagelabs.com id 44/4D-24760-9E67AF35; Sun, 24 Aug 2014 23:36:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1408923368!12815226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16284 invoked from network); 24 Aug 2014 23:36:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKR-0006oo-Uu for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKR-0000ZG-Tp for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:07 +0000 Date: Sun, 24 Aug 2014 23:36:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/irq: process softirqs in irq keyhandlers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e13b3203990706db1313ec2aadd9a30b249ee793 Author: Andrew Cooper AuthorDate: Fri Aug 22 14:32:45 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:32:45 2014 +0200 x86/irq: process softirqs in irq keyhandlers Large machines with lots of interrupts can trip over the Xen watchdog. Suggested-by: Santosh Jodh Signed-off-by: Andrew Cooper Tested-by: Santosh Jodh --- xen/arch/x86/io_apic.c | 10 ++++++++++ xen/arch/x86/irq.c | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 4e6fe2b..1b57636 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1112,6 +1113,8 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_INFO "testing the IO APIC.......................\n"); for (apic = 0; apic < nr_ioapics; apic++) { + process_pending_softirqs(); + if (!nr_ioapic_entries[apic]) continue; @@ -1215,6 +1218,10 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_DEBUG "IRQ to pin mappings:\n"); for (i = 0; i < nr_irqs_gsi; i++) { struct irq_pin_list *entry = irq_2_pin + i; + + if ( !(i & 0x1f) ) + process_pending_softirqs(); + if (entry->pin < 0) continue; printk(KERN_DEBUG "IRQ%d ", irq_to_desc(i)->arch.vector); @@ -2454,6 +2461,9 @@ void dump_ioapic_irq_info(void) for ( irq = 0; irq < nr_irqs_gsi; irq++ ) { + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + entry = &irq_2_pin[irq]; if ( entry->pin == -1 ) continue; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index dafd338..f214072 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -2234,6 +2235,8 @@ static void dump_irqs(unsigned char key) for ( irq = 0; irq < nr_irqs; irq++ ) { + if ( !(irq & 0x1f) ) + process_pending_softirqs(); desc = irq_to_desc(irq); @@ -2287,6 +2290,7 @@ static void dump_irqs(unsigned char key) xfree(ssid); } + process_pending_softirqs(); printk("Direct vector information:\n"); for ( i = FIRST_DYNAMIC_VECTOR; i < NR_VECTORS; ++i ) if ( direct_apic_vector[i] ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKV-0004yi-1y; Sun, 24 Aug 2014 23:36:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKU-0004yT-Gj for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:10 +0000 Received: from [193.109.254.147:60348] by server-1.bemta-14.messagelabs.com id 44/4D-24760-9E67AF35; Sun, 24 Aug 2014 23:36:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1408923368!12815226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16284 invoked from network); 24 Aug 2014 23:36:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKR-0006oo-Uu for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKR-0000ZG-Tp for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:07 +0000 Date: Sun, 24 Aug 2014 23:36:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/irq: process softirqs in irq keyhandlers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e13b3203990706db1313ec2aadd9a30b249ee793 Author: Andrew Cooper AuthorDate: Fri Aug 22 14:32:45 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:32:45 2014 +0200 x86/irq: process softirqs in irq keyhandlers Large machines with lots of interrupts can trip over the Xen watchdog. Suggested-by: Santosh Jodh Signed-off-by: Andrew Cooper Tested-by: Santosh Jodh --- xen/arch/x86/io_apic.c | 10 ++++++++++ xen/arch/x86/irq.c | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 4e6fe2b..1b57636 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1112,6 +1113,8 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_INFO "testing the IO APIC.......................\n"); for (apic = 0; apic < nr_ioapics; apic++) { + process_pending_softirqs(); + if (!nr_ioapic_entries[apic]) continue; @@ -1215,6 +1218,10 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_DEBUG "IRQ to pin mappings:\n"); for (i = 0; i < nr_irqs_gsi; i++) { struct irq_pin_list *entry = irq_2_pin + i; + + if ( !(i & 0x1f) ) + process_pending_softirqs(); + if (entry->pin < 0) continue; printk(KERN_DEBUG "IRQ%d ", irq_to_desc(i)->arch.vector); @@ -2454,6 +2461,9 @@ void dump_ioapic_irq_info(void) for ( irq = 0; irq < nr_irqs_gsi; irq++ ) { + if ( !(irq & 0x1f) ) + process_pending_softirqs(); + entry = &irq_2_pin[irq]; if ( entry->pin == -1 ) continue; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index dafd338..f214072 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -2234,6 +2235,8 @@ static void dump_irqs(unsigned char key) for ( irq = 0; irq < nr_irqs; irq++ ) { + if ( !(irq & 0x1f) ) + process_pending_softirqs(); desc = irq_to_desc(irq); @@ -2287,6 +2290,7 @@ static void dump_irqs(unsigned char key) xfree(ssid); } + process_pending_softirqs(); printk("Direct vector information:\n"); for ( i = FIRST_DYNAMIC_VECTOR; i < NR_VECTORS; ++i ) if ( direct_apic_vector[i] ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKf-00050T-4p; Sun, 24 Aug 2014 23:36:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKe-00050I-Gz for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:20 +0000 Received: from [85.158.139.211:56007] by server-8.bemta-5.messagelabs.com id EB/42-22440-3F67AF35; Sun, 24 Aug 2014 23:36:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1408923378!6598606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1785 invoked from network); 24 Aug 2014 23:36:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKc-0006ou-47 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKc-0000Zt-2H for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:18 +0000 Date: Sun, 24 Aug 2014 23:36:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/alternatives: force inline stac() and clac() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b050edf7d82a6179bf9d9c4b602484af3ab99c1c Author: Andrew Cooper AuthorDate: Fri Aug 22 14:33:14 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:33:14 2014 +0200 x86/alternatives: force inline stac() and clac() In this case, we know better than the compiler. gcc 4.7 (Debian Wheezy) chooses to create translation-unit-local functions (even for non-debug builds) named stac() and clac(), and calls them. $ objdump -d xen-syms | grep -c ":" 6 $ objdump -d xen-syms | grep -o "callq [0-9a-f]\+ " | uniq -c 5 callq ffff82d0801166c9 20 callq ffff82d08015ef99 4 callq ffff82d080165169 8 callq ffff82d080188cb9 3 callq ffff82d080228779 4 callq ffff82d08022c5c9 Forcing always_inline removes these functions, and replaces each of the callqs with the expected 3byte nops. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/asm_defns.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index f8ef1f8..1674c7c 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -179,13 +179,13 @@ void ret_from_intr(void); #define ASM_STAC ASM_AC(STAC) #define ASM_CLAC ASM_AC(CLAC) #else -static inline void clac(void) +static always_inline void clac(void) { /* Note: a barrier is implicit in alternative() */ alternative(ASM_NOP3, __stringify(__ASM_CLAC), X86_FEATURE_SMAP); } -static inline void stac(void) +static always_inline void stac(void) { /* Note: a barrier is implicit in alternative() */ alternative(ASM_NOP3, __stringify(__ASM_STAC), X86_FEATURE_SMAP); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKf-00050T-4p; Sun, 24 Aug 2014 23:36:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKe-00050I-Gz for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:20 +0000 Received: from [85.158.139.211:56007] by server-8.bemta-5.messagelabs.com id EB/42-22440-3F67AF35; Sun, 24 Aug 2014 23:36:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1408923378!6598606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1785 invoked from network); 24 Aug 2014 23:36:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKc-0006ou-47 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKc-0000Zt-2H for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:18 +0000 Date: Sun, 24 Aug 2014 23:36:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/alternatives: force inline stac() and clac() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b050edf7d82a6179bf9d9c4b602484af3ab99c1c Author: Andrew Cooper AuthorDate: Fri Aug 22 14:33:14 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:33:14 2014 +0200 x86/alternatives: force inline stac() and clac() In this case, we know better than the compiler. gcc 4.7 (Debian Wheezy) chooses to create translation-unit-local functions (even for non-debug builds) named stac() and clac(), and calls them. $ objdump -d xen-syms | grep -c ":" 6 $ objdump -d xen-syms | grep -o "callq [0-9a-f]\+ " | uniq -c 5 callq ffff82d0801166c9 20 callq ffff82d08015ef99 4 callq ffff82d080165169 8 callq ffff82d080188cb9 3 callq ffff82d080228779 4 callq ffff82d08022c5c9 Forcing always_inline removes these functions, and replaces each of the callqs with the expected 3byte nops. Signed-off-by: Andrew Cooper --- xen/include/asm-x86/asm_defns.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index f8ef1f8..1674c7c 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -179,13 +179,13 @@ void ret_from_intr(void); #define ASM_STAC ASM_AC(STAC) #define ASM_CLAC ASM_AC(CLAC) #else -static inline void clac(void) +static always_inline void clac(void) { /* Note: a barrier is implicit in alternative() */ alternative(ASM_NOP3, __stringify(__ASM_CLAC), X86_FEATURE_SMAP); } -static inline void stac(void) +static always_inline void stac(void) { /* Note: a barrier is implicit in alternative() */ alternative(ASM_NOP3, __stringify(__ASM_STAC), X86_FEATURE_SMAP); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKp-00052L-8d; Sun, 24 Aug 2014 23:36:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKo-000525-Fm for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:30 +0000 Received: from [85.158.139.211:56286] by server-1.bemta-5.messagelabs.com id 12/8E-17892-DF67AF35; Sun, 24 Aug 2014 23:36:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1408923388!6598626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1977 invoked from network); 24 Aug 2014 23:36:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKm-0006p2-96 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKm-0000aa-7z for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:28 +0000 Date: Sun, 24 Aug 2014 23:36:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: drop memory_type_changed() call from hvm_set_guest_pat() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c94e724a09b309a06257b3cb16db091e76fd881a Author: Li Liang AuthorDate: Fri Aug 22 14:34:01 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:34:01 2014 +0200 x86/HVM: drop memory_type_changed() call from hvm_set_guest_pat() The commit aa9114edd added the needless function call memory_type_changed, it is unnessary because the PAT content does not influence the result of epte_get_entry_emt(). If it is called, the cache will be flushed excessively and make the nested guest very slowly, just like blocked. Signed-off-by: Li Liang --- xen/arch/x86/hvm/hvm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d40c48e..e8f41c1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -257,8 +257,6 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) if ( !hvm_funcs.set_guest_pat(v, guest_pat) ) v->arch.hvm_vcpu.pat_cr = guest_pat; - memory_type_changed(v->domain); - return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKp-00052L-8d; Sun, 24 Aug 2014 23:36:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKo-000525-Fm for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:30 +0000 Received: from [85.158.139.211:56286] by server-1.bemta-5.messagelabs.com id 12/8E-17892-DF67AF35; Sun, 24 Aug 2014 23:36:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1408923388!6598626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1977 invoked from network); 24 Aug 2014 23:36:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKm-0006p2-96 for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKm-0000aa-7z for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:28 +0000 Date: Sun, 24 Aug 2014 23:36:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: drop memory_type_changed() call from hvm_set_guest_pat() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c94e724a09b309a06257b3cb16db091e76fd881a Author: Li Liang AuthorDate: Fri Aug 22 14:34:01 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:34:01 2014 +0200 x86/HVM: drop memory_type_changed() call from hvm_set_guest_pat() The commit aa9114edd added the needless function call memory_type_changed, it is unnessary because the PAT content does not influence the result of epte_get_entry_emt(). If it is called, the cache will be flushed excessively and make the nested guest very slowly, just like blocked. Signed-off-by: Li Liang --- xen/arch/x86/hvm/hvm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d40c48e..e8f41c1 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -257,8 +257,6 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) if ( !hvm_funcs.set_guest_pat(v, guest_pat) ) v->arch.hvm_vcpu.pat_cr = guest_pat; - memory_type_changed(v->domain); - return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKz-00054M-BA; Sun, 24 Aug 2014 23:36:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKy-000548-Oh for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:40 +0000 Content-Length: 1620 Received: from [85.158.139.211:27761] by server-9.bemta-5.messagelabs.com id 3E/B0-20744-8077AF35; Sun, 24 Aug 2014 23:36:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1408923398!7760136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21400 invoked from network); 24 Aug 2014 23:36:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKw-0006p8-EX for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKw-0000b9-Cb for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:38 +0000 Date: Sun, 24 Aug 2014 23:36:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PVH: don't set EFER_SCE for pvh guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0655357663836421548==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0655357663836421548== Content-Length: 1200 Content-Transfer-Encoding: quoted-printable commit 7645640d6ff1791733c43f71590c6e2976cfa549 Author: Mukesh Rathor AuthorDate: Fri Aug 22 14:34:46 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:34:46 2014 +0200 x86/PVH: don't set EFER_SCE for pvh guest Just like NX is guest managed, SCE should be too. Remove setting of the EFER_SCE for pvh guest. Signed-off-by: Mukesh Rathor Acked-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e8f41c1..94b18ba 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2281,7 +2281,7 @@ int hvm_vcpu_initialise(struct vcpu *v) { v->arch.hvm_vcpu.hcall_64bit =3D 1; /* PVH 32bitfixme. */ /* This is for hvm_long_mode_enabled(v). */ - v->arch.hvm_vcpu.guest_efer =3D EFER_SCE | EFER_LMA | EFER_LME; + v->arch.hvm_vcpu.guest_efer =3D EFER_LMA | EFER_LME; return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0655357663836421548== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0655357663836421548==-- From xen-changelog-bounces@lists.xen.org Sun Aug 24 23:36:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 Aug 2014 23:36:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKz-00054M-BA; Sun, 24 Aug 2014 23:36:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKy-000548-Oh for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:40 +0000 Content-Length: 1620 Received: from [85.158.139.211:27761] by server-9.bemta-5.messagelabs.com id 3E/B0-20744-8077AF35; Sun, 24 Aug 2014 23:36:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1408923398!7760136!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21400 invoked from network); 24 Aug 2014 23:36:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2014 23:36:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XLhKw-0006p8-EX for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XLhKw-0000b9-Cb for xen-changelog@lists.xensource.com; Sun, 24 Aug 2014 23:36:38 +0000 Date: Sun, 24 Aug 2014 23:36:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PVH: don't set EFER_SCE for pvh guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0655357663836421548==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0655357663836421548== Content-Length: 1200 Content-Transfer-Encoding: quoted-printable commit 7645640d6ff1791733c43f71590c6e2976cfa549 Author: Mukesh Rathor AuthorDate: Fri Aug 22 14:34:46 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 22 14:34:46 2014 +0200 x86/PVH: don't set EFER_SCE for pvh guest Just like NX is guest managed, SCE should be too. Remove setting of the EFER_SCE for pvh guest. Signed-off-by: Mukesh Rathor Acked-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index e8f41c1..94b18ba 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2281,7 +2281,7 @@ int hvm_vcpu_initialise(struct vcpu *v) { v->arch.hvm_vcpu.hcall_64bit =3D 1; /* PVH 32bitfixme. */ /* This is for hvm_long_mode_enabled(v). */ - v->arch.hvm_vcpu.guest_efer =3D EFER_SCE | EFER_LMA | EFER_LME; + v->arch.hvm_vcpu.guest_efer =3D EFER_LMA | EFER_LME; return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0655357663836421548== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0655357663836421548==-- From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGM-0003IH-9K; Sat, 30 Aug 2014 13:00:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGL-0003IC-9n for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:13 +0000 Received: from [85.158.143.35:14271] by server-2.bemta-4.messagelabs.com id 0D/40-04525-CDAC1045; Sat, 30 Aug 2014 13:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1409403609!12233563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8443 invoked from network); 30 Aug 2014 13:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGB-00079a-Vy for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGB-000754-DE for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:03 +0000 Date: Sat, 30 Aug 2014 13:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: use #defines instead of magic constants X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9eb95c3c82221969539b9958ae6de6c3bd58ce51 Author: Razvan Cojocaru AuthorDate: Tue Aug 26 17:54:34 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 17:54:34 2014 +0200 VMX: use #defines instead of magic constants Now using a combination of INTR_INFO_VECTOR_MASK, INTR_INFO_INTR_TYPE_MASK and MASK_EXTR() to replace the old "(ev >> 8) & 7, ev & 0xff" magic constant code in vmx.c. Changes since V1: - Fixed indentation. Changes since V2: - Fixed vmx_idtv_reinject() also. Sugested-off-by: Jan Beulich Signed-off-by: Razvan Cojocaru --- xen/arch/x86/hvm/vmx/vmx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index dc18a72..039e336 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -434,7 +434,8 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c) c->error_code = 0; __vmread(VM_ENTRY_INTR_INFO, &ev); if ( (ev & INTR_INFO_VALID_MASK) && - hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) ) + hvm_event_needs_reinjection(MASK_EXTR(ev, INTR_INFO_INTR_TYPE_MASK), + ev & INTR_INFO_VECTOR_MASK) ) { c->pending_event = ev; __vmread(VM_ENTRY_EXCEPTION_ERROR_CODE, &ev); @@ -2511,7 +2512,9 @@ static void vmx_idtv_reinject(unsigned long idtv_info) /* Event delivery caused this intercept? Queue for redelivery. */ if ( unlikely(idtv_info & INTR_INFO_VALID_MASK) ) { - if ( hvm_event_needs_reinjection((idtv_info>>8)&7, idtv_info&0xff) ) + if ( hvm_event_needs_reinjection(MASK_EXTR(idtv_info, + INTR_INFO_INTR_TYPE_MASK), + idtv_info & INTR_INFO_VECTOR_MASK) ) { /* See SDM 3B 25.7.1.1 and .2 for info about masking resvd bits. */ __vmwrite(VM_ENTRY_INTR_INFO, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGQ-0003IU-Bn; Sat, 30 Aug 2014 13:00:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGP-0003IO-JB for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:17 +0000 Received: from [85.158.143.35:60771] by server-3.bemta-4.messagelabs.com id 0B/12-06192-0EAC1045; Sat, 30 Aug 2014 13:00:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409403615!4541622!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29075 invoked from network); 30 Aug 2014 13:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGM-00079d-JD for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGM-00075W-68 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:14 +0000 Date: Sat, 30 Aug 2014 13:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/IO-APIC: don't process softirqs during early boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd083922f9e78ed19ef98e7de372e5f568402ed3 Author: Jan Beulich AuthorDate: Tue Aug 26 17:56:52 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 17:56:52 2014 +0200 x86/IO-APIC: don't process softirqs during early boot Commit e13b320399 ("x86/irq: process softirqs in irq keyhandlers") made this unconditional, but the boot time use of __print_IO_APIC() (when "apic_verbosity=debug" was given) can't tolerate that. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Sander Eikelenboom --- xen/arch/x86/io_apic.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 1b57636..6f8f62c 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1092,7 +1092,7 @@ static inline void UNEXPECTED_IO_APIC(void) { } -static void /*__init*/ __print_IO_APIC(void) +static void /*__init*/ __print_IO_APIC(bool_t boot) { int apic, i; union IO_APIC_reg_00 reg_00; @@ -1113,7 +1113,8 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_INFO "testing the IO APIC.......................\n"); for (apic = 0; apic < nr_ioapics; apic++) { - process_pending_softirqs(); + if ( !boot ) + process_pending_softirqs(); if (!nr_ioapic_entries[apic]) continue; @@ -1219,7 +1220,7 @@ static void /*__init*/ __print_IO_APIC(void) for (i = 0; i < nr_irqs_gsi; i++) { struct irq_pin_list *entry = irq_2_pin + i; - if ( !(i & 0x1f) ) + if ( !boot && !(i & 0x1f) ) process_pending_softirqs(); if (entry->pin < 0) @@ -1242,12 +1243,12 @@ static void /*__init*/ __print_IO_APIC(void) static void __init print_IO_APIC(void) { if (apic_verbosity != APIC_QUIET) - __print_IO_APIC(); + __print_IO_APIC(1); } static void _print_IO_APIC_keyhandler(unsigned char key) { - __print_IO_APIC(); + __print_IO_APIC(0); } static struct keyhandler print_IO_APIC_keyhandler = { .diagnostic = 1, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGM-0003IH-9K; Sat, 30 Aug 2014 13:00:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGL-0003IC-9n for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:13 +0000 Received: from [85.158.143.35:14271] by server-2.bemta-4.messagelabs.com id 0D/40-04525-CDAC1045; Sat, 30 Aug 2014 13:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1409403609!12233563!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8443 invoked from network); 30 Aug 2014 13:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGB-00079a-Vy for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGB-000754-DE for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:03 +0000 Date: Sat, 30 Aug 2014 13:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: use #defines instead of magic constants X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9eb95c3c82221969539b9958ae6de6c3bd58ce51 Author: Razvan Cojocaru AuthorDate: Tue Aug 26 17:54:34 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 17:54:34 2014 +0200 VMX: use #defines instead of magic constants Now using a combination of INTR_INFO_VECTOR_MASK, INTR_INFO_INTR_TYPE_MASK and MASK_EXTR() to replace the old "(ev >> 8) & 7, ev & 0xff" magic constant code in vmx.c. Changes since V1: - Fixed indentation. Changes since V2: - Fixed vmx_idtv_reinject() also. Sugested-off-by: Jan Beulich Signed-off-by: Razvan Cojocaru --- xen/arch/x86/hvm/vmx/vmx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index dc18a72..039e336 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -434,7 +434,8 @@ static void vmx_vmcs_save(struct vcpu *v, struct hvm_hw_cpu *c) c->error_code = 0; __vmread(VM_ENTRY_INTR_INFO, &ev); if ( (ev & INTR_INFO_VALID_MASK) && - hvm_event_needs_reinjection((ev >> 8) & 7, ev & 0xff) ) + hvm_event_needs_reinjection(MASK_EXTR(ev, INTR_INFO_INTR_TYPE_MASK), + ev & INTR_INFO_VECTOR_MASK) ) { c->pending_event = ev; __vmread(VM_ENTRY_EXCEPTION_ERROR_CODE, &ev); @@ -2511,7 +2512,9 @@ static void vmx_idtv_reinject(unsigned long idtv_info) /* Event delivery caused this intercept? Queue for redelivery. */ if ( unlikely(idtv_info & INTR_INFO_VALID_MASK) ) { - if ( hvm_event_needs_reinjection((idtv_info>>8)&7, idtv_info&0xff) ) + if ( hvm_event_needs_reinjection(MASK_EXTR(idtv_info, + INTR_INFO_INTR_TYPE_MASK), + idtv_info & INTR_INFO_VECTOR_MASK) ) { /* See SDM 3B 25.7.1.1 and .2 for info about masking resvd bits. */ __vmwrite(VM_ENTRY_INTR_INFO, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGQ-0003IU-Bn; Sat, 30 Aug 2014 13:00:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGP-0003IO-JB for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:17 +0000 Received: from [85.158.143.35:60771] by server-3.bemta-4.messagelabs.com id 0B/12-06192-0EAC1045; Sat, 30 Aug 2014 13:00:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409403615!4541622!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29075 invoked from network); 30 Aug 2014 13:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGM-00079d-JD for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGM-00075W-68 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:14 +0000 Date: Sat, 30 Aug 2014 13:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/IO-APIC: don't process softirqs during early boot X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bd083922f9e78ed19ef98e7de372e5f568402ed3 Author: Jan Beulich AuthorDate: Tue Aug 26 17:56:52 2014 +0200 Commit: Jan Beulich CommitDate: Tue Aug 26 17:56:52 2014 +0200 x86/IO-APIC: don't process softirqs during early boot Commit e13b320399 ("x86/irq: process softirqs in irq keyhandlers") made this unconditional, but the boot time use of __print_IO_APIC() (when "apic_verbosity=debug" was given) can't tolerate that. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Sander Eikelenboom --- xen/arch/x86/io_apic.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 1b57636..6f8f62c 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1092,7 +1092,7 @@ static inline void UNEXPECTED_IO_APIC(void) { } -static void /*__init*/ __print_IO_APIC(void) +static void /*__init*/ __print_IO_APIC(bool_t boot) { int apic, i; union IO_APIC_reg_00 reg_00; @@ -1113,7 +1113,8 @@ static void /*__init*/ __print_IO_APIC(void) printk(KERN_INFO "testing the IO APIC.......................\n"); for (apic = 0; apic < nr_ioapics; apic++) { - process_pending_softirqs(); + if ( !boot ) + process_pending_softirqs(); if (!nr_ioapic_entries[apic]) continue; @@ -1219,7 +1220,7 @@ static void /*__init*/ __print_IO_APIC(void) for (i = 0; i < nr_irqs_gsi; i++) { struct irq_pin_list *entry = irq_2_pin + i; - if ( !(i & 0x1f) ) + if ( !boot && !(i & 0x1f) ) process_pending_softirqs(); if (entry->pin < 0) @@ -1242,12 +1243,12 @@ static void /*__init*/ __print_IO_APIC(void) static void __init print_IO_APIC(void) { if (apic_verbosity != APIC_QUIET) - __print_IO_APIC(); + __print_IO_APIC(1); } static void _print_IO_APIC_keyhandler(unsigned char key) { - __print_IO_APIC(); + __print_IO_APIC(0); } static struct keyhandler print_IO_APIC_keyhandler = { .diagnostic = 1, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGb-0003Jg-Hm; Sat, 30 Aug 2014 13:00:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGa-0003JR-7O for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:28 +0000 Received: from [85.158.143.35:61280] by server-3.bemta-4.messagelabs.com id 94/32-06192-BEAC1045; Sat, 30 Aug 2014 13:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409403625!4541650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30255 invoked from network); 30 Aug 2014 13:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGX-00079g-I4 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGW-00075y-P8 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:24 +0000 Date: Sat, 30 Aug 2014 13:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Allow multiple serial ports on HVM domain creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f9668a81ad587d4f955a9a25ffad5f9c3068041 Author: White, Edmund H AuthorDate: Wed Aug 13 19:08:18 2014 +0000 Commit: Ian Campbell CommitDate: Tue Aug 26 21:14:32 2014 +0100 libxl: Allow multiple serial ports on HVM domain creation This patch allows an HVM domain to be created with multiple serial ports. Since the previous interface only allowed the passing of a single device, this requires us to add a new element to the hvm struct of libxl_domain_build_info -- serial_list. For API compatibility, the old element, serial, remains. If hvm.serial_list is set, each device listed will cause an extra "-serial [foo]" to be appended to the qemu command line. Callers may set either hvm.serial or hvm.serial_list, but not both; libxl will throw an error if both are set. In order to allow users of libxl to write software compatible with older versions of libxl, also define LIBXL_HAVE_BUILDINFO_SERIAL_LIST. If this is defined, callers may use either hvm.serial or hvm.serial_list; otherwise, only hvm.serial will be available. This patch borrows substantially from the multiple USB device patch ac16730d0339d41fd7d129a5cb2d40ed67a303d9. Signed-off-by: Ed White Acked-by: Ian Campbell --- tools/libxl/libxl.h | 16 ++++++++++++++++ tools/libxl/libxl_dm.c | 42 ++++++++++++++++++++++++++++++++++++++---- tools/libxl/libxl_types.idl | 1 + 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index bfeb3bc..0081476 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -578,6 +578,22 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_CPUPOOL_NAME 1 +/* + * LIBXL_HAVE_BUILDINFO_SERIAL_LIST + * + * If this is defined, then the libxl_domain_build_info structure will + * contain hvm.serial_list, a libxl_string_list type that contains + * a list of serial ports to specify on the qemu command-line. + * + * If it is set, callers may use either hvm.serial or + * hvm.serial_list, but not both; if both are set, libxl will + * throw an error. + * + * If this is not defined, callers can only use hvm.serial. Note + * that this means only one serial port can be added at domain build time. + */ +#define LIBXL_HAVE_BUILDINFO_SERIAL_LIST 1 + typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 69e4d00..a224446 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -196,8 +196,25 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, int nr_set_cpus = 0; char *s; - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { + if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) + { + LOG(ERROR, "Both serial and serial_list set"); + return NULL; + } + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, + "-serial", b_info->u.hvm.serial, NULL); + } else if (b_info->u.hvm.serial_list) { + char **p; + for (p = b_info->u.hvm.serial_list; + *p; + p++) { + flexarray_vappend(dm_args, + "-serial", + *p, NULL); + } + } } if (libxl_defbool_val(b_info->u.hvm.nographic) && (!sdl && !vnc)) { @@ -478,8 +495,25 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_nics = 0; - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { + if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) + { + LOG(ERROR, "Both serial and serial_list set"); + return NULL; + } + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, + "-serial", b_info->u.hvm.serial, NULL); + } else if (b_info->u.hvm.serial_list) { + char **p; + for (p = b_info->u.hvm.serial_list; + *p; + p++) { + flexarray_vappend(dm_args, + "-serial", + *p, NULL); + } + } } if (libxl_defbool_val(b_info->u.hvm.nographic) && (!sdl && !vnc)) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 0b3496f..78a18af 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -396,6 +396,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vendor_device", libxl_vendor_device), # See libxl_ms_vm_genid_generate() ("ms_vm_genid", libxl_ms_vm_genid), + ("serial_list", libxl_string_list), ])), ("pv", Struct(None, [("kernel", string), ("slack_memkb", MemKB), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGb-0003Jg-Hm; Sat, 30 Aug 2014 13:00:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGa-0003JR-7O for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:28 +0000 Received: from [85.158.143.35:61280] by server-3.bemta-4.messagelabs.com id 94/32-06192-BEAC1045; Sat, 30 Aug 2014 13:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409403625!4541650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30255 invoked from network); 30 Aug 2014 13:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGX-00079g-I4 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGW-00075y-P8 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:24 +0000 Date: Sat, 30 Aug 2014 13:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Allow multiple serial ports on HVM domain creation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f9668a81ad587d4f955a9a25ffad5f9c3068041 Author: White, Edmund H AuthorDate: Wed Aug 13 19:08:18 2014 +0000 Commit: Ian Campbell CommitDate: Tue Aug 26 21:14:32 2014 +0100 libxl: Allow multiple serial ports on HVM domain creation This patch allows an HVM domain to be created with multiple serial ports. Since the previous interface only allowed the passing of a single device, this requires us to add a new element to the hvm struct of libxl_domain_build_info -- serial_list. For API compatibility, the old element, serial, remains. If hvm.serial_list is set, each device listed will cause an extra "-serial [foo]" to be appended to the qemu command line. Callers may set either hvm.serial or hvm.serial_list, but not both; libxl will throw an error if both are set. In order to allow users of libxl to write software compatible with older versions of libxl, also define LIBXL_HAVE_BUILDINFO_SERIAL_LIST. If this is defined, callers may use either hvm.serial or hvm.serial_list; otherwise, only hvm.serial will be available. This patch borrows substantially from the multiple USB device patch ac16730d0339d41fd7d129a5cb2d40ed67a303d9. Signed-off-by: Ed White Acked-by: Ian Campbell --- tools/libxl/libxl.h | 16 ++++++++++++++++ tools/libxl/libxl_dm.c | 42 ++++++++++++++++++++++++++++++++++++++---- tools/libxl/libxl_types.idl | 1 + 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index bfeb3bc..0081476 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -578,6 +578,22 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_CPUPOOL_NAME 1 +/* + * LIBXL_HAVE_BUILDINFO_SERIAL_LIST + * + * If this is defined, then the libxl_domain_build_info structure will + * contain hvm.serial_list, a libxl_string_list type that contains + * a list of serial ports to specify on the qemu command-line. + * + * If it is set, callers may use either hvm.serial or + * hvm.serial_list, but not both; if both are set, libxl will + * throw an error. + * + * If this is not defined, callers can only use hvm.serial. Note + * that this means only one serial port can be added at domain build time. + */ +#define LIBXL_HAVE_BUILDINFO_SERIAL_LIST 1 + typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMT "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 69e4d00..a224446 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -196,8 +196,25 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, int nr_set_cpus = 0; char *s; - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { + if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) + { + LOG(ERROR, "Both serial and serial_list set"); + return NULL; + } + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, + "-serial", b_info->u.hvm.serial, NULL); + } else if (b_info->u.hvm.serial_list) { + char **p; + for (p = b_info->u.hvm.serial_list; + *p; + p++) { + flexarray_vappend(dm_args, + "-serial", + *p, NULL); + } + } } if (libxl_defbool_val(b_info->u.hvm.nographic) && (!sdl && !vnc)) { @@ -478,8 +495,25 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_nics = 0; - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL); + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { + if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) + { + LOG(ERROR, "Both serial and serial_list set"); + return NULL; + } + if (b_info->u.hvm.serial) { + flexarray_vappend(dm_args, + "-serial", b_info->u.hvm.serial, NULL); + } else if (b_info->u.hvm.serial_list) { + char **p; + for (p = b_info->u.hvm.serial_list; + *p; + p++) { + flexarray_vappend(dm_args, + "-serial", + *p, NULL); + } + } } if (libxl_defbool_val(b_info->u.hvm.nographic) && (!sdl && !vnc)) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 0b3496f..78a18af 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -396,6 +396,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("vendor_device", libxl_vendor_device), # See libxl_ms_vm_genid_generate() ("ms_vm_genid", libxl_ms_vm_genid), + ("serial_list", libxl_string_list), ])), ("pv", Struct(None, [("kernel", string), ("slack_memkb", MemKB), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGl-0003LC-KY; Sat, 30 Aug 2014 13:00:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGk-0003Kz-Sp for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:39 +0000 Received: from [85.158.137.68:13372] by server-11.bemta-3.messagelabs.com id 41/6A-01568-5FAC1045; Sat, 30 Aug 2014 13:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1409403636!9025260!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7980 invoked from network); 30 Aug 2014 13:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGh-00079u-Ow for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGh-000770-Mq for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:35 +0000 Date: Sat, 30 Aug 2014 13:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Accept a list for serial in config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceba2249707724594b268482da34a0725adbe6da Author: White, Edmund H AuthorDate: Wed Aug 13 19:14:07 2014 +0000 Commit: Ian Campbell CommitDate: Tue Aug 26 21:15:15 2014 +0100 xl: Accept a list for serial in config file Allow the "serial" key to accept a list of serial ports, and pass them in using the new serial_list domain build element. For backwards compatibility, still accept singleton values. Also update the xl.cfg manpage. This patch borrows substantially from the multiple USB device patch c3a2148192705592d38407ba9919eb1eb151a153. Signed-off-by: Ed White Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 6 ++++-- tools/libxl/xl_cmdimpl.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 1e04eed..21ca502 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1281,13 +1281,15 @@ an usb2 controller. The default is disabled (0). =over 4 -=item B +=item B -Redirect the virtual serial port to B. Please see the +Redirect virtual serial ports to Bs. Please see the B<-serial> option in the L manpage for details of the valid B options. Default is B when in graphical mode and B if B is used. +The form serial=DEVICE is also accepted for backwards compatibilty. + =item B Select the virtual sound card to expose to the guest. The valid diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f1c136a..bdca14b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1683,9 +1683,26 @@ skip_vfb: if (!xlu_cfg_get_long (config, "spiceusbredirection", &l, 0)) b_info->u.hvm.spice.usbredirection = l; xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0); - xlu_cfg_get_defbool(config, "gfx_passthru", + xlu_cfg_get_defbool(config, "gfx_passthru", &b_info->u.hvm.gfx_passthru, 0); - xlu_cfg_replace_string (config, "serial", &b_info->u.hvm.serial, 0); + switch (xlu_cfg_get_list_as_string_list(config, "serial", + &b_info->u.hvm.serial_list, + 1)) + { + + case 0: break; /* Success */ + case ESRCH: break; /* Option not present */ + case EINVAL: + /* If it's not a valid list, try reading it as an atom, + * falling through to an error if it fails */ + if (!xlu_cfg_replace_string(config, "serial", + &b_info->u.hvm.serial, 0)) + break; + /* FALLTHRU */ + default: + fprintf(stderr,"xl: Unable to parse serial.\n"); + exit(-ERROR_FAIL); + } xlu_cfg_replace_string (config, "boot", &b_info->u.hvm.boot, 0); xlu_cfg_get_defbool(config, "usb", &b_info->u.hvm.usb, 0); if (!xlu_cfg_get_long (config, "usbversion", &l, 0)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGl-0003LC-KY; Sat, 30 Aug 2014 13:00:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGk-0003Kz-Sp for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:39 +0000 Received: from [85.158.137.68:13372] by server-11.bemta-3.messagelabs.com id 41/6A-01568-5FAC1045; Sat, 30 Aug 2014 13:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1409403636!9025260!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7980 invoked from network); 30 Aug 2014 13:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGh-00079u-Ow for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGh-000770-Mq for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:35 +0000 Date: Sat, 30 Aug 2014 13:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Accept a list for serial in config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ceba2249707724594b268482da34a0725adbe6da Author: White, Edmund H AuthorDate: Wed Aug 13 19:14:07 2014 +0000 Commit: Ian Campbell CommitDate: Tue Aug 26 21:15:15 2014 +0100 xl: Accept a list for serial in config file Allow the "serial" key to accept a list of serial ports, and pass them in using the new serial_list domain build element. For backwards compatibility, still accept singleton values. Also update the xl.cfg manpage. This patch borrows substantially from the multiple USB device patch c3a2148192705592d38407ba9919eb1eb151a153. Signed-off-by: Ed White Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 6 ++++-- tools/libxl/xl_cmdimpl.c | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 1e04eed..21ca502 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1281,13 +1281,15 @@ an usb2 controller. The default is disabled (0). =over 4 -=item B +=item B -Redirect the virtual serial port to B. Please see the +Redirect virtual serial ports to Bs. Please see the B<-serial> option in the L manpage for details of the valid B options. Default is B when in graphical mode and B if B is used. +The form serial=DEVICE is also accepted for backwards compatibilty. + =item B Select the virtual sound card to expose to the guest. The valid diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f1c136a..bdca14b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1683,9 +1683,26 @@ skip_vfb: if (!xlu_cfg_get_long (config, "spiceusbredirection", &l, 0)) b_info->u.hvm.spice.usbredirection = l; xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0); - xlu_cfg_get_defbool(config, "gfx_passthru", + xlu_cfg_get_defbool(config, "gfx_passthru", &b_info->u.hvm.gfx_passthru, 0); - xlu_cfg_replace_string (config, "serial", &b_info->u.hvm.serial, 0); + switch (xlu_cfg_get_list_as_string_list(config, "serial", + &b_info->u.hvm.serial_list, + 1)) + { + + case 0: break; /* Success */ + case ESRCH: break; /* Option not present */ + case EINVAL: + /* If it's not a valid list, try reading it as an atom, + * falling through to an error if it fails */ + if (!xlu_cfg_replace_string(config, "serial", + &b_info->u.hvm.serial, 0)) + break; + /* FALLTHRU */ + default: + fprintf(stderr,"xl: Unable to parse serial.\n"); + exit(-ERROR_FAIL); + } xlu_cfg_replace_string (config, "boot", &b_info->u.hvm.boot, 0); xlu_cfg_get_defbool(config, "usb", &b_info->u.hvm.usb, 0); if (!xlu_cfg_get_long (config, "usbversion", &l, 0)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGy-0003N8-NV; Sat, 30 Aug 2014 13:00:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGx-0003Mx-Hh for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:51 +0000 Received: from [85.158.143.35:15830] by server-3.bemta-4.messagelabs.com id 7E/72-06192-20BC1045; Sat, 30 Aug 2014 13:00:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409403646!4541699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31093 invoked from network); 30 Aug 2014 13:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGs-0007A0-Na for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGr-00077M-Sn for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:46 +0000 Date: Sat, 30 Aug 2014 13:00:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: pass kernel initrd to qemu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11dffa2359e8a2629490c14c029c7c7c777b3e47 Author: Chunyan Liu AuthorDate: Mon Jul 7 14:34:33 2014 +0800 Commit: Ian Campbell CommitDate: Tue Aug 26 21:18:51 2014 +0100 xen: pass kernel initrd to qemu xen side patch to support xen HVM direct kernel boot: support 'kernel', 'ramdisk', 'cmdline' (and 'root', 'extra' as well which would be deprecated later) in HVM config file, parse config file, pass -kernel, -initrd, -append parameters to qemu. It's working with qemu-xen when using the default BIOS (seabios). [HVM config example] name="sles11_sp2" description="None" uuid="5c84adcc-bd59-788a-96d2-195f9b599cfe" memory=512 maxmem=512 vcpus=4 on_poweroff="destroy" on_reboot="restart" on_crash="destroy" localtime=0 keymap="en-us" builder="hvm" device_model_override="/home/cyliu/git/qemu/x86_64-softmmu/qemu-system-x86_64" kernel="/mnt/vmlinuz-3.0.13-0.27-default" ramdisk="/mnt/initrd-3.0.13-0.27-default" root="/dev/hda2" extra="console=tty0 console=ttyS0" disk=[ 'file:/mnt/images/sles11_sp2/disk0.raw,hda,w', ] vif=[ 'mac=00:16:3e:56:af:69,bridge=br0,type=netfront', ] stdvga=0 vnc=1 vncunused=1 viridian=0 acpi=1 pae=1 serial="pty" Signed-off-by: Chunyan Liu Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 53 +++++++++++++++++++++------------- tools/libxl/libxl.h | 15 ++++++++++ tools/libxl/libxl_bootloader.c | 18 ++++++------ tools/libxl/libxl_create.c | 19 ++++++++++++ tools/libxl/libxl_dm.c | 6 ++++ tools/libxl/libxl_types.idl | 3 ++ tools/libxl/xl_cmdimpl.c | 61 +++++++++++++++++++++++----------------- 7 files changed, 120 insertions(+), 55 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 21ca502..9ab0ad6 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -326,6 +326,37 @@ Action to take if the domain crashes. Default is C. =back +=head3 Direct Kernel Boot + +Direct kernel boot allows booting directly from a kernel and initrd +stored in the host physical machine OS, allowing command line arguments +to be passed directly. PV guest direct kernel boot is supported. HVM +guest direct kernel boot is supported with limitation (it's supported +when using qemu-xen and default BIOS 'seabios'; not supported in case of +stubdom-dm and old rombios.) + +=over 4 + +=item B + +Load the specified file as the kernel image. + +=item B + +Load the specified file as the ramdisk. + +=item B + +Append B to the kernel command line (Note: it is guest +specific what meaning this has). + +=item B + +Append B to the kernel command line. (Note: it is guest +specific what meaning this has). + +=back + =head3 Other Options =over 4 @@ -668,20 +699,12 @@ The following options apply only to Paravirtual guests. =over 4 -=item B - -Load the specified file as the kernel image. Either B or -B must be specified for PV guests. - -=item B - -Load the specified file as the ramdisk. - =item B Run C to find the kernel image and ramdisk to use. Normally C would be C, which is an emulation of -grub/grub2/syslinux. +grub/grub2/syslinux. Either B or B must be specified +for PV guests. =item B @@ -689,16 +712,6 @@ Append Bs to the arguments to the B program. Alternatively if the argument is a simple string then it will be split into words at whitespace (this second option is deprecated). -=item B - -Append B to the kernel command line (Note: it is guest -specific what meaning this has). - -=item B - -Append B to the kernel command line. Note: it is guest -specific what meaning this has). - =item B Selects whether to expose the host e820 (memory map) to the guest via diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0081476..ded4ce5 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -543,6 +543,21 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_DEVICE_PCI_SEIZE 1 +/* + * LIBXL_HAVE_BUILDINFO_KERNEL + * + * If this is defined, then the libxl_domain_build_info structure will + * contain 'kernel', 'ramdisk', 'cmdline' fields. 'kernel' is a string + * to indicate kernel image location, 'ramdisk' is a string to indicate + * ramdisk location, 'cmdline' is a string to indicate the paramters which + * would be appended to kernel image. + * + * Both PV guest and HVM guest can use these fields for direct kernel boot. + * But for compatibility reason, u.pv.kernel, u.pv.ramdisk and u.pv.cmdline + * still exist. + */ +#define LIBXL_HAVE_BUILDINFO_KERNEL 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index c3ec782..79947d4 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -58,12 +58,12 @@ static void make_bootloader_args(libxl__gc *gc, libxl__bootloader_state *bl, ARG(bootloader_path); - if (info->u.pv.kernel) - ARG(libxl__sprintf(gc, "--kernel=%s", info->u.pv.kernel)); - if (info->u.pv.ramdisk) - ARG(libxl__sprintf(gc, "--ramdisk=%s", info->u.pv.ramdisk)); - if (info->u.pv.cmdline && *info->u.pv.cmdline != '\0') - ARG(libxl__sprintf(gc, "--args=%s", info->u.pv.cmdline)); + if (info->kernel) + ARG(libxl__sprintf(gc, "--kernel=%s", info->kernel)); + if (info->ramdisk) + ARG(libxl__sprintf(gc, "--ramdisk=%s", info->ramdisk)); + if (info->cmdline && *info->cmdline != '\0') + ARG(libxl__sprintf(gc, "--args=%s", info->cmdline)); ARG(libxl__sprintf(gc, "--output=%s", bl->outputpath)); ARG("--output-format=simple0"); @@ -327,9 +327,9 @@ void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) if (!info->u.pv.bootloader) { LOG(DEBUG, "no bootloader configured, using user supplied kernel"); - bl->kernel->path = bl->info->u.pv.kernel; - bl->ramdisk->path = bl->info->u.pv.ramdisk; - bl->cmdline = bl->info->u.pv.cmdline; + bl->kernel->path = bl->info->kernel; + bl->ramdisk->path = bl->info->ramdisk; + bl->cmdline = bl->info->cmdline; rc = 0; goto out_ok; } diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 9b66294..fc332ef 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -354,6 +354,25 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->shadow_memkb = 0; if (b_info->u.pv.slack_memkb == LIBXL_MEMKB_DEFAULT) b_info->u.pv.slack_memkb = 0; + + /* For compatibility, fill in b_info->kernel|ramdisk|cmdline + * with the value in u.pv, later processing will use + * b_info->kernel|ramdisk|cmdline only. + * User with old APIs that passes u.pv.kernel|ramdisk|cmdline + * is not affected. + */ + if (!b_info->kernel && b_info->u.pv.kernel) { + b_info->kernel = b_info->u.pv.kernel; + b_info->u.pv.kernel = NULL; + } + if (!b_info->ramdisk && b_info->u.pv.ramdisk) { + b_info->ramdisk = b_info->u.pv.ramdisk; + b_info->u.pv.ramdisk = NULL; + } + if (!b_info->cmdline && b_info->u.pv.cmdline) { + b_info->cmdline = b_info->u.pv.cmdline; + b_info->u.pv.cmdline = NULL; + } break; default: LIBXL__LOG(CTX, LIBXL__LOG_ERROR, diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index a224446..103cbca 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -196,6 +196,12 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, int nr_set_cpus = 0; char *s; + if (b_info->kernel) { + LOG(ERROR, "HVM direct kernel boot is not supported by " + "qemu-xen-traditional"); + return NULL; + } + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 78a18af..08a7927 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -355,6 +355,9 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("iomem", Array(libxl_iomem_range, "num_iomem")), ("claim_mode", libxl_defbool), ("event_channels", uint32), + ("kernel", string), + ("cmdline", string), + ("ramdisk", string), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), ("bios", libxl_bios_type), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index bdca14b..9120c1e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -691,6 +691,29 @@ static void parse_top_level_sdl_options(XLU_Config *config, xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); } +static char *parse_cmdline(XLU_Config *config) +{ + char *cmdline = NULL; + const char *root = NULL, *extra = ""; + + xlu_cfg_get_string (config, "root", &root, 0); + xlu_cfg_get_string (config, "extra", &extra, 0); + + if (root) { + if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) + cmdline = NULL; + } else { + cmdline = strdup(extra); + } + + if ((root || extra) && !cmdline) { + fprintf(stderr, "Failed to allocate memory for cmdline\n"); + exit(1); + } + + return cmdline; +} + static void parse_vcpu_affinity(libxl_domain_build_info *b_info, XLU_ConfigList *cpus, const char *buf, int num_cpus, bool is_hard) @@ -970,13 +993,21 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long(config, "max_event_channels", &l, 0)) b_info->event_channels = l; + xlu_cfg_replace_string (config, "kernel", &b_info->kernel, 0); + xlu_cfg_replace_string (config, "ramdisk", &b_info->ramdisk, 0); + b_info->cmdline = parse_cmdline(config); + xlu_cfg_get_defbool(config, "driver_domain", &c_info->driver_domain, 0); switch(b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: - if (!xlu_cfg_get_string (config, "kernel", &buf, 0)) - fprintf(stderr, "WARNING: ignoring \"kernel\" directive for HVM guest. " - "Use \"firmware_override\" instead if you really want a non-default firmware\n"); + if (!strcmp(libxl_basename(b_info->kernel), "hvmloader")) { + fprintf(stderr, "WARNING: you seem to be using \"kernel\" " + "directive to override HVM guest firmware. Ignore " + "that. Use \"firmware_override\" instead if you " + "really want a non-default firmware\n"); + b_info->kernel = NULL; + } xlu_cfg_replace_string (config, "firmware_override", &b_info->u.hvm.firmware, 0); @@ -1043,26 +1074,6 @@ static void parse_config_data(const char *config_source, break; case LIBXL_DOMAIN_TYPE_PV: { - char *cmdline = NULL; - const char *root = NULL, *extra = ""; - - xlu_cfg_replace_string (config, "kernel", &b_info->u.pv.kernel, 0); - - xlu_cfg_get_string (config, "root", &root, 0); - xlu_cfg_get_string (config, "extra", &extra, 0); - - if (root) { - if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) - cmdline = NULL; - } else { - cmdline = strdup(extra); - } - - if ((root || extra) && !cmdline) { - fprintf(stderr, "Failed to allocate memory for cmdline\n"); - exit(1); - } - xlu_cfg_replace_string (config, "bootloader", &b_info->u.pv.bootloader, 0); switch (xlu_cfg_get_list_as_string_list(config, "bootloader_args", &b_info->u.pv.bootloader_args, 1)) @@ -1085,13 +1096,11 @@ static void parse_config_data(const char *config_source, exit(-ERROR_FAIL); } - if (!b_info->u.pv.bootloader && !b_info->u.pv.kernel) { + if (!b_info->u.pv.bootloader && !b_info->kernel) { fprintf(stderr, "Neither kernel nor bootloader specified\n"); exit(1); } - b_info->u.pv.cmdline = cmdline; - xlu_cfg_replace_string (config, "ramdisk", &b_info->u.pv.ramdisk, 0); break; } default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:00:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:00:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGy-0003N8-NV; Sat, 30 Aug 2014 13:00:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGx-0003Mx-Hh for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:51 +0000 Received: from [85.158.143.35:15830] by server-3.bemta-4.messagelabs.com id 7E/72-06192-20BC1045; Sat, 30 Aug 2014 13:00:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409403646!4541699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31093 invoked from network); 30 Aug 2014 13:00:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiGs-0007A0-Na for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiGr-00077M-Sn for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:46 +0000 Date: Sat, 30 Aug 2014 13:00:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: pass kernel initrd to qemu X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11dffa2359e8a2629490c14c029c7c7c777b3e47 Author: Chunyan Liu AuthorDate: Mon Jul 7 14:34:33 2014 +0800 Commit: Ian Campbell CommitDate: Tue Aug 26 21:18:51 2014 +0100 xen: pass kernel initrd to qemu xen side patch to support xen HVM direct kernel boot: support 'kernel', 'ramdisk', 'cmdline' (and 'root', 'extra' as well which would be deprecated later) in HVM config file, parse config file, pass -kernel, -initrd, -append parameters to qemu. It's working with qemu-xen when using the default BIOS (seabios). [HVM config example] name="sles11_sp2" description="None" uuid="5c84adcc-bd59-788a-96d2-195f9b599cfe" memory=512 maxmem=512 vcpus=4 on_poweroff="destroy" on_reboot="restart" on_crash="destroy" localtime=0 keymap="en-us" builder="hvm" device_model_override="/home/cyliu/git/qemu/x86_64-softmmu/qemu-system-x86_64" kernel="/mnt/vmlinuz-3.0.13-0.27-default" ramdisk="/mnt/initrd-3.0.13-0.27-default" root="/dev/hda2" extra="console=tty0 console=ttyS0" disk=[ 'file:/mnt/images/sles11_sp2/disk0.raw,hda,w', ] vif=[ 'mac=00:16:3e:56:af:69,bridge=br0,type=netfront', ] stdvga=0 vnc=1 vncunused=1 viridian=0 acpi=1 pae=1 serial="pty" Signed-off-by: Chunyan Liu Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 53 +++++++++++++++++++++------------- tools/libxl/libxl.h | 15 ++++++++++ tools/libxl/libxl_bootloader.c | 18 ++++++------ tools/libxl/libxl_create.c | 19 ++++++++++++ tools/libxl/libxl_dm.c | 6 ++++ tools/libxl/libxl_types.idl | 3 ++ tools/libxl/xl_cmdimpl.c | 61 +++++++++++++++++++++++----------------- 7 files changed, 120 insertions(+), 55 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 21ca502..9ab0ad6 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -326,6 +326,37 @@ Action to take if the domain crashes. Default is C. =back +=head3 Direct Kernel Boot + +Direct kernel boot allows booting directly from a kernel and initrd +stored in the host physical machine OS, allowing command line arguments +to be passed directly. PV guest direct kernel boot is supported. HVM +guest direct kernel boot is supported with limitation (it's supported +when using qemu-xen and default BIOS 'seabios'; not supported in case of +stubdom-dm and old rombios.) + +=over 4 + +=item B + +Load the specified file as the kernel image. + +=item B + +Load the specified file as the ramdisk. + +=item B + +Append B to the kernel command line (Note: it is guest +specific what meaning this has). + +=item B + +Append B to the kernel command line. (Note: it is guest +specific what meaning this has). + +=back + =head3 Other Options =over 4 @@ -668,20 +699,12 @@ The following options apply only to Paravirtual guests. =over 4 -=item B - -Load the specified file as the kernel image. Either B or -B must be specified for PV guests. - -=item B - -Load the specified file as the ramdisk. - =item B Run C to find the kernel image and ramdisk to use. Normally C would be C, which is an emulation of -grub/grub2/syslinux. +grub/grub2/syslinux. Either B or B must be specified +for PV guests. =item B @@ -689,16 +712,6 @@ Append Bs to the arguments to the B program. Alternatively if the argument is a simple string then it will be split into words at whitespace (this second option is deprecated). -=item B - -Append B to the kernel command line (Note: it is guest -specific what meaning this has). - -=item B - -Append B to the kernel command line. Note: it is guest -specific what meaning this has). - =item B Selects whether to expose the host e820 (memory map) to the guest via diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0081476..ded4ce5 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -543,6 +543,21 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_DEVICE_PCI_SEIZE 1 +/* + * LIBXL_HAVE_BUILDINFO_KERNEL + * + * If this is defined, then the libxl_domain_build_info structure will + * contain 'kernel', 'ramdisk', 'cmdline' fields. 'kernel' is a string + * to indicate kernel image location, 'ramdisk' is a string to indicate + * ramdisk location, 'cmdline' is a string to indicate the paramters which + * would be appended to kernel image. + * + * Both PV guest and HVM guest can use these fields for direct kernel boot. + * But for compatibility reason, u.pv.kernel, u.pv.ramdisk and u.pv.cmdline + * still exist. + */ +#define LIBXL_HAVE_BUILDINFO_KERNEL 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index c3ec782..79947d4 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -58,12 +58,12 @@ static void make_bootloader_args(libxl__gc *gc, libxl__bootloader_state *bl, ARG(bootloader_path); - if (info->u.pv.kernel) - ARG(libxl__sprintf(gc, "--kernel=%s", info->u.pv.kernel)); - if (info->u.pv.ramdisk) - ARG(libxl__sprintf(gc, "--ramdisk=%s", info->u.pv.ramdisk)); - if (info->u.pv.cmdline && *info->u.pv.cmdline != '\0') - ARG(libxl__sprintf(gc, "--args=%s", info->u.pv.cmdline)); + if (info->kernel) + ARG(libxl__sprintf(gc, "--kernel=%s", info->kernel)); + if (info->ramdisk) + ARG(libxl__sprintf(gc, "--ramdisk=%s", info->ramdisk)); + if (info->cmdline && *info->cmdline != '\0') + ARG(libxl__sprintf(gc, "--args=%s", info->cmdline)); ARG(libxl__sprintf(gc, "--output=%s", bl->outputpath)); ARG("--output-format=simple0"); @@ -327,9 +327,9 @@ void libxl__bootloader_run(libxl__egc *egc, libxl__bootloader_state *bl) if (!info->u.pv.bootloader) { LOG(DEBUG, "no bootloader configured, using user supplied kernel"); - bl->kernel->path = bl->info->u.pv.kernel; - bl->ramdisk->path = bl->info->u.pv.ramdisk; - bl->cmdline = bl->info->u.pv.cmdline; + bl->kernel->path = bl->info->kernel; + bl->ramdisk->path = bl->info->ramdisk; + bl->cmdline = bl->info->cmdline; rc = 0; goto out_ok; } diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 9b66294..fc332ef 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -354,6 +354,25 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->shadow_memkb = 0; if (b_info->u.pv.slack_memkb == LIBXL_MEMKB_DEFAULT) b_info->u.pv.slack_memkb = 0; + + /* For compatibility, fill in b_info->kernel|ramdisk|cmdline + * with the value in u.pv, later processing will use + * b_info->kernel|ramdisk|cmdline only. + * User with old APIs that passes u.pv.kernel|ramdisk|cmdline + * is not affected. + */ + if (!b_info->kernel && b_info->u.pv.kernel) { + b_info->kernel = b_info->u.pv.kernel; + b_info->u.pv.kernel = NULL; + } + if (!b_info->ramdisk && b_info->u.pv.ramdisk) { + b_info->ramdisk = b_info->u.pv.ramdisk; + b_info->u.pv.ramdisk = NULL; + } + if (!b_info->cmdline && b_info->u.pv.cmdline) { + b_info->cmdline = b_info->u.pv.cmdline; + b_info->u.pv.cmdline = NULL; + } break; default: LIBXL__LOG(CTX, LIBXL__LOG_ERROR, diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index a224446..103cbca 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -196,6 +196,12 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, int nr_set_cpus = 0; char *s; + if (b_info->kernel) { + LOG(ERROR, "HVM direct kernel boot is not supported by " + "qemu-xen-traditional"); + return NULL; + } + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 78a18af..08a7927 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -355,6 +355,9 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("iomem", Array(libxl_iomem_range, "num_iomem")), ("claim_mode", libxl_defbool), ("event_channels", uint32), + ("kernel", string), + ("cmdline", string), + ("ramdisk", string), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), ("bios", libxl_bios_type), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index bdca14b..9120c1e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -691,6 +691,29 @@ static void parse_top_level_sdl_options(XLU_Config *config, xlu_cfg_replace_string (config, "xauthority", &sdl->xauthority, 0); } +static char *parse_cmdline(XLU_Config *config) +{ + char *cmdline = NULL; + const char *root = NULL, *extra = ""; + + xlu_cfg_get_string (config, "root", &root, 0); + xlu_cfg_get_string (config, "extra", &extra, 0); + + if (root) { + if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) + cmdline = NULL; + } else { + cmdline = strdup(extra); + } + + if ((root || extra) && !cmdline) { + fprintf(stderr, "Failed to allocate memory for cmdline\n"); + exit(1); + } + + return cmdline; +} + static void parse_vcpu_affinity(libxl_domain_build_info *b_info, XLU_ConfigList *cpus, const char *buf, int num_cpus, bool is_hard) @@ -970,13 +993,21 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long(config, "max_event_channels", &l, 0)) b_info->event_channels = l; + xlu_cfg_replace_string (config, "kernel", &b_info->kernel, 0); + xlu_cfg_replace_string (config, "ramdisk", &b_info->ramdisk, 0); + b_info->cmdline = parse_cmdline(config); + xlu_cfg_get_defbool(config, "driver_domain", &c_info->driver_domain, 0); switch(b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: - if (!xlu_cfg_get_string (config, "kernel", &buf, 0)) - fprintf(stderr, "WARNING: ignoring \"kernel\" directive for HVM guest. " - "Use \"firmware_override\" instead if you really want a non-default firmware\n"); + if (!strcmp(libxl_basename(b_info->kernel), "hvmloader")) { + fprintf(stderr, "WARNING: you seem to be using \"kernel\" " + "directive to override HVM guest firmware. Ignore " + "that. Use \"firmware_override\" instead if you " + "really want a non-default firmware\n"); + b_info->kernel = NULL; + } xlu_cfg_replace_string (config, "firmware_override", &b_info->u.hvm.firmware, 0); @@ -1043,26 +1074,6 @@ static void parse_config_data(const char *config_source, break; case LIBXL_DOMAIN_TYPE_PV: { - char *cmdline = NULL; - const char *root = NULL, *extra = ""; - - xlu_cfg_replace_string (config, "kernel", &b_info->u.pv.kernel, 0); - - xlu_cfg_get_string (config, "root", &root, 0); - xlu_cfg_get_string (config, "extra", &extra, 0); - - if (root) { - if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) - cmdline = NULL; - } else { - cmdline = strdup(extra); - } - - if ((root || extra) && !cmdline) { - fprintf(stderr, "Failed to allocate memory for cmdline\n"); - exit(1); - } - xlu_cfg_replace_string (config, "bootloader", &b_info->u.pv.bootloader, 0); switch (xlu_cfg_get_list_as_string_list(config, "bootloader_args", &b_info->u.pv.bootloader_args, 1)) @@ -1085,13 +1096,11 @@ static void parse_config_data(const char *config_source, exit(-ERROR_FAIL); } - if (!b_info->u.pv.bootloader && !b_info->u.pv.kernel) { + if (!b_info->u.pv.bootloader && !b_info->kernel) { fprintf(stderr, "Neither kernel nor bootloader specified\n"); exit(1); } - b_info->u.pv.cmdline = cmdline; - xlu_cfg_replace_string (config, "ramdisk", &b_info->u.pv.ramdisk, 0); break; } default: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiH6-0003Oh-Rr; Sat, 30 Aug 2014 13:01:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiH5-0003OT-Jj for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:59 +0000 Received: from [193.109.254.147:2261] by server-2.bemta-14.messagelabs.com id 7D/24-07861-A0BC1045; Sat, 30 Aug 2014 13:00:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1409403657!12451177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2209 invoked from network); 30 Aug 2014 13:00:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiH2-0007A9-UM for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiH2-00077i-SJ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:56 +0000 Date: Sat, 30 Aug 2014 13:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl.cfg: add 'cmdline' in config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 986aea7fbe3c6ff3c4d2312ca8a4365930401e40 Author: Chunyan Liu AuthorDate: Mon Jul 7 14:34:34 2014 +0800 Commit: Ian Campbell CommitDate: Tue Aug 26 21:18:51 2014 +0100 xl.cfg: add 'cmdline' in config file Currently in xl.cfg, use 'root' and 'extra' to generate the command line. 'cmdline' could be a more generic equivalent. So, add 'cmdline' in xl.cfg and let it be preferred. 'root' and 'extra' still works. But when 'cmdline' is specified, 'root' and 'extra' will be ignored. [HVM config example] [snip] builder="hvm" device_model_override="/home/cyliu/git/qemu/x86_64-softmmu/qemu-system-x86_64" kernel="/mnt/vmlinuz-3.0.13-0.27-default" ramdisk="/mnt/initrd-3.0.13-0.27-default" root="/dev/hda2" extra="console=tty0 console=ttyS0" [snip] or: [snip] builder="hvm" device_model_override="/home/cyliu/git/qemu/x86_64-softmmu/qemu-system-x86_64" kernel="/mnt/vmlinuz-3.0.13-0.27-default" ramdisk="/mnt/initrd-3.0.13-0.27-default" cmdline="root=/dev/hda2 console=tty0 console=ttyS0" [snip] Signed-off-by: Chunyan Liu Acked-by: Ian Campbell Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 7 +++++++ tools/libxl/xl_cmdimpl.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 9ab0ad6..f1fc906 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -345,6 +345,13 @@ Load the specified file as the kernel image. Load the specified file as the ramdisk. +=item B + +Append B to the kernel command line. (Note: it is +guest specific what meaning this has). It can replace B +plus B and is preferred. When B is set, +B and B will be ignored. + =item B Append B to the kernel command line (Note: it is guest diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9120c1e..409a795 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -694,19 +694,27 @@ static void parse_top_level_sdl_options(XLU_Config *config, static char *parse_cmdline(XLU_Config *config) { char *cmdline = NULL; - const char *root = NULL, *extra = ""; + const char *root = NULL, *extra = NULL, *buf = NULL; + xlu_cfg_get_string (config, "cmdline", &buf, 0); xlu_cfg_get_string (config, "root", &root, 0); xlu_cfg_get_string (config, "extra", &extra, 0); - if (root) { - if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) - cmdline = NULL; + if (buf) { + cmdline = strdup(buf); + if (root || extra) + fprintf(stderr, "Warning: ignoring root= and extra= " + "in favour of cmdline=\n"); } else { - cmdline = strdup(extra); + if (root) { + if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) + cmdline = NULL; + } else if (extra) { + cmdline = strdup(extra); + } } - if ((root || extra) && !cmdline) { + if ((buf || root || extra) && !cmdline) { fprintf(stderr, "Failed to allocate memory for cmdline\n"); exit(1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiH6-0003Oh-Rr; Sat, 30 Aug 2014 13:01:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiH5-0003OT-Jj for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:59 +0000 Received: from [193.109.254.147:2261] by server-2.bemta-14.messagelabs.com id 7D/24-07861-A0BC1045; Sat, 30 Aug 2014 13:00:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1409403657!12451177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2209 invoked from network); 30 Aug 2014 13:00:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:00:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiH2-0007A9-UM for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiH2-00077i-SJ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:00:56 +0000 Date: Sat, 30 Aug 2014 13:00:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl.cfg: add 'cmdline' in config file X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 986aea7fbe3c6ff3c4d2312ca8a4365930401e40 Author: Chunyan Liu AuthorDate: Mon Jul 7 14:34:34 2014 +0800 Commit: Ian Campbell CommitDate: Tue Aug 26 21:18:51 2014 +0100 xl.cfg: add 'cmdline' in config file Currently in xl.cfg, use 'root' and 'extra' to generate the command line. 'cmdline' could be a more generic equivalent. So, add 'cmdline' in xl.cfg and let it be preferred. 'root' and 'extra' still works. But when 'cmdline' is specified, 'root' and 'extra' will be ignored. [HVM config example] [snip] builder="hvm" device_model_override="/home/cyliu/git/qemu/x86_64-softmmu/qemu-system-x86_64" kernel="/mnt/vmlinuz-3.0.13-0.27-default" ramdisk="/mnt/initrd-3.0.13-0.27-default" root="/dev/hda2" extra="console=tty0 console=ttyS0" [snip] or: [snip] builder="hvm" device_model_override="/home/cyliu/git/qemu/x86_64-softmmu/qemu-system-x86_64" kernel="/mnt/vmlinuz-3.0.13-0.27-default" ramdisk="/mnt/initrd-3.0.13-0.27-default" cmdline="root=/dev/hda2 console=tty0 console=ttyS0" [snip] Signed-off-by: Chunyan Liu Acked-by: Ian Campbell Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 7 +++++++ tools/libxl/xl_cmdimpl.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 9ab0ad6..f1fc906 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -345,6 +345,13 @@ Load the specified file as the kernel image. Load the specified file as the ramdisk. +=item B + +Append B to the kernel command line. (Note: it is +guest specific what meaning this has). It can replace B +plus B and is preferred. When B is set, +B and B will be ignored. + =item B Append B to the kernel command line (Note: it is guest diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9120c1e..409a795 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -694,19 +694,27 @@ static void parse_top_level_sdl_options(XLU_Config *config, static char *parse_cmdline(XLU_Config *config) { char *cmdline = NULL; - const char *root = NULL, *extra = ""; + const char *root = NULL, *extra = NULL, *buf = NULL; + xlu_cfg_get_string (config, "cmdline", &buf, 0); xlu_cfg_get_string (config, "root", &root, 0); xlu_cfg_get_string (config, "extra", &extra, 0); - if (root) { - if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) - cmdline = NULL; + if (buf) { + cmdline = strdup(buf); + if (root || extra) + fprintf(stderr, "Warning: ignoring root= and extra= " + "in favour of cmdline=\n"); } else { - cmdline = strdup(extra); + if (root) { + if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) + cmdline = NULL; + } else if (extra) { + cmdline = strdup(extra); + } } - if ((root || extra) && !cmdline) { + if ((buf || root || extra) && !cmdline) { fprintf(stderr, "Failed to allocate memory for cmdline\n"); exit(1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHG-0003Qe-Uu; Sat, 30 Aug 2014 13:01:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHF-0003QQ-PJ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:09 +0000 Received: from [85.158.143.35:65075] by server-3.bemta-4.messagelabs.com id 7A/A2-06192-51BC1045; Sat, 30 Aug 2014 13:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1409403667!12558493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2222 invoked from network); 30 Aug 2014 13:01:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHD-0007Ai-8z for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHD-00078E-1r for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:07 +0000 Date: Sat, 30 Aug 2014 13:01:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen arm/arm64: minor improvement in smp_send_call_function_mask() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95f7ed9abb71b897c70893aaa9c4f413aa4b487e Author: Anup Patel AuthorDate: Mon Aug 25 15:48:40 2014 +0530 Commit: Ian Campbell CommitDate: Tue Aug 26 21:31:29 2014 +0100 xen arm/arm64: minor improvement in smp_send_call_function_mask() Currently, smp_send_call_function_mask() function implemented by xen arm/arm64 will use IPI to call function on current CPU. This means that current smp_send_call_function_mask() will do the following on current CPU: Trigger SGI for current CPU => Xen takes interrupt on current CPU => IPI interrupt handler will call smp_call_function_interrupt() This patch improves the above by straight away calling smp_call_function_interrupt() for current CPU. This is very similar to smp_send_call_function_mask() implemented by Xen x86. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/smp.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/smp.c b/xen/arch/arm/smp.c index 30203b8..917d490 100644 --- a/xen/arch/arm/smp.c +++ b/xen/arch/arm/smp.c @@ -19,7 +19,18 @@ void smp_send_event_check_mask(const cpumask_t *mask) void smp_send_call_function_mask(const cpumask_t *mask) { - send_SGI_mask(mask, GIC_SGI_CALL_FUNCTION); + cpumask_t target_mask; + + cpumask_andnot(&target_mask, mask, cpumask_of(smp_processor_id())); + + send_SGI_mask(&target_mask, GIC_SGI_CALL_FUNCTION); + + if ( cpumask_test_cpu(smp_processor_id(), mask) ) + { + local_irq_disable(); + smp_call_function_interrupt(); + local_irq_enable(); + } } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHG-0003Qe-Uu; Sat, 30 Aug 2014 13:01:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHF-0003QQ-PJ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:09 +0000 Received: from [85.158.143.35:65075] by server-3.bemta-4.messagelabs.com id 7A/A2-06192-51BC1045; Sat, 30 Aug 2014 13:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1409403667!12558493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2222 invoked from network); 30 Aug 2014 13:01:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHD-0007Ai-8z for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHD-00078E-1r for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:07 +0000 Date: Sat, 30 Aug 2014 13:01:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen arm/arm64: minor improvement in smp_send_call_function_mask() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95f7ed9abb71b897c70893aaa9c4f413aa4b487e Author: Anup Patel AuthorDate: Mon Aug 25 15:48:40 2014 +0530 Commit: Ian Campbell CommitDate: Tue Aug 26 21:31:29 2014 +0100 xen arm/arm64: minor improvement in smp_send_call_function_mask() Currently, smp_send_call_function_mask() function implemented by xen arm/arm64 will use IPI to call function on current CPU. This means that current smp_send_call_function_mask() will do the following on current CPU: Trigger SGI for current CPU => Xen takes interrupt on current CPU => IPI interrupt handler will call smp_call_function_interrupt() This patch improves the above by straight away calling smp_call_function_interrupt() for current CPU. This is very similar to smp_send_call_function_mask() implemented by Xen x86. Signed-off-by: Anup Patel Signed-off-by: Pranavkumar Sawargaonkar Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/smp.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/smp.c b/xen/arch/arm/smp.c index 30203b8..917d490 100644 --- a/xen/arch/arm/smp.c +++ b/xen/arch/arm/smp.c @@ -19,7 +19,18 @@ void smp_send_event_check_mask(const cpumask_t *mask) void smp_send_call_function_mask(const cpumask_t *mask) { - send_SGI_mask(mask, GIC_SGI_CALL_FUNCTION); + cpumask_t target_mask; + + cpumask_andnot(&target_mask, mask, cpumask_of(smp_processor_id())); + + send_SGI_mask(&target_mask, GIC_SGI_CALL_FUNCTION); + + if ( cpumask_test_cpu(smp_processor_id(), mask) ) + { + local_irq_disable(); + smp_call_function_interrupt(); + local_irq_enable(); + } } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHR-0003SH-2W; Sat, 30 Aug 2014 13:01:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHP-0003Rz-O3 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:19 +0000 Received: from [85.158.143.35:65502] by server-1.bemta-4.messagelabs.com id DA/D4-05872-F1BC1045; Sat, 30 Aug 2014 13:01:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1409403677!5277593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7481 invoked from network); 30 Aug 2014 13:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHN-0007Ao-Ee for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHN-00078g-DE for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:17 +0000 Date: Sat, 30 Aug 2014 13:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Set max_elem to zero in xc_lockprof_query_number() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 355ed81e1a6ec3987194023d2538a3c4e5d1619d Author: Boris Ostrovsky AuthorDate: Wed Aug 13 12:40:38 2014 -0400 Commit: Ian Campbell CommitDate: Tue Aug 26 22:03:17 2014 +0100 tools/libxc: Set max_elem to zero in xc_lockprof_query_number() If max_elem is not zero then hypervisor's spinlock_profile_ucopy_elem() will attempt to copy profile data into user's data buffer. Since this buffer is explicitly set to (the equivalent of) NULL the copy will fail, causing xenlockprof to fail as well. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 4143de6..e253a58 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -320,6 +320,7 @@ int xc_lockprof_query_number(xc_interface *xch, DECLARE_SYSCTL; sysctl.cmd = XEN_SYSCTL_lockprof_op; + sysctl.u.lockprof_op.max_elem = 0; sysctl.u.lockprof_op.cmd = XEN_SYSCTL_LOCKPROF_query; set_xen_guest_handle(sysctl.u.lockprof_op.data, HYPERCALL_BUFFER_NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHR-0003SH-2W; Sat, 30 Aug 2014 13:01:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHP-0003Rz-O3 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:19 +0000 Received: from [85.158.143.35:65502] by server-1.bemta-4.messagelabs.com id DA/D4-05872-F1BC1045; Sat, 30 Aug 2014 13:01:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1409403677!5277593!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7481 invoked from network); 30 Aug 2014 13:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHN-0007Ao-Ee for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHN-00078g-DE for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:17 +0000 Date: Sat, 30 Aug 2014 13:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Set max_elem to zero in xc_lockprof_query_number() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 355ed81e1a6ec3987194023d2538a3c4e5d1619d Author: Boris Ostrovsky AuthorDate: Wed Aug 13 12:40:38 2014 -0400 Commit: Ian Campbell CommitDate: Tue Aug 26 22:03:17 2014 +0100 tools/libxc: Set max_elem to zero in xc_lockprof_query_number() If max_elem is not zero then hypervisor's spinlock_profile_ucopy_elem() will attempt to copy profile data into user's data buffer. Since this buffer is explicitly set to (the equivalent of) NULL the copy will fail, causing xenlockprof to fail as well. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 4143de6..e253a58 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -320,6 +320,7 @@ int xc_lockprof_query_number(xc_interface *xch, DECLARE_SYSCTL; sysctl.cmd = XEN_SYSCTL_lockprof_op; + sysctl.u.lockprof_op.max_elem = 0; sysctl.u.lockprof_op.cmd = XEN_SYSCTL_LOCKPROF_query; set_xen_guest_handle(sysctl.u.lockprof_op.data, HYPERCALL_BUFFER_NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHb-0003U2-59; Sat, 30 Aug 2014 13:01:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHa-0003Tl-6a for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:30 +0000 Received: from [85.158.137.68:15392] by server-1.bemta-3.messagelabs.com id B3/C5-30185-92BC1045; Sat, 30 Aug 2014 13:01:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1409403687!11510018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 577 invoked from network); 30 Aug 2014 13:01:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHX-0007Aw-KV for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHX-000792-If for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:27 +0000 Date: Sat, 30 Aug 2014 13:01:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Initialise both parts of ctx->sigchld_selfpipe[] to -1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa13f7b0c0f3d01741e35d573009503c3bf7b6a6 Author: Andrew Cooper AuthorDate: Mon Aug 18 14:02:37 2014 +0100 Commit: Ian Campbell CommitDate: Wed Aug 27 02:30:25 2014 +0100 tools/libxl: Initialise both parts of ctx->sigchld_selfpipe[] to -1 Otherwise, if it is not used, libxl_ctx_free() will close fd 0. Reported-by: Alex Bligh Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3526539..a1e0b5e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -71,6 +71,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->childproc_user = 0; ctx->sigchld_selfpipe[0] = -1; + ctx->sigchld_selfpipe[1] = -1; libxl__ev_fd_init(&ctx->sigchld_selfpipe_efd); /* The mutex is special because we can't idempotently destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHb-0003U2-59; Sat, 30 Aug 2014 13:01:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHa-0003Tl-6a for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:30 +0000 Received: from [85.158.137.68:15392] by server-1.bemta-3.messagelabs.com id B3/C5-30185-92BC1045; Sat, 30 Aug 2014 13:01:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1409403687!11510018!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 577 invoked from network); 30 Aug 2014 13:01:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHX-0007Aw-KV for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHX-000792-If for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:27 +0000 Date: Sat, 30 Aug 2014 13:01:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Initialise both parts of ctx->sigchld_selfpipe[] to -1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa13f7b0c0f3d01741e35d573009503c3bf7b6a6 Author: Andrew Cooper AuthorDate: Mon Aug 18 14:02:37 2014 +0100 Commit: Ian Campbell CommitDate: Wed Aug 27 02:30:25 2014 +0100 tools/libxl: Initialise both parts of ctx->sigchld_selfpipe[] to -1 Otherwise, if it is not used, libxl_ctx_free() will close fd 0. Reported-by: Alex Bligh Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3526539..a1e0b5e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -71,6 +71,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->childproc_user = 0; ctx->sigchld_selfpipe[0] = -1; + ctx->sigchld_selfpipe[1] = -1; libxl__ev_fd_init(&ctx->sigchld_selfpipe_efd); /* The mutex is special because we can't idempotently destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHm-0003Vl-85; Sat, 30 Aug 2014 13:01:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHl-0003Va-0h for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:41 +0000 Received: from [85.158.143.35:21761] by server-2.bemta-4.messagelabs.com id 95/11-04525-43BC1045; Sat, 30 Aug 2014 13:01:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1409403698!12233710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13261 invoked from network); 30 Aug 2014 13:01:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHh-0007B2-QV for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHh-0007AB-O3 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:37 +0000 Date: Sat, 30 Aug 2014 13:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: consolidate boolean inputs in hvm and p2m into a shared bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d4d4f9336159f3f77a7b480ce9984fd3ff7949f Author: Tamas K Lengyel AuthorDate: Thu Aug 28 16:02:01 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:02:01 2014 +0200 x86: consolidate boolean inputs in hvm and p2m into a shared bitmap This patch consolidates the boolean input parameters of hvm_hap_nested_page_fault and p2m_mem_access_check into a common bitmap and defines the bitmap members accordingly. Signed-off-by: Tamas K Lengyel Reviewed-by: Jan Beulich Acked-by: Kevin Tian Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 49 +++++++++++++++++++++-------------------- xen/arch/x86/hvm/svm/svm.c | 15 +++++++----- xen/arch/x86/hvm/vmx/vmx.c | 15 ++++++++---- xen/arch/x86/mm/p2m.c | 18 +++++++------- xen/include/asm-x86/hvm/hvm.h | 7 +---- xen/include/asm-x86/mm.h | 10 ++++++++ xen/include/asm-x86/p2m.h | 6 ++-- 7 files changed, 68 insertions(+), 52 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 94b18ba..0363714 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2723,12 +2723,8 @@ void hvm_inject_page_fault(int errcode, unsigned long cr2) hvm_inject_trap(&trap); } -int hvm_hap_nested_page_fault(paddr_t gpa, - bool_t gla_valid, - unsigned long gla, - bool_t access_r, - bool_t access_w, - bool_t access_x) +int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, + struct npfec npfec) { unsigned long gfn = gpa >> PAGE_SHIFT; p2m_type_t p2mt; @@ -2757,8 +2753,11 @@ int hvm_hap_nested_page_fault(paddr_t gpa, * into l1 guest if not fixable. The algorithm is * the same as for shadow paging. */ - rv = nestedhvm_hap_nested_page_fault(v, &gpa, - access_r, access_w, access_x); + + rv = nestedhvm_hap_nested_page_fault(v, &gpa, + npfec.read_access, + npfec.write_access, + npfec.insn_fetch); switch (rv) { case NESTEDHVM_PAGEFAULT_DONE: case NESTEDHVM_PAGEFAULT_RETRY: @@ -2797,47 +2796,49 @@ int hvm_hap_nested_page_fault(paddr_t gpa, p2m = p2m_get_hostp2m(v->domain); mfn = get_gfn_type_access(p2m, gfn, &p2mt, &p2ma, - P2M_ALLOC | (access_w ? P2M_UNSHARE : 0), NULL); + P2M_ALLOC | npfec.write_access ? P2M_UNSHARE : 0, + NULL); /* Check access permissions first, then handle faults */ if ( mfn_x(mfn) != INVALID_MFN ) { - int violation = 0; + bool_t violation; + /* If the access is against the permissions, then send to mem_event */ - switch (p2ma) + switch (p2ma) { case p2m_access_n: case p2m_access_n2rwx: default: - violation = access_r || access_w || access_x; + violation = npfec.read_access || npfec.write_access || npfec.insn_fetch; break; case p2m_access_r: - violation = access_w || access_x; + violation = npfec.write_access || npfec.insn_fetch; break; case p2m_access_w: - violation = access_r || access_x; + violation = npfec.read_access || npfec.insn_fetch; break; case p2m_access_x: - violation = access_r || access_w; + violation = npfec.read_access || npfec.write_access; break; case p2m_access_rx: case p2m_access_rx2rw: - violation = access_w; + violation = npfec.write_access; break; case p2m_access_wx: - violation = access_r; + violation = npfec.read_access; break; case p2m_access_rw: - violation = access_x; + violation = npfec.insn_fetch; break; case p2m_access_rwx: + violation = 0; break; } if ( violation ) { - if ( p2m_mem_access_check(gpa, gla_valid, gla, access_r, - access_w, access_x, &req_ptr) ) + if ( p2m_mem_access_check(gpa, gla, npfec, &req_ptr) ) { fall_through = 1; } else { @@ -2853,7 +2854,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, * to the mmio handler. */ if ( (p2mt == p2m_mmio_dm) || - (access_w && (p2mt == p2m_ram_ro)) ) + (npfec.write_access && (p2mt == p2m_ram_ro)) ) { put_gfn(p2m->domain, gfn); @@ -2872,7 +2873,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, paged = 1; /* Mem sharing: unshare the page and try again */ - if ( access_w && (p2mt == p2m_ram_shared) ) + if ( npfec.write_access && (p2mt == p2m_ram_shared) ) { ASSERT(!p2m_is_nestedp2m(p2m)); sharing_enomem = @@ -2889,7 +2890,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, * a large page, we do not change other pages type within that large * page. */ - if ( access_w ) + if ( npfec.write_access ) { paging_mark_dirty(v->domain, mfn_x(mfn)); p2m_change_type_one(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); @@ -2899,7 +2900,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, } /* Shouldn't happen: Maybe the guest was writing to a r/o grant mapping? */ - if ( access_w && (p2mt == p2m_grant_map_ro) ) + if ( npfec.write_access && (p2mt == p2m_grant_map_ro) ) { gdprintk(XENLOG_WARNING, "trying to write to read-only grant mapping\n"); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 98b6b13..b49a7d7 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1394,7 +1394,7 @@ const struct hvm_function_table * __init start_svm(void) } static void svm_do_nested_pgfault(struct vcpu *v, - struct cpu_user_regs *regs, uint32_t npfec, paddr_t gpa) + struct cpu_user_regs *regs, uint32_t pfec, paddr_t gpa) { int ret; unsigned long gfn = gpa >> PAGE_SHIFT; @@ -1403,10 +1403,13 @@ static void svm_do_nested_pgfault(struct vcpu *v, p2m_access_t p2ma; struct p2m_domain *p2m = NULL; - ret = hvm_hap_nested_page_fault(gpa, 0, ~0ul, - 1, /* All NPFs count as reads */ - npfec & PFEC_write_access, - npfec & PFEC_insn_fetch); + struct npfec npfec = { + .read_access = 1, /* All NPFs count as reads */ + .write_access = !!(pfec & PFEC_write_access), + .insn_fetch = !!(pfec & PFEC_insn_fetch) + }; + + ret = hvm_hap_nested_page_fault(gpa, ~0ul, npfec); if ( tb_init_done ) { @@ -1434,7 +1437,7 @@ static void svm_do_nested_pgfault(struct vcpu *v, case -1: ASSERT(nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v)); /* inject #VMEXIT(NPF) into guest. */ - nestedsvm_vmexit_defer(v, VMEXIT_NPF, npfec, gpa); + nestedsvm_vmexit_defer(v, VMEXIT_NPF, pfec, gpa); return; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 039e336..5e8e45e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2352,6 +2352,11 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) p2m_type_t p2mt; int ret; struct domain *d = current->domain; + struct npfec npfec = { + .read_access = !!(qualification & EPT_READ_VIOLATION), + .write_access = !!(qualification & EPT_WRITE_VIOLATION), + .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION) + }; if ( tb_init_done ) { @@ -2370,14 +2375,14 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) } if ( qualification & EPT_GLA_VALID ) + { __vmread(GUEST_LINEAR_ADDRESS, &gla); + npfec.gla_valid = 1; + } else gla = ~0ull; - ret = hvm_hap_nested_page_fault(gpa, - !!(qualification & EPT_GLA_VALID), gla, - !!(qualification & EPT_READ_VIOLATION), - !!(qualification & EPT_WRITE_VIOLATION), - !!(qualification & EPT_EXEC_VIOLATION)); + + ret = hvm_hap_nested_page_fault(gpa, gla, npfec); switch ( ret ) { case 0: // Unhandled L1 EPT violation diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index bca9f0f..1f1f6cd 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1323,9 +1323,9 @@ void p2m_mem_paging_resume(struct domain *d) } } -bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, - bool_t access_r, bool_t access_w, bool_t access_x, - mem_event_request_t **req_ptr) +bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, + struct npfec npfec, + mem_event_request_t **req_ptr) { struct vcpu *v = current; unsigned long gfn = gpa >> PAGE_SHIFT; @@ -1343,7 +1343,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, gfn_lock(p2m, gfn, 0); mfn = p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL); - if ( access_w && p2ma == p2m_access_rx2rw ) + if ( npfec.write_access && p2ma == p2m_access_rx2rw ) { rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rw); ASSERT(rc == 0); @@ -1352,7 +1352,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, } else if ( p2ma == p2m_access_n2rwx ) { - ASSERT(access_w || access_r || access_x); + ASSERT(npfec.write_access || npfec.read_access || npfec.insn_fetch); rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rwx); ASSERT(rc == 0); @@ -1403,11 +1403,11 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Send request to mem event */ req->gfn = gfn; req->offset = gpa & ((1 << PAGE_SHIFT) - 1); - req->gla_valid = gla_valid; + req->gla_valid = npfec.gla_valid; req->gla = gla; - req->access_r = access_r; - req->access_w = access_w; - req->access_x = access_x; + req->access_r = npfec.read_access; + req->access_w = npfec.write_access; + req->access_x = npfec.insn_fetch; req->vcpu_id = v->vcpu_id; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 0ebd478..1123857 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -455,11 +455,8 @@ static inline void hvm_invalidate_regs_fields(struct cpu_user_regs *regs) #endif } -int hvm_hap_nested_page_fault(paddr_t gpa, - bool_t gla_valid, unsigned long gla, - bool_t access_r, - bool_t access_w, - bool_t access_x); +int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, + struct npfec npfec); #define hvm_msr_tsc_aux(v) ({ \ struct domain *__d = (v)->domain; \ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index d253117..1889b25 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -551,6 +551,16 @@ void audit_domains(void); #endif +/* + * Nested page fault exception codes. + */ +struct npfec { + unsigned int read_access:1; + unsigned int write_access:1; + unsigned int insn_fetch:1; + unsigned int gla_valid:1; +}; + int new_guest_cr3(unsigned long pfn); void make_cr3(struct vcpu *v, unsigned long mfn); void update_cr3(struct vcpu *v); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 0ddbadb..3975e32 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -597,9 +597,9 @@ void p2m_mem_paging_resume(struct domain *d); * been promoted with no underlying vcpu pause. If the req_ptr has been populated, * then the caller must put the event in the ring (once having released get_gfn* * locks -- caller must also xfree the request. */ -bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, - bool_t access_r, bool_t access_w, bool_t access_x, - mem_event_request_t **req_ptr); +bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, + struct npfec npfec, + mem_event_request_t **req_ptr); /* Resumes the running of the VCPU, restarting the last instruction */ void p2m_mem_access_resume(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHm-0003Vl-85; Sat, 30 Aug 2014 13:01:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHl-0003Va-0h for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:41 +0000 Received: from [85.158.143.35:21761] by server-2.bemta-4.messagelabs.com id 95/11-04525-43BC1045; Sat, 30 Aug 2014 13:01:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1409403698!12233710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13261 invoked from network); 30 Aug 2014 13:01:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHh-0007B2-QV for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHh-0007AB-O3 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:37 +0000 Date: Sat, 30 Aug 2014 13:01:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: consolidate boolean inputs in hvm and p2m into a shared bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3d4d4f9336159f3f77a7b480ce9984fd3ff7949f Author: Tamas K Lengyel AuthorDate: Thu Aug 28 16:02:01 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:02:01 2014 +0200 x86: consolidate boolean inputs in hvm and p2m into a shared bitmap This patch consolidates the boolean input parameters of hvm_hap_nested_page_fault and p2m_mem_access_check into a common bitmap and defines the bitmap members accordingly. Signed-off-by: Tamas K Lengyel Reviewed-by: Jan Beulich Acked-by: Kevin Tian Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 49 +++++++++++++++++++++-------------------- xen/arch/x86/hvm/svm/svm.c | 15 +++++++----- xen/arch/x86/hvm/vmx/vmx.c | 15 ++++++++---- xen/arch/x86/mm/p2m.c | 18 +++++++------- xen/include/asm-x86/hvm/hvm.h | 7 +---- xen/include/asm-x86/mm.h | 10 ++++++++ xen/include/asm-x86/p2m.h | 6 ++-- 7 files changed, 68 insertions(+), 52 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 94b18ba..0363714 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2723,12 +2723,8 @@ void hvm_inject_page_fault(int errcode, unsigned long cr2) hvm_inject_trap(&trap); } -int hvm_hap_nested_page_fault(paddr_t gpa, - bool_t gla_valid, - unsigned long gla, - bool_t access_r, - bool_t access_w, - bool_t access_x) +int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, + struct npfec npfec) { unsigned long gfn = gpa >> PAGE_SHIFT; p2m_type_t p2mt; @@ -2757,8 +2753,11 @@ int hvm_hap_nested_page_fault(paddr_t gpa, * into l1 guest if not fixable. The algorithm is * the same as for shadow paging. */ - rv = nestedhvm_hap_nested_page_fault(v, &gpa, - access_r, access_w, access_x); + + rv = nestedhvm_hap_nested_page_fault(v, &gpa, + npfec.read_access, + npfec.write_access, + npfec.insn_fetch); switch (rv) { case NESTEDHVM_PAGEFAULT_DONE: case NESTEDHVM_PAGEFAULT_RETRY: @@ -2797,47 +2796,49 @@ int hvm_hap_nested_page_fault(paddr_t gpa, p2m = p2m_get_hostp2m(v->domain); mfn = get_gfn_type_access(p2m, gfn, &p2mt, &p2ma, - P2M_ALLOC | (access_w ? P2M_UNSHARE : 0), NULL); + P2M_ALLOC | npfec.write_access ? P2M_UNSHARE : 0, + NULL); /* Check access permissions first, then handle faults */ if ( mfn_x(mfn) != INVALID_MFN ) { - int violation = 0; + bool_t violation; + /* If the access is against the permissions, then send to mem_event */ - switch (p2ma) + switch (p2ma) { case p2m_access_n: case p2m_access_n2rwx: default: - violation = access_r || access_w || access_x; + violation = npfec.read_access || npfec.write_access || npfec.insn_fetch; break; case p2m_access_r: - violation = access_w || access_x; + violation = npfec.write_access || npfec.insn_fetch; break; case p2m_access_w: - violation = access_r || access_x; + violation = npfec.read_access || npfec.insn_fetch; break; case p2m_access_x: - violation = access_r || access_w; + violation = npfec.read_access || npfec.write_access; break; case p2m_access_rx: case p2m_access_rx2rw: - violation = access_w; + violation = npfec.write_access; break; case p2m_access_wx: - violation = access_r; + violation = npfec.read_access; break; case p2m_access_rw: - violation = access_x; + violation = npfec.insn_fetch; break; case p2m_access_rwx: + violation = 0; break; } if ( violation ) { - if ( p2m_mem_access_check(gpa, gla_valid, gla, access_r, - access_w, access_x, &req_ptr) ) + if ( p2m_mem_access_check(gpa, gla, npfec, &req_ptr) ) { fall_through = 1; } else { @@ -2853,7 +2854,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, * to the mmio handler. */ if ( (p2mt == p2m_mmio_dm) || - (access_w && (p2mt == p2m_ram_ro)) ) + (npfec.write_access && (p2mt == p2m_ram_ro)) ) { put_gfn(p2m->domain, gfn); @@ -2872,7 +2873,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, paged = 1; /* Mem sharing: unshare the page and try again */ - if ( access_w && (p2mt == p2m_ram_shared) ) + if ( npfec.write_access && (p2mt == p2m_ram_shared) ) { ASSERT(!p2m_is_nestedp2m(p2m)); sharing_enomem = @@ -2889,7 +2890,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, * a large page, we do not change other pages type within that large * page. */ - if ( access_w ) + if ( npfec.write_access ) { paging_mark_dirty(v->domain, mfn_x(mfn)); p2m_change_type_one(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); @@ -2899,7 +2900,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, } /* Shouldn't happen: Maybe the guest was writing to a r/o grant mapping? */ - if ( access_w && (p2mt == p2m_grant_map_ro) ) + if ( npfec.write_access && (p2mt == p2m_grant_map_ro) ) { gdprintk(XENLOG_WARNING, "trying to write to read-only grant mapping\n"); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 98b6b13..b49a7d7 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1394,7 +1394,7 @@ const struct hvm_function_table * __init start_svm(void) } static void svm_do_nested_pgfault(struct vcpu *v, - struct cpu_user_regs *regs, uint32_t npfec, paddr_t gpa) + struct cpu_user_regs *regs, uint32_t pfec, paddr_t gpa) { int ret; unsigned long gfn = gpa >> PAGE_SHIFT; @@ -1403,10 +1403,13 @@ static void svm_do_nested_pgfault(struct vcpu *v, p2m_access_t p2ma; struct p2m_domain *p2m = NULL; - ret = hvm_hap_nested_page_fault(gpa, 0, ~0ul, - 1, /* All NPFs count as reads */ - npfec & PFEC_write_access, - npfec & PFEC_insn_fetch); + struct npfec npfec = { + .read_access = 1, /* All NPFs count as reads */ + .write_access = !!(pfec & PFEC_write_access), + .insn_fetch = !!(pfec & PFEC_insn_fetch) + }; + + ret = hvm_hap_nested_page_fault(gpa, ~0ul, npfec); if ( tb_init_done ) { @@ -1434,7 +1437,7 @@ static void svm_do_nested_pgfault(struct vcpu *v, case -1: ASSERT(nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v)); /* inject #VMEXIT(NPF) into guest. */ - nestedsvm_vmexit_defer(v, VMEXIT_NPF, npfec, gpa); + nestedsvm_vmexit_defer(v, VMEXIT_NPF, pfec, gpa); return; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 039e336..5e8e45e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2352,6 +2352,11 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) p2m_type_t p2mt; int ret; struct domain *d = current->domain; + struct npfec npfec = { + .read_access = !!(qualification & EPT_READ_VIOLATION), + .write_access = !!(qualification & EPT_WRITE_VIOLATION), + .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION) + }; if ( tb_init_done ) { @@ -2370,14 +2375,14 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) } if ( qualification & EPT_GLA_VALID ) + { __vmread(GUEST_LINEAR_ADDRESS, &gla); + npfec.gla_valid = 1; + } else gla = ~0ull; - ret = hvm_hap_nested_page_fault(gpa, - !!(qualification & EPT_GLA_VALID), gla, - !!(qualification & EPT_READ_VIOLATION), - !!(qualification & EPT_WRITE_VIOLATION), - !!(qualification & EPT_EXEC_VIOLATION)); + + ret = hvm_hap_nested_page_fault(gpa, gla, npfec); switch ( ret ) { case 0: // Unhandled L1 EPT violation diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index bca9f0f..1f1f6cd 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1323,9 +1323,9 @@ void p2m_mem_paging_resume(struct domain *d) } } -bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, - bool_t access_r, bool_t access_w, bool_t access_x, - mem_event_request_t **req_ptr) +bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, + struct npfec npfec, + mem_event_request_t **req_ptr) { struct vcpu *v = current; unsigned long gfn = gpa >> PAGE_SHIFT; @@ -1343,7 +1343,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, gfn_lock(p2m, gfn, 0); mfn = p2m->get_entry(p2m, gfn, &p2mt, &p2ma, 0, NULL); - if ( access_w && p2ma == p2m_access_rx2rw ) + if ( npfec.write_access && p2ma == p2m_access_rx2rw ) { rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rw); ASSERT(rc == 0); @@ -1352,7 +1352,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, } else if ( p2ma == p2m_access_n2rwx ) { - ASSERT(access_w || access_r || access_x); + ASSERT(npfec.write_access || npfec.read_access || npfec.insn_fetch); rc = p2m->set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2mt, p2m_access_rwx); ASSERT(rc == 0); @@ -1403,11 +1403,11 @@ bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, /* Send request to mem event */ req->gfn = gfn; req->offset = gpa & ((1 << PAGE_SHIFT) - 1); - req->gla_valid = gla_valid; + req->gla_valid = npfec.gla_valid; req->gla = gla; - req->access_r = access_r; - req->access_w = access_w; - req->access_x = access_x; + req->access_r = npfec.read_access; + req->access_w = npfec.write_access; + req->access_x = npfec.insn_fetch; req->vcpu_id = v->vcpu_id; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 0ebd478..1123857 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -455,11 +455,8 @@ static inline void hvm_invalidate_regs_fields(struct cpu_user_regs *regs) #endif } -int hvm_hap_nested_page_fault(paddr_t gpa, - bool_t gla_valid, unsigned long gla, - bool_t access_r, - bool_t access_w, - bool_t access_x); +int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, + struct npfec npfec); #define hvm_msr_tsc_aux(v) ({ \ struct domain *__d = (v)->domain; \ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index d253117..1889b25 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -551,6 +551,16 @@ void audit_domains(void); #endif +/* + * Nested page fault exception codes. + */ +struct npfec { + unsigned int read_access:1; + unsigned int write_access:1; + unsigned int insn_fetch:1; + unsigned int gla_valid:1; +}; + int new_guest_cr3(unsigned long pfn); void make_cr3(struct vcpu *v, unsigned long mfn); void update_cr3(struct vcpu *v); diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 0ddbadb..3975e32 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -597,9 +597,9 @@ void p2m_mem_paging_resume(struct domain *d); * been promoted with no underlying vcpu pause. If the req_ptr has been populated, * then the caller must put the event in the ring (once having released get_gfn* * locks -- caller must also xfree the request. */ -bool_t p2m_mem_access_check(paddr_t gpa, bool_t gla_valid, unsigned long gla, - bool_t access_r, bool_t access_w, bool_t access_x, - mem_event_request_t **req_ptr); +bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, + struct npfec npfec, + mem_event_request_t **req_ptr); /* Resumes the running of the VCPU, restarting the last instruction */ void p2m_mem_access_resume(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHw-0003Xd-DT; Sat, 30 Aug 2014 13:01:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHu-0003XK-O5 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:50 +0000 Received: from [85.158.139.211:38122] by server-17.bemta-5.messagelabs.com id DC/B3-08943-E3BC1045; Sat, 30 Aug 2014 13:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1409403708!11461550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16447 invoked from network); 30 Aug 2014 13:01:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHs-0007B8-1J for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHr-0007AX-Vw for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:48 +0000 Date: Sat, 30 Aug 2014 13:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: treat non-instruction fetch nested page faults also as read violations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 401d5c5cc5a780cad160aa0e3c282c11ac11dd0c Author: Tamas K Lengyel AuthorDate: Thu Aug 28 16:03:26 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:03:26 2014 +0200 x86/hvm: treat non-instruction fetch nested page faults also as read violations As pointed out by Jan Beulich in http://lists.xen.org/archives/html/xen-devel/2014-08/msg01269.html: "Read-modify-write instructions absolutely need to be treated as read accesses, yet hardware doesn't guarantee to tell us so (they may surface as just write accesses)." This patch addresses the issue in both the VMX and the SVM side. VMX: Treat all write data access violations also as read violations (in addition to those that were already reported as read violations). SVM: Refine the meaning of read data access violations to distinguish between read/write and instruction fetch access violations. With this patch both VMX and SVM specific nested page fault handling code reports violations the same way, thus abstracting the hardware specific behaviour from the layers above. Suggested-by: Jan Beulich Signed-off-by: Tamas K Lengyel Reviewed-by: Boris Ostrovsky Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/svm/svm.c | 7 ++++++- xen/arch/x86/hvm/vmx/vmx.c | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b49a7d7..d29caa1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1403,8 +1403,13 @@ static void svm_do_nested_pgfault(struct vcpu *v, p2m_access_t p2ma; struct p2m_domain *p2m = NULL; + /* + * Since HW doesn't explicitly provide a read access bit and we need to + * somehow describe read-modify-write instructions we will conservatively + * set read_access for all memory accesses that are not instruction fetches. + */ struct npfec npfec = { - .read_access = 1, /* All NPFs count as reads */ + .read_access = !(pfec & PFEC_insn_fetch), .write_access = !!(pfec & PFEC_write_access), .insn_fetch = !!(pfec & PFEC_insn_fetch) }; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5e8e45e..d8e1475 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2352,8 +2352,21 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) p2m_type_t p2mt; int ret; struct domain *d = current->domain; + + /* + * We treat all write violations also as read violations. + * The reason why this is required is the following warning: + * "An EPT violation that occurs during as a result of execution of a + * read-modify-write operation sets bit 1 (data write). Whether it also + * sets bit 0 (data read) is implementation-specific and, for a given + * implementation, may differ for different kinds of read-modify-write + * operations." + * - Intel(R) 64 and IA-32 Architectures Software Developer's Manual + * Volume 3C: System Programming Guide, Part 3 + */ struct npfec npfec = { - .read_access = !!(qualification & EPT_READ_VIOLATION), + .read_access = !!(qualification & EPT_READ_VIOLATION) || + !!(qualification & EPT_WRITE_VIOLATION), .write_access = !!(qualification & EPT_WRITE_VIOLATION), .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION) }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:01:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHw-0003Xd-DT; Sat, 30 Aug 2014 13:01:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHu-0003XK-O5 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:50 +0000 Received: from [85.158.139.211:38122] by server-17.bemta-5.messagelabs.com id DC/B3-08943-E3BC1045; Sat, 30 Aug 2014 13:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1409403708!11461550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16447 invoked from network); 30 Aug 2014 13:01:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiHs-0007B8-1J for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiHr-0007AX-Vw for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:48 +0000 Date: Sat, 30 Aug 2014 13:01:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: treat non-instruction fetch nested page faults also as read violations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 401d5c5cc5a780cad160aa0e3c282c11ac11dd0c Author: Tamas K Lengyel AuthorDate: Thu Aug 28 16:03:26 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:03:26 2014 +0200 x86/hvm: treat non-instruction fetch nested page faults also as read violations As pointed out by Jan Beulich in http://lists.xen.org/archives/html/xen-devel/2014-08/msg01269.html: "Read-modify-write instructions absolutely need to be treated as read accesses, yet hardware doesn't guarantee to tell us so (they may surface as just write accesses)." This patch addresses the issue in both the VMX and the SVM side. VMX: Treat all write data access violations also as read violations (in addition to those that were already reported as read violations). SVM: Refine the meaning of read data access violations to distinguish between read/write and instruction fetch access violations. With this patch both VMX and SVM specific nested page fault handling code reports violations the same way, thus abstracting the hardware specific behaviour from the layers above. Suggested-by: Jan Beulich Signed-off-by: Tamas K Lengyel Reviewed-by: Boris Ostrovsky Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/svm/svm.c | 7 ++++++- xen/arch/x86/hvm/vmx/vmx.c | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b49a7d7..d29caa1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1403,8 +1403,13 @@ static void svm_do_nested_pgfault(struct vcpu *v, p2m_access_t p2ma; struct p2m_domain *p2m = NULL; + /* + * Since HW doesn't explicitly provide a read access bit and we need to + * somehow describe read-modify-write instructions we will conservatively + * set read_access for all memory accesses that are not instruction fetches. + */ struct npfec npfec = { - .read_access = 1, /* All NPFs count as reads */ + .read_access = !(pfec & PFEC_insn_fetch), .write_access = !!(pfec & PFEC_write_access), .insn_fetch = !!(pfec & PFEC_insn_fetch) }; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 5e8e45e..d8e1475 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2352,8 +2352,21 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) p2m_type_t p2mt; int ret; struct domain *d = current->domain; + + /* + * We treat all write violations also as read violations. + * The reason why this is required is the following warning: + * "An EPT violation that occurs during as a result of execution of a + * read-modify-write operation sets bit 1 (data write). Whether it also + * sets bit 0 (data read) is implementation-specific and, for a given + * implementation, may differ for different kinds of read-modify-write + * operations." + * - Intel(R) 64 and IA-32 Architectures Software Developer's Manual + * Volume 3C: System Programming Guide, Part 3 + */ struct npfec npfec = { - .read_access = !!(qualification & EPT_READ_VIOLATION), + .read_access = !!(qualification & EPT_READ_VIOLATION) || + !!(qualification & EPT_WRITE_VIOLATION), .write_access = !!(qualification & EPT_WRITE_VIOLATION), .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION) }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiI7-0003Ym-Gm; Sat, 30 Aug 2014 13:02:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiI4-0003Yd-UK for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:01 +0000 Received: from [85.158.143.35:7561] by server-2.bemta-4.messagelabs.com id F5/31-04525-84BC1045; Sat, 30 Aug 2014 13:02:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1409403718!12574629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2210 invoked from network); 30 Aug 2014 13:01:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiI2-0007BH-72 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiI2-0007At-5j for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:58 +0000 Date: Sat, 30 Aug 2014 13:01:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: deliver gla fault EPT violation information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 692f3cc7dd05b80dbd027e46372b1c25d7975332 Author: Tamas K Lengyel AuthorDate: Thu Aug 28 16:04:05 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:04:05 2014 +0200 x86/mem_event: deliver gla fault EPT violation information On Intel EPT the exit qualification generated by a violation also includes a bit (EPT_GLA_FAULT) which describes the following information: Set if the access causing the EPT violation is to a guest-physical address that is the translation of a linear address. Clear if the access causing the EPT violation is to a paging-structure entry as part of a page walk or the update of an accessed or dirty bit. For more information see Table 27-7 in the Intel SDM. This patch extends the mem_event system to deliver this extra information, which could be useful for determining the cause of a violation. Signed-off-by: Tamas K Lengyel Reviewed-by: Jan Beulich Acked-by: Kevin Tian Acked-by: Tim Deegan --- xen/arch/x86/hvm/svm/svm.c | 8 +++++++- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ xen/arch/x86/mm/p2m.c | 5 ++++- xen/include/asm-x86/hvm/svm/svm.h | 6 ++++++ xen/include/asm-x86/mm.h | 11 +++++++++++ xen/include/public/mem_event.h | 4 +++- 6 files changed, 35 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index d29caa1..b5188e6 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1394,7 +1394,7 @@ const struct hvm_function_table * __init start_svm(void) } static void svm_do_nested_pgfault(struct vcpu *v, - struct cpu_user_regs *regs, uint32_t pfec, paddr_t gpa) + struct cpu_user_regs *regs, uint64_t pfec, paddr_t gpa) { int ret; unsigned long gfn = gpa >> PAGE_SHIFT; @@ -1414,6 +1414,12 @@ static void svm_do_nested_pgfault(struct vcpu *v, .insn_fetch = !!(pfec & PFEC_insn_fetch) }; + /* These bits are mutually exclusive */ + if ( pfec & NPT_PFEC_with_gla ) + npfec.kind = npfec_kind_with_gla; + else if ( pfec & NPT_PFEC_in_gpt ) + npfec.kind = npfec_kind_in_gpt; + ret = hvm_hap_nested_page_fault(gpa, ~0ul, npfec); if ( tb_init_done ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d8e1475..26b1ad5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2391,6 +2391,10 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) { __vmread(GUEST_LINEAR_ADDRESS, &gla); npfec.gla_valid = 1; + if( qualification & EPT_GLA_FAULT ) + npfec.kind = npfec_kind_with_gla; + else + npfec.kind = npfec_kind_in_gpt; } else gla = ~0ull; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1f1f6cd..c2e89e1 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1405,10 +1405,13 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, req->offset = gpa & ((1 << PAGE_SHIFT) - 1); req->gla_valid = npfec.gla_valid; req->gla = gla; + if ( npfec.kind == npfec_kind_with_gla ) + req->fault_with_gla = 1; + else if ( npfec.kind == npfec_kind_in_gpt ) + req->fault_in_gpt = 1; req->access_r = npfec.read_access; req->access_w = npfec.write_access; req->access_x = npfec.insn_fetch; - req->vcpu_id = v->vcpu_id; } diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 1ffe6d6..cb2db3f 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -105,4 +105,10 @@ extern u32 svm_feature_flags; extern void svm_host_osvw_reset(void); extern void svm_host_osvw_init(void); +/* EXITINFO1 fields on NPT faults */ +#define _NPT_PFEC_with_gla 32 +#define NPT_PFEC_with_gla (1UL<<_NPT_PFEC_with_gla) +#define _NPT_PFEC_in_gpt 33 +#define NPT_PFEC_in_gpt (1UL<<_NPT_PFEC_in_gpt) + #endif /* __ASM_X86_HVM_SVM_H__ */ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 1889b25..7b85865 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -552,6 +552,16 @@ void audit_domains(void); #endif /* + * Extra fault info types which are used to further describe + * the source of an access violation. + */ +typedef enum { + npfec_kind_unknown, /* must be first */ + npfec_kind_in_gpt, /* violation in guest page table */ + npfec_kind_with_gla /* violation with guest linear address */ +} npfec_kind_t; + +/* * Nested page fault exception codes. */ struct npfec { @@ -559,6 +569,7 @@ struct npfec { unsigned int write_access:1; unsigned int insn_fetch:1; unsigned int gla_valid:1; + unsigned int kind:2; /* npfec_kind_t */ }; int new_guest_cr3(unsigned long pfn); diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index 3831b41..fc12697 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -62,7 +62,9 @@ typedef struct mem_event_st { uint16_t access_w:1; uint16_t access_x:1; uint16_t gla_valid:1; - uint16_t available:12; + uint16_t fault_with_gla:1; + uint16_t fault_in_gpt:1; + uint16_t available:10; uint16_t reason; } mem_event_request_t, mem_event_response_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiI7-0003Ym-Gm; Sat, 30 Aug 2014 13:02:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiI4-0003Yd-UK for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:01 +0000 Received: from [85.158.143.35:7561] by server-2.bemta-4.messagelabs.com id F5/31-04525-84BC1045; Sat, 30 Aug 2014 13:02:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1409403718!12574629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2210 invoked from network); 30 Aug 2014 13:01:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:01:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiI2-0007BH-72 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiI2-0007At-5j for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:01:58 +0000 Date: Sat, 30 Aug 2014 13:01:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mem_event: deliver gla fault EPT violation information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 692f3cc7dd05b80dbd027e46372b1c25d7975332 Author: Tamas K Lengyel AuthorDate: Thu Aug 28 16:04:05 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:04:05 2014 +0200 x86/mem_event: deliver gla fault EPT violation information On Intel EPT the exit qualification generated by a violation also includes a bit (EPT_GLA_FAULT) which describes the following information: Set if the access causing the EPT violation is to a guest-physical address that is the translation of a linear address. Clear if the access causing the EPT violation is to a paging-structure entry as part of a page walk or the update of an accessed or dirty bit. For more information see Table 27-7 in the Intel SDM. This patch extends the mem_event system to deliver this extra information, which could be useful for determining the cause of a violation. Signed-off-by: Tamas K Lengyel Reviewed-by: Jan Beulich Acked-by: Kevin Tian Acked-by: Tim Deegan --- xen/arch/x86/hvm/svm/svm.c | 8 +++++++- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ xen/arch/x86/mm/p2m.c | 5 ++++- xen/include/asm-x86/hvm/svm/svm.h | 6 ++++++ xen/include/asm-x86/mm.h | 11 +++++++++++ xen/include/public/mem_event.h | 4 +++- 6 files changed, 35 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index d29caa1..b5188e6 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1394,7 +1394,7 @@ const struct hvm_function_table * __init start_svm(void) } static void svm_do_nested_pgfault(struct vcpu *v, - struct cpu_user_regs *regs, uint32_t pfec, paddr_t gpa) + struct cpu_user_regs *regs, uint64_t pfec, paddr_t gpa) { int ret; unsigned long gfn = gpa >> PAGE_SHIFT; @@ -1414,6 +1414,12 @@ static void svm_do_nested_pgfault(struct vcpu *v, .insn_fetch = !!(pfec & PFEC_insn_fetch) }; + /* These bits are mutually exclusive */ + if ( pfec & NPT_PFEC_with_gla ) + npfec.kind = npfec_kind_with_gla; + else if ( pfec & NPT_PFEC_in_gpt ) + npfec.kind = npfec_kind_in_gpt; + ret = hvm_hap_nested_page_fault(gpa, ~0ul, npfec); if ( tb_init_done ) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d8e1475..26b1ad5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2391,6 +2391,10 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) { __vmread(GUEST_LINEAR_ADDRESS, &gla); npfec.gla_valid = 1; + if( qualification & EPT_GLA_FAULT ) + npfec.kind = npfec_kind_with_gla; + else + npfec.kind = npfec_kind_in_gpt; } else gla = ~0ull; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1f1f6cd..c2e89e1 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1405,10 +1405,13 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, req->offset = gpa & ((1 << PAGE_SHIFT) - 1); req->gla_valid = npfec.gla_valid; req->gla = gla; + if ( npfec.kind == npfec_kind_with_gla ) + req->fault_with_gla = 1; + else if ( npfec.kind == npfec_kind_in_gpt ) + req->fault_in_gpt = 1; req->access_r = npfec.read_access; req->access_w = npfec.write_access; req->access_x = npfec.insn_fetch; - req->vcpu_id = v->vcpu_id; } diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 1ffe6d6..cb2db3f 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -105,4 +105,10 @@ extern u32 svm_feature_flags; extern void svm_host_osvw_reset(void); extern void svm_host_osvw_init(void); +/* EXITINFO1 fields on NPT faults */ +#define _NPT_PFEC_with_gla 32 +#define NPT_PFEC_with_gla (1UL<<_NPT_PFEC_with_gla) +#define _NPT_PFEC_in_gpt 33 +#define NPT_PFEC_in_gpt (1UL<<_NPT_PFEC_in_gpt) + #endif /* __ASM_X86_HVM_SVM_H__ */ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 1889b25..7b85865 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -552,6 +552,16 @@ void audit_domains(void); #endif /* + * Extra fault info types which are used to further describe + * the source of an access violation. + */ +typedef enum { + npfec_kind_unknown, /* must be first */ + npfec_kind_in_gpt, /* violation in guest page table */ + npfec_kind_with_gla /* violation with guest linear address */ +} npfec_kind_t; + +/* * Nested page fault exception codes. */ struct npfec { @@ -559,6 +569,7 @@ struct npfec { unsigned int write_access:1; unsigned int insn_fetch:1; unsigned int gla_valid:1; + unsigned int kind:2; /* npfec_kind_t */ }; int new_guest_cr3(unsigned long pfn); diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index 3831b41..fc12697 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -62,7 +62,9 @@ typedef struct mem_event_st { uint16_t access_w:1; uint16_t access_x:1; uint16_t gla_valid:1; - uint16_t available:12; + uint16_t fault_with_gla:1; + uint16_t fault_in_gpt:1; + uint16_t available:10; uint16_t reason; } mem_event_request_t, mem_event_response_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIG-0003aW-Jk; Sat, 30 Aug 2014 13:02:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIE-0003aE-W1 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:11 +0000 Received: from [85.158.143.35:26712] by server-2.bemta-4.messagelabs.com id 65/41-04525-25BC1045; Sat, 30 Aug 2014 13:02:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1409403728!5277673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9897 invoked from network); 30 Aug 2014 13:02:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIC-0007Bq-BV for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIC-0007BP-AU for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:08 +0000 Date: Sat, 30 Aug 2014 13:02:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ats: Disable Address Translation Services by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6eddb742577d182e634785bcfaf92732a50024 Author: Andrew Cooper AuthorDate: Thu Aug 28 16:05:10 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:05:10 2014 +0200 x86/ats: Disable Address Translation Services by default Xen cannot safely use any ATS functionality until it gains asynchronous queued invalidation support, because of the current synchronous wait for completion. Do not turn ATS on by default. While editing the default in the command line documentation, correct the statement regarding PCI Passthrough. ATS is purely a performance optimisation, and is certainly not required for PCI Passthrough to function. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- docs/misc/xen-command-line.markdown | 9 ++++++--- xen/drivers/passthrough/x86/ats.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index a8cab59..5f4680f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -176,10 +176,13 @@ developers wishing Xen to fall back to older timing methods on newer hardware. ### ats > `= ` -> Default: `true` +> Default: `false` + +Permits Xen to set up and use PCI Address Translation Services. This is a +performance optimisation for PCI Passthrough. -Permits Xen to set up and use PCI Address Translation Services, which -is required for PCI Passthrough. +**WARNING: Xen cannot currently safely use ATS because of its synchronous wait +loops for Queued Invalidation completions.** ### availmem > `= ` diff --git a/xen/drivers/passthrough/x86/ats.c b/xen/drivers/passthrough/x86/ats.c index 1e3e03a..436eada 100644 --- a/xen/drivers/passthrough/x86/ats.c +++ b/xen/drivers/passthrough/x86/ats.c @@ -20,7 +20,7 @@ LIST_HEAD(ats_devices); -bool_t __read_mostly ats_enabled = 1; +bool_t __read_mostly ats_enabled = 0; boolean_param("ats", ats_enabled); int enable_ats_device(int seg, int bus, int devfn, const void *iommu) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIG-0003aW-Jk; Sat, 30 Aug 2014 13:02:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIE-0003aE-W1 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:11 +0000 Received: from [85.158.143.35:26712] by server-2.bemta-4.messagelabs.com id 65/41-04525-25BC1045; Sat, 30 Aug 2014 13:02:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1409403728!5277673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9897 invoked from network); 30 Aug 2014 13:02:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIC-0007Bq-BV for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIC-0007BP-AU for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:08 +0000 Date: Sat, 30 Aug 2014 13:02:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ats: Disable Address Translation Services by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6eddb742577d182e634785bcfaf92732a50024 Author: Andrew Cooper AuthorDate: Thu Aug 28 16:05:10 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:05:10 2014 +0200 x86/ats: Disable Address Translation Services by default Xen cannot safely use any ATS functionality until it gains asynchronous queued invalidation support, because of the current synchronous wait for completion. Do not turn ATS on by default. While editing the default in the command line documentation, correct the statement regarding PCI Passthrough. ATS is purely a performance optimisation, and is certainly not required for PCI Passthrough to function. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Suravee Suthikulpanit --- docs/misc/xen-command-line.markdown | 9 ++++++--- xen/drivers/passthrough/x86/ats.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index a8cab59..5f4680f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -176,10 +176,13 @@ developers wishing Xen to fall back to older timing methods on newer hardware. ### ats > `= ` -> Default: `true` +> Default: `false` + +Permits Xen to set up and use PCI Address Translation Services. This is a +performance optimisation for PCI Passthrough. -Permits Xen to set up and use PCI Address Translation Services, which -is required for PCI Passthrough. +**WARNING: Xen cannot currently safely use ATS because of its synchronous wait +loops for Queued Invalidation completions.** ### availmem > `= ` diff --git a/xen/drivers/passthrough/x86/ats.c b/xen/drivers/passthrough/x86/ats.c index 1e3e03a..436eada 100644 --- a/xen/drivers/passthrough/x86/ats.c +++ b/xen/drivers/passthrough/x86/ats.c @@ -20,7 +20,7 @@ LIST_HEAD(ats_devices); -bool_t __read_mostly ats_enabled = 1; +bool_t __read_mostly ats_enabled = 0; boolean_param("ats", ats_enabled); int enable_ats_device(int seg, int bus, int devfn, const void *iommu) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIS-0003cF-N0; Sat, 30 Aug 2014 13:02:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIR-0003c2-8W for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:23 +0000 Received: from [85.158.143.35:27175] by server-2.bemta-4.messagelabs.com id 96/51-04525-E5BC1045; Sat, 30 Aug 2014 13:02:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1409403738!12605016!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28774 invoked from network); 30 Aug 2014 13:02:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIM-0007Bw-G9 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIM-0007Bn-Eg for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:18 +0000 Date: Sat, 30 Aug 2014 13:02:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] update pvSCSI protocol description X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bfbb4ddb22a3edbe962bdd8d2535a7c8eff5123 Author: Juergen Gross AuthorDate: Thu Aug 28 16:05:44 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:05:44 2014 +0200 update pvSCSI protocol description Update the protocol description of the pvSCSI framework used to pass through SCSI devices to a guest (pv or hvm). The main changes are: - added comments - add support for larger SG-lists by putting them in an own granted page - deprecate VSCSIIF_ACT_SCSI_SG_PRESET action with related structures - add ref_rqid for action VSCSIIF_ACT_SCSI_ABORT to be able to specify the request to abort - deprecate timeout_per_command as this really should be handled by the backend in case of default settings or by the guest domain by aborting a long running command This update is related to the rework of the pvSCSI backend and frontend drivers in the Linux kernel. This interface version is included in that rework, too. Signed-off-by: Juergen Gross Reviewed-by: David Vrabel Reviewed-by: Konrad Rzeszutek Wilk --- xen/include/public/io/vscsiif.h | 185 ++++++++++++++++++++++++++++++++++----- 1 files changed, 164 insertions(+), 21 deletions(-) diff --git a/xen/include/public/io/vscsiif.h b/xen/include/public/io/vscsiif.h index a50f980..7a1db05 100644 --- a/xen/include/public/io/vscsiif.h +++ b/xen/include/public/io/vscsiif.h @@ -1,8 +1,8 @@ /****************************************************************************** * vscsiif.h - * + * * Based on the blkif.h code. - * + * * 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 @@ -30,11 +30,131 @@ #include "ring.h" #include "../grant_table.h" -/* commands between backend and frontend */ -#define VSCSIIF_ACT_SCSI_CDB 1 /* SCSI CDB command */ -#define VSCSIIF_ACT_SCSI_ABORT 2 /* SCSI Device(Lun) Abort*/ -#define VSCSIIF_ACT_SCSI_RESET 3 /* SCSI Device(Lun) Reset*/ -#define VSCSIIF_ACT_SCSI_SG_PRESET 4 /* Preset SG elements */ +/* + * Feature and Parameter Negotiation + * ================================= + * The two halves of a Xen pvSCSI driver utilize nodes within the XenStore to + * communicate capabilities and to negotiate operating parameters. This + * section enumerates these nodes which reside in the respective front and + * backend portions of the XenStore, following the XenBus convention. + * + * Any specified default value is in effect if the corresponding XenBus node + * is not present in the XenStore. + * + * XenStore nodes in sections marked "PRIVATE" are solely for use by the + * driver side whose XenBus tree contains them. + * + ***************************************************************************** + * Backend XenBus Nodes + ***************************************************************************** + * + *------------------ Backend Device Identification (PRIVATE) ------------------ + * + * p-devname + * Values: string + * + * A free string used to identify the physical device (e.g. a disk name). + * + * p-dev + * Values: string + * + * A string specifying the backend device: either a 4-tuple "h:c:t:l" + * (host, controller, target, lun, all integers), or a WWN (e.g. + * "naa.60014054ac780582"). + * + * v-dev + * Values: string + * + * A string specifying the frontend device in form of a 4-tuple "h:c:t:l" + * (host, controller, target, lun, all integers). + * + *--------------------------------- Features --------------------------------- + * + * feature-sg-grant + * Values: unsigned [VSCSIIF_SG_TABLESIZE...65535] + * Default Value: 0 + * + * Specifies the maximum number of scatter/gather elements in grant pages + * supported. If not set, the backend supports up to VSCSIIF_SG_TABLESIZE + * SG elements specified directly in the request. + * + ***************************************************************************** + * Frontend XenBus Nodes + ***************************************************************************** + * + *----------------------- Request Transport Parameters ----------------------- + * + * event-channel + * Values: unsigned + * + * The identifier of the Xen event channel used to signal activity + * in the ring buffer. + * + * ring-ref + * Values: unsigned + * + * The Xen grant reference granting permission for the backend to map + * the sole page in a single page sized ring buffer. + * + * protocol + * Values: string (XEN_IO_PROTO_ABI_*) + * Default Value: XEN_IO_PROTO_ABI_NATIVE + * + * The machine ABI rules governing the format of all ring request and + * response structures. + */ + +/* Requests from the frontend to the backend */ + +/* + * Request a SCSI operation specified via a CDB in vscsiif_request.cmnd. + * The target is specified via channel, id and lun. + * + * The operation to be performed is specified via a CDB in cmnd[], the length + * of the CDB is in cmd_len. sc_data_direction specifies the direction of data + * (to the device, from the device, or none at all). + * + * If data is to be transferred to or from the device the buffer(s) in the + * guest memory is/are specified via one or multiple scsiif_request_segment + * descriptors each specifying a memory page via a grant_ref_t, a offset into + * the page and the length of the area in that page. All scsiif_request_segment + * areas concatenated form the resulting data buffer used by the operation. + * If the number of scsiif_request_segment areas is not too large (less than + * or equal VSCSIIF_SG_TABLESIZE) the areas can be specified directly in the + * seg[] array and the number of valid scsiif_request_segment elements is to be + * set in nr_segments. + * + * If "feature-sg-grant" in the Xenstore is set it is possible to specify more + * than VSCSIIF_SG_TABLESIZE scsiif_request_segment elements via indirection. + * The maximum number of allowed scsiif_request_segment elements is the value + * of the "feature-sg-grant" entry from Xenstore. When using indirection the + * seg[] array doesn't contain specifications of the data buffers, but + * references to scsiif_request_segment arrays, which in turn reference the + * data buffers. While nr_segments holds the number of populated seg[] entries + * (plus the set VSCSIIF_SG_GRANT bit), the number of scsiif_request_segment + * elements referencing the target data buffers is calculated from the lengths + * of the seg[] elements (the sum of all valid seg[].length divided by the + * size of one scsiif_request_segment structure). The frontend may use a mix of + * direct and indirect requests. + */ +#define VSCSIIF_ACT_SCSI_CDB 1 + +/* + * Request abort of a running operation for the specified target given by + * channel, id, lun and the operation's rqid in ref_rqid. + */ +#define VSCSIIF_ACT_SCSI_ABORT 2 + +/* + * Request a device reset of the specified target (channel and id). + */ +#define VSCSIIF_ACT_SCSI_RESET 3 + +/* + * Preset scatter/gather elements for a following request. Deprecated. + * Keeping the define only to avoid usage of the value "4" for other actions. + */ +#define VSCSIIF_ACT_SCSI_SG_PRESET 4 /* * Maximum scatter/gather segments per request. @@ -42,11 +162,20 @@ * Considering balance between allocating at least 16 "vscsiif_request" * structures on one page (4096 bytes) and the number of scatter/gather * elements needed, we decided to use 26 as a magic number. + * + * If "feature-sg-grant" is set, more scatter/gather elements can be specified + * by placing them in one or more (up to VSCSIIF_SG_TABLESIZE) granted pages. + * In this case the vscsiif_request seg elements don't contain references to + * the user data, but to the SG elements referencing the user data. */ #define VSCSIIF_SG_TABLESIZE 26 /* - * based on Linux kernel 2.6.18 + * based on Linux kernel 2.6.18, still valid + * + * Changing these values requires support of multiple protocols via the rings + * as "old clients" will blindly use these values and the resulting structure + * sizes. */ #define VSCSIIF_MAX_COMMAND_SIZE 16 #define VSCSIIF_SENSE_BUFFERSIZE 96 @@ -58,26 +187,38 @@ struct scsiif_request_segment { }; typedef struct scsiif_request_segment vscsiif_segment_t; +#define VSCSIIF_SG_PER_PAGE (PAGE_SIZE / sizeof(struct scsiif_request_segment)) + +/* Size of one request is 252 bytes */ struct vscsiif_request { uint16_t rqid; /* private guest value, echoed in resp */ uint8_t act; /* command between backend and frontend */ - uint8_t cmd_len; - - uint8_t cmnd[VSCSIIF_MAX_COMMAND_SIZE]; - uint16_t timeout_per_command; /* The command is issued by twice - the value in Backend. */ - uint16_t channel, id, lun; - uint16_t padding; - uint8_t sc_data_direction; /* for DMA_TO_DEVICE(1) - DMA_FROM_DEVICE(2) - DMA_NONE(3) requests */ - uint8_t nr_segments; /* Number of pieces of scatter-gather */ + uint8_t cmd_len; /* valid CDB bytes */ + + uint8_t cmnd[VSCSIIF_MAX_COMMAND_SIZE]; /* the CDB */ + uint16_t timeout_per_command; /* deprecated: timeout in secs, 0=default */ + uint16_t channel, id, lun; /* (virtual) device specification */ + uint16_t ref_rqid; /* command abort reference */ + uint8_t sc_data_direction; /* for DMA_TO_DEVICE(1) + DMA_FROM_DEVICE(2) + DMA_NONE(3) requests */ + uint8_t nr_segments; /* Number of pieces of scatter-gather */ +/* + * flag in nr_segments: SG elements via grant page + * + * If VSCSIIF_SG_GRANT is set, the low 7 bits of nr_segments specify the number + * of grant pages containing SG elements. Usable if "feature-sg-grant" set. + */ +#define VSCSIIF_SG_GRANT 0x80 vscsiif_segment_t seg[VSCSIIF_SG_TABLESIZE]; uint32_t reserved[3]; }; typedef struct vscsiif_request vscsiif_request_t; +/* + * The following interface is deprecated! + */ #define VSCSIIF_SG_LIST_SIZE ((sizeof(vscsiif_request_t) - 4) \ / sizeof(vscsiif_segment_t)) @@ -89,10 +230,12 @@ struct vscsiif_sg_list { vscsiif_segment_t seg[VSCSIIF_SG_LIST_SIZE]; }; typedef struct vscsiif_sg_list vscsiif_sg_list_t; +/* End of deprecated interface */ +/* Size of one response is 252 bytes */ struct vscsiif_response { - uint16_t rqid; - uint8_t act; /* valid only when backend supports SG_PRESET */ + uint16_t rqid; /* identifies request */ + uint8_t act; /* deprecated: valid only if SG_PRESET supported */ uint8_t sense_len; uint8_t sense_buffer[VSCSIIF_SENSE_BUFFERSIZE]; int32_t rslt; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIS-0003cF-N0; Sat, 30 Aug 2014 13:02:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIR-0003c2-8W for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:23 +0000 Received: from [85.158.143.35:27175] by server-2.bemta-4.messagelabs.com id 96/51-04525-E5BC1045; Sat, 30 Aug 2014 13:02:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1409403738!12605016!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28774 invoked from network); 30 Aug 2014 13:02:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIM-0007Bw-G9 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIM-0007Bn-Eg for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:18 +0000 Date: Sat, 30 Aug 2014 13:02:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] update pvSCSI protocol description X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bfbb4ddb22a3edbe962bdd8d2535a7c8eff5123 Author: Juergen Gross AuthorDate: Thu Aug 28 16:05:44 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:05:44 2014 +0200 update pvSCSI protocol description Update the protocol description of the pvSCSI framework used to pass through SCSI devices to a guest (pv or hvm). The main changes are: - added comments - add support for larger SG-lists by putting them in an own granted page - deprecate VSCSIIF_ACT_SCSI_SG_PRESET action with related structures - add ref_rqid for action VSCSIIF_ACT_SCSI_ABORT to be able to specify the request to abort - deprecate timeout_per_command as this really should be handled by the backend in case of default settings or by the guest domain by aborting a long running command This update is related to the rework of the pvSCSI backend and frontend drivers in the Linux kernel. This interface version is included in that rework, too. Signed-off-by: Juergen Gross Reviewed-by: David Vrabel Reviewed-by: Konrad Rzeszutek Wilk --- xen/include/public/io/vscsiif.h | 185 ++++++++++++++++++++++++++++++++++----- 1 files changed, 164 insertions(+), 21 deletions(-) diff --git a/xen/include/public/io/vscsiif.h b/xen/include/public/io/vscsiif.h index a50f980..7a1db05 100644 --- a/xen/include/public/io/vscsiif.h +++ b/xen/include/public/io/vscsiif.h @@ -1,8 +1,8 @@ /****************************************************************************** * vscsiif.h - * + * * Based on the blkif.h code. - * + * * 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 @@ -30,11 +30,131 @@ #include "ring.h" #include "../grant_table.h" -/* commands between backend and frontend */ -#define VSCSIIF_ACT_SCSI_CDB 1 /* SCSI CDB command */ -#define VSCSIIF_ACT_SCSI_ABORT 2 /* SCSI Device(Lun) Abort*/ -#define VSCSIIF_ACT_SCSI_RESET 3 /* SCSI Device(Lun) Reset*/ -#define VSCSIIF_ACT_SCSI_SG_PRESET 4 /* Preset SG elements */ +/* + * Feature and Parameter Negotiation + * ================================= + * The two halves of a Xen pvSCSI driver utilize nodes within the XenStore to + * communicate capabilities and to negotiate operating parameters. This + * section enumerates these nodes which reside in the respective front and + * backend portions of the XenStore, following the XenBus convention. + * + * Any specified default value is in effect if the corresponding XenBus node + * is not present in the XenStore. + * + * XenStore nodes in sections marked "PRIVATE" are solely for use by the + * driver side whose XenBus tree contains them. + * + ***************************************************************************** + * Backend XenBus Nodes + ***************************************************************************** + * + *------------------ Backend Device Identification (PRIVATE) ------------------ + * + * p-devname + * Values: string + * + * A free string used to identify the physical device (e.g. a disk name). + * + * p-dev + * Values: string + * + * A string specifying the backend device: either a 4-tuple "h:c:t:l" + * (host, controller, target, lun, all integers), or a WWN (e.g. + * "naa.60014054ac780582"). + * + * v-dev + * Values: string + * + * A string specifying the frontend device in form of a 4-tuple "h:c:t:l" + * (host, controller, target, lun, all integers). + * + *--------------------------------- Features --------------------------------- + * + * feature-sg-grant + * Values: unsigned [VSCSIIF_SG_TABLESIZE...65535] + * Default Value: 0 + * + * Specifies the maximum number of scatter/gather elements in grant pages + * supported. If not set, the backend supports up to VSCSIIF_SG_TABLESIZE + * SG elements specified directly in the request. + * + ***************************************************************************** + * Frontend XenBus Nodes + ***************************************************************************** + * + *----------------------- Request Transport Parameters ----------------------- + * + * event-channel + * Values: unsigned + * + * The identifier of the Xen event channel used to signal activity + * in the ring buffer. + * + * ring-ref + * Values: unsigned + * + * The Xen grant reference granting permission for the backend to map + * the sole page in a single page sized ring buffer. + * + * protocol + * Values: string (XEN_IO_PROTO_ABI_*) + * Default Value: XEN_IO_PROTO_ABI_NATIVE + * + * The machine ABI rules governing the format of all ring request and + * response structures. + */ + +/* Requests from the frontend to the backend */ + +/* + * Request a SCSI operation specified via a CDB in vscsiif_request.cmnd. + * The target is specified via channel, id and lun. + * + * The operation to be performed is specified via a CDB in cmnd[], the length + * of the CDB is in cmd_len. sc_data_direction specifies the direction of data + * (to the device, from the device, or none at all). + * + * If data is to be transferred to or from the device the buffer(s) in the + * guest memory is/are specified via one or multiple scsiif_request_segment + * descriptors each specifying a memory page via a grant_ref_t, a offset into + * the page and the length of the area in that page. All scsiif_request_segment + * areas concatenated form the resulting data buffer used by the operation. + * If the number of scsiif_request_segment areas is not too large (less than + * or equal VSCSIIF_SG_TABLESIZE) the areas can be specified directly in the + * seg[] array and the number of valid scsiif_request_segment elements is to be + * set in nr_segments. + * + * If "feature-sg-grant" in the Xenstore is set it is possible to specify more + * than VSCSIIF_SG_TABLESIZE scsiif_request_segment elements via indirection. + * The maximum number of allowed scsiif_request_segment elements is the value + * of the "feature-sg-grant" entry from Xenstore. When using indirection the + * seg[] array doesn't contain specifications of the data buffers, but + * references to scsiif_request_segment arrays, which in turn reference the + * data buffers. While nr_segments holds the number of populated seg[] entries + * (plus the set VSCSIIF_SG_GRANT bit), the number of scsiif_request_segment + * elements referencing the target data buffers is calculated from the lengths + * of the seg[] elements (the sum of all valid seg[].length divided by the + * size of one scsiif_request_segment structure). The frontend may use a mix of + * direct and indirect requests. + */ +#define VSCSIIF_ACT_SCSI_CDB 1 + +/* + * Request abort of a running operation for the specified target given by + * channel, id, lun and the operation's rqid in ref_rqid. + */ +#define VSCSIIF_ACT_SCSI_ABORT 2 + +/* + * Request a device reset of the specified target (channel and id). + */ +#define VSCSIIF_ACT_SCSI_RESET 3 + +/* + * Preset scatter/gather elements for a following request. Deprecated. + * Keeping the define only to avoid usage of the value "4" for other actions. + */ +#define VSCSIIF_ACT_SCSI_SG_PRESET 4 /* * Maximum scatter/gather segments per request. @@ -42,11 +162,20 @@ * Considering balance between allocating at least 16 "vscsiif_request" * structures on one page (4096 bytes) and the number of scatter/gather * elements needed, we decided to use 26 as a magic number. + * + * If "feature-sg-grant" is set, more scatter/gather elements can be specified + * by placing them in one or more (up to VSCSIIF_SG_TABLESIZE) granted pages. + * In this case the vscsiif_request seg elements don't contain references to + * the user data, but to the SG elements referencing the user data. */ #define VSCSIIF_SG_TABLESIZE 26 /* - * based on Linux kernel 2.6.18 + * based on Linux kernel 2.6.18, still valid + * + * Changing these values requires support of multiple protocols via the rings + * as "old clients" will blindly use these values and the resulting structure + * sizes. */ #define VSCSIIF_MAX_COMMAND_SIZE 16 #define VSCSIIF_SENSE_BUFFERSIZE 96 @@ -58,26 +187,38 @@ struct scsiif_request_segment { }; typedef struct scsiif_request_segment vscsiif_segment_t; +#define VSCSIIF_SG_PER_PAGE (PAGE_SIZE / sizeof(struct scsiif_request_segment)) + +/* Size of one request is 252 bytes */ struct vscsiif_request { uint16_t rqid; /* private guest value, echoed in resp */ uint8_t act; /* command between backend and frontend */ - uint8_t cmd_len; - - uint8_t cmnd[VSCSIIF_MAX_COMMAND_SIZE]; - uint16_t timeout_per_command; /* The command is issued by twice - the value in Backend. */ - uint16_t channel, id, lun; - uint16_t padding; - uint8_t sc_data_direction; /* for DMA_TO_DEVICE(1) - DMA_FROM_DEVICE(2) - DMA_NONE(3) requests */ - uint8_t nr_segments; /* Number of pieces of scatter-gather */ + uint8_t cmd_len; /* valid CDB bytes */ + + uint8_t cmnd[VSCSIIF_MAX_COMMAND_SIZE]; /* the CDB */ + uint16_t timeout_per_command; /* deprecated: timeout in secs, 0=default */ + uint16_t channel, id, lun; /* (virtual) device specification */ + uint16_t ref_rqid; /* command abort reference */ + uint8_t sc_data_direction; /* for DMA_TO_DEVICE(1) + DMA_FROM_DEVICE(2) + DMA_NONE(3) requests */ + uint8_t nr_segments; /* Number of pieces of scatter-gather */ +/* + * flag in nr_segments: SG elements via grant page + * + * If VSCSIIF_SG_GRANT is set, the low 7 bits of nr_segments specify the number + * of grant pages containing SG elements. Usable if "feature-sg-grant" set. + */ +#define VSCSIIF_SG_GRANT 0x80 vscsiif_segment_t seg[VSCSIIF_SG_TABLESIZE]; uint32_t reserved[3]; }; typedef struct vscsiif_request vscsiif_request_t; +/* + * The following interface is deprecated! + */ #define VSCSIIF_SG_LIST_SIZE ((sizeof(vscsiif_request_t) - 4) \ / sizeof(vscsiif_segment_t)) @@ -89,10 +230,12 @@ struct vscsiif_sg_list { vscsiif_segment_t seg[VSCSIIF_SG_LIST_SIZE]; }; typedef struct vscsiif_sg_list vscsiif_sg_list_t; +/* End of deprecated interface */ +/* Size of one response is 252 bytes */ struct vscsiif_response { - uint16_t rqid; - uint8_t act; /* valid only when backend supports SG_PRESET */ + uint16_t rqid; /* identifies request */ + uint8_t act; /* deprecated: valid only if SG_PRESET supported */ uint8_t sense_len; uint8_t sense_buffer[VSCSIIF_SENSE_BUFFERSIZE]; int32_t rslt; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIa-0003dp-RN; Sat, 30 Aug 2014 13:02:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIZ-0003dY-HZ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:31 +0000 Received: from [85.158.143.35:10634] by server-2.bemta-4.messagelabs.com id 71/61-04525-66BC1045; Sat, 30 Aug 2014 13:02:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409403748!12558127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1296 invoked from network); 30 Aug 2014 13:02:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIW-0007C4-Mx for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIW-0007CH-L3 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:28 +0000 Date: Sat, 30 Aug 2014 13:02:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NMI: allow processing unknown NMIs when watchdog is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ea2ba980afe7356c613c8e1ba00d223d1c25412 Author: Ross Lagerwall AuthorDate: Thu Aug 28 16:11:37 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:11:37 2014 +0200 x86/NMI: allow processing unknown NMIs when watchdog is enabled Change NMI processing so that if watchdog=force is passed on the command-line and the NMI is not caused by a perf counter overflow (i.e. likely not a watchdog "tick"), the NMI is handled by the unknown NMI handler. This allows injection of NMIs from IPMI controllers that don't set the IOCK/SERR bits to trigger the unknown NMI handler rather than be ignored. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper Fix command line parsing (don't enable the watchdog on e.g. "watchdog=xyz"). Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 6 +++- xen/arch/x86/nmi.c | 47 +++++++++++++++++++++++++++++++++- xen/arch/x86/traps.c | 7 +++-- xen/include/asm-x86/apic.h | 2 +- xen/include/asm-x86/nmi.h | 3 ++ 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 5f4680f..af93e17 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1248,12 +1248,14 @@ As the BTS virtualisation is not 100% safe and because of the nehalem quirk don't use the vpmu flag on production systems with Intel cpus! ### watchdog -> `= ` +> `= force | ` > Default: `false` Run an NMI watchdog on each processor. If a processor is stuck for -longer than the **watchdog\_timeout**, a panic occurs. +longer than the **watchdog\_timeout**, a panic occurs. When `force` is +specified, in addition to running an NMI watchdog on each processor, +unknown NMIs will still be processed. ### watchdog\_timeout > `= ` diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c4427a6..7d15d5b 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -43,7 +43,26 @@ static DEFINE_PER_CPU(unsigned int, nmi_timer_ticks); /* opt_watchdog: If true, run a watchdog NMI on each processor. */ bool_t __initdata opt_watchdog = 0; -boolean_param("watchdog", opt_watchdog); + +/* watchdog_force: If true, process unknown NMIs when running the watchdog. */ +bool_t watchdog_force = 0; + +static void __init parse_watchdog(char *s) +{ + switch ( parse_bool(s) ) + { + case 0: + opt_watchdog = 0; + return; + case 1: + opt_watchdog = 1; + return; + } + + if ( !strcmp(s, "force") ) + watchdog_force = opt_watchdog = 1; +} +custom_param("watchdog", parse_watchdog); /* opt_watchdog_timeout: Number of seconds to wait before panic. */ static unsigned int opt_watchdog_timeout = 5; @@ -82,6 +101,7 @@ int nmi_active; #define K7_EVNTSEL_USR (1 << 16) #define K7_EVENT_CYCLES_PROCESSOR_IS_RUNNING 0x76 #define K7_NMI_EVENT K7_EVENT_CYCLES_PROCESSOR_IS_RUNNING +#define K7_EVENT_WIDTH 32 #define P6_EVNTSEL0_ENABLE (1 << 22) #define P6_EVNTSEL_INT (1 << 20) @@ -89,10 +109,12 @@ int nmi_active; #define P6_EVNTSEL_USR (1 << 16) #define P6_EVENT_CPU_CLOCKS_NOT_HALTED 0x79 #define CORE_EVENT_CPU_CLOCKS_NOT_HALTED 0x3c +#define P6_EVENT_WIDTH 32 #define P4_ESCR_EVENT_SELECT(N) ((N)<<25) #define P4_CCCR_OVF_PMI0 (1<<26) #define P4_CCCR_OVF_PMI1 (1<<27) +#define P4_CCCR_OVF (1<<31) #define P4_CCCR_THRESHOLD(N) ((N)<<20) #define P4_CCCR_COMPLEMENT (1<<19) #define P4_CCCR_COMPARE (1<<18) @@ -432,8 +454,10 @@ int __init watchdog_setup(void) return 0; } -void nmi_watchdog_tick(const struct cpu_user_regs *regs) +/* Returns false if this was not a watchdog NMI, true otherwise */ +bool_t nmi_watchdog_tick(const struct cpu_user_regs *regs) { + bool_t watchdog_tick = 1; unsigned int sum = this_cpu(nmi_timer_ticks); if ( (this_cpu(last_irq_sums) == sum) && watchdog_enabled() ) @@ -459,8 +483,15 @@ void nmi_watchdog_tick(const struct cpu_user_regs *regs) if ( nmi_perfctr_msr ) { + uint64_t msr_content; + + /* Work out if this is a watchdog tick by checking for overflow. */ if ( nmi_perfctr_msr == MSR_P4_IQ_PERFCTR0 ) { + rdmsrl(MSR_P4_IQ_CCCR0, msr_content); + if ( !(msr_content & P4_CCCR_OVF) ) + watchdog_tick = 0; + /* * P4 quirks: * - An overflown perfctr will assert its interrupt @@ -473,14 +504,26 @@ void nmi_watchdog_tick(const struct cpu_user_regs *regs) } else if ( nmi_perfctr_msr == MSR_P6_PERFCTR0 ) { + rdmsrl(MSR_P6_PERFCTR0, msr_content); + if ( msr_content & (1ULL << P6_EVENT_WIDTH) ) + watchdog_tick = 0; + /* * Only P6 based Pentium M need to re-unmask the apic vector but * it doesn't hurt other P6 variants. */ apic_write(APIC_LVTPC, APIC_DM_NMI); } + else if ( nmi_perfctr_msr == MSR_K7_PERFCTR0 ) + { + rdmsrl(MSR_K7_PERFCTR0, msr_content); + if ( msr_content & (1ULL << K7_EVENT_WIDTH) ) + watchdog_tick = 0; + } write_watchdog_counter(NULL); } + + return watchdog_tick; } /* diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 71be2ae..7f5306f 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3306,14 +3306,15 @@ void do_nmi(const struct cpu_user_regs *regs) { unsigned int cpu = smp_processor_id(); unsigned char reason; + bool_t handle_unknown = 0; ++nmi_count(cpu); if ( nmi_callback(regs, cpu) ) return; - if ( nmi_watchdog ) - nmi_watchdog_tick(regs); + if ( !nmi_watchdog || (!nmi_watchdog_tick(regs) && watchdog_force) ) + handle_unknown = 1; /* Only the BSP gets external NMIs from the system. */ if ( cpu == 0 ) @@ -3323,7 +3324,7 @@ void do_nmi(const struct cpu_user_regs *regs) pci_serr_error(regs); if ( reason & 0x40 ) io_check_error(regs); - if ( !(reason & 0xc0) && !nmi_watchdog ) + if ( !(reason & 0xc0) && handle_unknown ) unknown_nmi_error(regs, reason); } } diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index 5d7623f..6697245 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -206,7 +206,7 @@ extern void release_lapic_nmi(void); extern void self_nmi(void); extern void disable_timer_nmi_watchdog(void); extern void enable_timer_nmi_watchdog(void); -extern void nmi_watchdog_tick (const struct cpu_user_regs *regs); +extern bool_t nmi_watchdog_tick (const struct cpu_user_regs *regs); extern int APIC_init_uniprocessor (void); extern void disable_APIC_timer(void); extern void enable_APIC_timer(void); diff --git a/xen/include/asm-x86/nmi.h b/xen/include/asm-x86/nmi.h index 4504fe1..2c92db9 100644 --- a/xen/include/asm-x86/nmi.h +++ b/xen/include/asm-x86/nmi.h @@ -8,6 +8,9 @@ struct cpu_user_regs; /* Watchdog boolean from the command line */ extern bool_t opt_watchdog; + +/* Watchdog force parameter from the command line */ +extern bool_t watchdog_force; typedef int (*nmi_callback_t)(const struct cpu_user_regs *regs, int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIa-0003dp-RN; Sat, 30 Aug 2014 13:02:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIZ-0003dY-HZ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:31 +0000 Received: from [85.158.143.35:10634] by server-2.bemta-4.messagelabs.com id 71/61-04525-66BC1045; Sat, 30 Aug 2014 13:02:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409403748!12558127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1296 invoked from network); 30 Aug 2014 13:02:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIW-0007C4-Mx for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIW-0007CH-L3 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:28 +0000 Date: Sat, 30 Aug 2014 13:02:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NMI: allow processing unknown NMIs when watchdog is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ea2ba980afe7356c613c8e1ba00d223d1c25412 Author: Ross Lagerwall AuthorDate: Thu Aug 28 16:11:37 2014 +0200 Commit: Jan Beulich CommitDate: Thu Aug 28 16:11:37 2014 +0200 x86/NMI: allow processing unknown NMIs when watchdog is enabled Change NMI processing so that if watchdog=force is passed on the command-line and the NMI is not caused by a perf counter overflow (i.e. likely not a watchdog "tick"), the NMI is handled by the unknown NMI handler. This allows injection of NMIs from IPMI controllers that don't set the IOCK/SERR bits to trigger the unknown NMI handler rather than be ignored. Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper Fix command line parsing (don't enable the watchdog on e.g. "watchdog=xyz"). Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 6 +++- xen/arch/x86/nmi.c | 47 +++++++++++++++++++++++++++++++++- xen/arch/x86/traps.c | 7 +++-- xen/include/asm-x86/apic.h | 2 +- xen/include/asm-x86/nmi.h | 3 ++ 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 5f4680f..af93e17 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1248,12 +1248,14 @@ As the BTS virtualisation is not 100% safe and because of the nehalem quirk don't use the vpmu flag on production systems with Intel cpus! ### watchdog -> `= ` +> `= force | ` > Default: `false` Run an NMI watchdog on each processor. If a processor is stuck for -longer than the **watchdog\_timeout**, a panic occurs. +longer than the **watchdog\_timeout**, a panic occurs. When `force` is +specified, in addition to running an NMI watchdog on each processor, +unknown NMIs will still be processed. ### watchdog\_timeout > `= ` diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c4427a6..7d15d5b 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -43,7 +43,26 @@ static DEFINE_PER_CPU(unsigned int, nmi_timer_ticks); /* opt_watchdog: If true, run a watchdog NMI on each processor. */ bool_t __initdata opt_watchdog = 0; -boolean_param("watchdog", opt_watchdog); + +/* watchdog_force: If true, process unknown NMIs when running the watchdog. */ +bool_t watchdog_force = 0; + +static void __init parse_watchdog(char *s) +{ + switch ( parse_bool(s) ) + { + case 0: + opt_watchdog = 0; + return; + case 1: + opt_watchdog = 1; + return; + } + + if ( !strcmp(s, "force") ) + watchdog_force = opt_watchdog = 1; +} +custom_param("watchdog", parse_watchdog); /* opt_watchdog_timeout: Number of seconds to wait before panic. */ static unsigned int opt_watchdog_timeout = 5; @@ -82,6 +101,7 @@ int nmi_active; #define K7_EVNTSEL_USR (1 << 16) #define K7_EVENT_CYCLES_PROCESSOR_IS_RUNNING 0x76 #define K7_NMI_EVENT K7_EVENT_CYCLES_PROCESSOR_IS_RUNNING +#define K7_EVENT_WIDTH 32 #define P6_EVNTSEL0_ENABLE (1 << 22) #define P6_EVNTSEL_INT (1 << 20) @@ -89,10 +109,12 @@ int nmi_active; #define P6_EVNTSEL_USR (1 << 16) #define P6_EVENT_CPU_CLOCKS_NOT_HALTED 0x79 #define CORE_EVENT_CPU_CLOCKS_NOT_HALTED 0x3c +#define P6_EVENT_WIDTH 32 #define P4_ESCR_EVENT_SELECT(N) ((N)<<25) #define P4_CCCR_OVF_PMI0 (1<<26) #define P4_CCCR_OVF_PMI1 (1<<27) +#define P4_CCCR_OVF (1<<31) #define P4_CCCR_THRESHOLD(N) ((N)<<20) #define P4_CCCR_COMPLEMENT (1<<19) #define P4_CCCR_COMPARE (1<<18) @@ -432,8 +454,10 @@ int __init watchdog_setup(void) return 0; } -void nmi_watchdog_tick(const struct cpu_user_regs *regs) +/* Returns false if this was not a watchdog NMI, true otherwise */ +bool_t nmi_watchdog_tick(const struct cpu_user_regs *regs) { + bool_t watchdog_tick = 1; unsigned int sum = this_cpu(nmi_timer_ticks); if ( (this_cpu(last_irq_sums) == sum) && watchdog_enabled() ) @@ -459,8 +483,15 @@ void nmi_watchdog_tick(const struct cpu_user_regs *regs) if ( nmi_perfctr_msr ) { + uint64_t msr_content; + + /* Work out if this is a watchdog tick by checking for overflow. */ if ( nmi_perfctr_msr == MSR_P4_IQ_PERFCTR0 ) { + rdmsrl(MSR_P4_IQ_CCCR0, msr_content); + if ( !(msr_content & P4_CCCR_OVF) ) + watchdog_tick = 0; + /* * P4 quirks: * - An overflown perfctr will assert its interrupt @@ -473,14 +504,26 @@ void nmi_watchdog_tick(const struct cpu_user_regs *regs) } else if ( nmi_perfctr_msr == MSR_P6_PERFCTR0 ) { + rdmsrl(MSR_P6_PERFCTR0, msr_content); + if ( msr_content & (1ULL << P6_EVENT_WIDTH) ) + watchdog_tick = 0; + /* * Only P6 based Pentium M need to re-unmask the apic vector but * it doesn't hurt other P6 variants. */ apic_write(APIC_LVTPC, APIC_DM_NMI); } + else if ( nmi_perfctr_msr == MSR_K7_PERFCTR0 ) + { + rdmsrl(MSR_K7_PERFCTR0, msr_content); + if ( msr_content & (1ULL << K7_EVENT_WIDTH) ) + watchdog_tick = 0; + } write_watchdog_counter(NULL); } + + return watchdog_tick; } /* diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 71be2ae..7f5306f 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3306,14 +3306,15 @@ void do_nmi(const struct cpu_user_regs *regs) { unsigned int cpu = smp_processor_id(); unsigned char reason; + bool_t handle_unknown = 0; ++nmi_count(cpu); if ( nmi_callback(regs, cpu) ) return; - if ( nmi_watchdog ) - nmi_watchdog_tick(regs); + if ( !nmi_watchdog || (!nmi_watchdog_tick(regs) && watchdog_force) ) + handle_unknown = 1; /* Only the BSP gets external NMIs from the system. */ if ( cpu == 0 ) @@ -3323,7 +3324,7 @@ void do_nmi(const struct cpu_user_regs *regs) pci_serr_error(regs); if ( reason & 0x40 ) io_check_error(regs); - if ( !(reason & 0xc0) && !nmi_watchdog ) + if ( !(reason & 0xc0) && handle_unknown ) unknown_nmi_error(regs, reason); } } diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index 5d7623f..6697245 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -206,7 +206,7 @@ extern void release_lapic_nmi(void); extern void self_nmi(void); extern void disable_timer_nmi_watchdog(void); extern void enable_timer_nmi_watchdog(void); -extern void nmi_watchdog_tick (const struct cpu_user_regs *regs); +extern bool_t nmi_watchdog_tick (const struct cpu_user_regs *regs); extern int APIC_init_uniprocessor (void); extern void disable_APIC_timer(void); extern void enable_APIC_timer(void); diff --git a/xen/include/asm-x86/nmi.h b/xen/include/asm-x86/nmi.h index 4504fe1..2c92db9 100644 --- a/xen/include/asm-x86/nmi.h +++ b/xen/include/asm-x86/nmi.h @@ -8,6 +8,9 @@ struct cpu_user_regs; /* Watchdog boolean from the command line */ extern bool_t opt_watchdog; + +/* Watchdog force parameter from the command line */ +extern bool_t watchdog_force; typedef int (*nmi_callback_t)(const struct cpu_user_regs *regs, int cpu); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIj-0003fH-UF; Sat, 30 Aug 2014 13:02:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIj-0003f6-BZ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:41 +0000 Received: from [85.158.143.35:10985] by server-2.bemta-4.messagelabs.com id C2/71-04525-07BC1045; Sat, 30 Aug 2014 13:02:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1409403759!12590656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10149 invoked from network); 30 Aug 2014 13:02:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIg-0007CA-Ro for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIg-0007DH-Qh for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:38 +0000 Date: Sat, 30 Aug 2014 13:02:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19bb008e393b17ad020b97ab82ad55df4bbe9451 Author: Ian Campbell AuthorDate: Thu Aug 28 21:25:21 2014 +0100 Commit: Ian Campbell CommitDate: Thu Aug 28 21:48:20 2014 +0100 tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} The commit 11dffa2359e8 "xen: pass kernel initrd to qemu" deprecated these in favour of build_info->{kernel,ramdisk,cmdline} but missed a couple of uses. The ARM case breaks guest boot by omitting the command line from the DTB while the xl SXP one is mostly cosmetic. Signed-off-by: Ian Campbell Cc: Chunyan Liu Reviewed-by: Julien Grall --- tools/libxl/libxl_arm.c | 4 ++-- tools/libxl/xl_sxp.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 3d30242..a122e4a 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -191,8 +191,8 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (info->u.pv.cmdline) { - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (info->cmdline) { + res = fdt_property_string(fdt, "bootargs", info->cmdline); if (res) return res; } diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 48eb608..1c98352 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -144,9 +144,9 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) break; case LIBXL_DOMAIN_TYPE_PV: printf("\t\t(linux %d)\n", 0); - printf("\t\t\t(kernel %s)\n", b_info->u.pv.kernel); - printf("\t\t\t(cmdline %s)\n", b_info->u.pv.cmdline); - printf("\t\t\t(ramdisk %s)\n", b_info->u.pv.ramdisk); + printf("\t\t\t(kernel %s)\n", b_info->kernel); + printf("\t\t\t(cmdline %s)\n", b_info->cmdline); + printf("\t\t\t(ramdisk %s)\n", b_info->ramdisk); printf("\t\t\t(e820_host %s)\n", libxl_defbool_to_string(b_info->u.pv.e820_host)); printf("\t\t)\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIj-0003fH-UF; Sat, 30 Aug 2014 13:02:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIj-0003f6-BZ for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:41 +0000 Received: from [85.158.143.35:10985] by server-2.bemta-4.messagelabs.com id C2/71-04525-07BC1045; Sat, 30 Aug 2014 13:02:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1409403759!12590656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10149 invoked from network); 30 Aug 2014 13:02:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIg-0007CA-Ro for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIg-0007DH-Qh for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:38 +0000 Date: Sat, 30 Aug 2014 13:02:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19bb008e393b17ad020b97ab82ad55df4bbe9451 Author: Ian Campbell AuthorDate: Thu Aug 28 21:25:21 2014 +0100 Commit: Ian Campbell CommitDate: Thu Aug 28 21:48:20 2014 +0100 tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} The commit 11dffa2359e8 "xen: pass kernel initrd to qemu" deprecated these in favour of build_info->{kernel,ramdisk,cmdline} but missed a couple of uses. The ARM case breaks guest boot by omitting the command line from the DTB while the xl SXP one is mostly cosmetic. Signed-off-by: Ian Campbell Cc: Chunyan Liu Reviewed-by: Julien Grall --- tools/libxl/libxl_arm.c | 4 ++-- tools/libxl/xl_sxp.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 3d30242..a122e4a 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -191,8 +191,8 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (info->u.pv.cmdline) { - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (info->cmdline) { + res = fdt_property_string(fdt, "bootargs", info->cmdline); if (res) return res; } diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 48eb608..1c98352 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -144,9 +144,9 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) break; case LIBXL_DOMAIN_TYPE_PV: printf("\t\t(linux %d)\n", 0); - printf("\t\t\t(kernel %s)\n", b_info->u.pv.kernel); - printf("\t\t\t(cmdline %s)\n", b_info->u.pv.cmdline); - printf("\t\t\t(ramdisk %s)\n", b_info->u.pv.ramdisk); + printf("\t\t\t(kernel %s)\n", b_info->kernel); + printf("\t\t\t(cmdline %s)\n", b_info->cmdline); + printf("\t\t\t(ramdisk %s)\n", b_info->ramdisk); printf("\t\t\t(e820_host %s)\n", libxl_defbool_to_string(b_info->u.pv.e820_host)); printf("\t\t)\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIv-0003hH-0z; Sat, 30 Aug 2014 13:02:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIt-0003gx-TO for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:52 +0000 Received: from [85.158.137.68:21928] by server-17.bemta-3.messagelabs.com id 18/C7-24995-B7BC1045; Sat, 30 Aug 2014 13:02:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1409403769!11423994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18485 invoked from network); 30 Aug 2014 13:02:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIr-0007CG-22 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIr-0007Dd-0P for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:49 +0000 Date: Sat, 30 Aug 2014 13:02:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EPT: utilize GLA->GPA translation known for certain faults X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecb69533582e51999e5d76bce513be870222908f Author: Jan Beulich AuthorDate: Fri Aug 29 12:22:42 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 29 12:22:42 2014 +0200 EPT: utilize GLA->GPA translation known for certain faults Rather than doing the translation ourselves in __hvmemul_{read,write}() leverage that we know the association for faults other than such having occurred when translating addresses of page tables. There is one intentional but not necessarily obvious (and possibly subtle) adjustment to behavior: __hvmemul_read() no longer blindly bails on instruction fetches matching the MMIO GVA (the callers of handle_mmio_with_translation() now control the behavior via the struct npfec they pass, and it didn't seem right to bail here rather than just falling through to the unaccelerated path) Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/emulate.c | 10 ++++++---- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/arch/x86/hvm/io.c | 9 +++++++-- xen/arch/x86/mm/shadow/multi.c | 12 ++++++++++-- xen/include/asm-x86/hvm/io.h | 3 ++- xen/include/asm-x86/hvm/vcpu.h | 3 ++- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index eac159f..86cf432 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -481,10 +481,11 @@ static int __hvmemul_read( while ( off & (chunk - 1) ) chunk >>= 1; - if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) + if ( ((access_type != hvm_access_insn_fetch + ? vio->mmio_access.read_access + : vio->mmio_access.insn_fetch)) && + (vio->mmio_gva == (addr & PAGE_MASK)) ) { - if ( access_type == hvm_access_insn_fetch ) - return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) { @@ -624,7 +625,8 @@ static int hvmemul_write( while ( off & (chunk - 1) ) chunk >>= 1; - if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) + if ( vio->mmio_access.write_access && + (vio->mmio_gva == (addr & PAGE_MASK)) ) { gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0363714..83e6fae 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2788,7 +2788,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, && is_hvm_vcpu(v) && hvm_mmio_internal(gpa) ) { - if ( !handle_mmio() ) + if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) hvm_inject_hw_exception(TRAP_gp_fault, 0); rc = 1; goto out; @@ -2862,7 +2862,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, if ( unlikely(is_pvh_vcpu(v)) ) goto out; - if ( !handle_mmio() ) + if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) hvm_inject_hw_exception(TRAP_gp_fault, 0); rc = 1; goto out; diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index b2b7b27..9f565d6 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -95,7 +95,7 @@ int handle_mmio(void) if ( vio->io_state == HVMIO_awaiting_completion ) vio->io_state = HVMIO_handle_mmio_awaiting_completion; else - vio->mmio_gva = 0; + vio->mmio_access = (struct npfec){}; switch ( rc ) { @@ -124,9 +124,14 @@ int handle_mmio(void) return 1; } -int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) +int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn, + struct npfec access) { struct hvm_vcpu_io *vio = ¤t->arch.hvm_vcpu.hvm_io; + + vio->mmio_access = access.gla_valid && + access.kind == npfec_kind_with_gla + ? access : (struct npfec){}; vio->mmio_gva = gva & PAGE_MASK; vio->mmio_gpfn = gpfn; return handle_mmio(); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index c6c9d10..225290e 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2824,6 +2824,11 @@ static int sh_page_fault(struct vcpu *v, p2m_type_t p2mt; uint32_t rc; int version; + struct npfec access = { + .read_access = 1, + .gla_valid = 1, + .kind = npfec_kind_with_gla + }; #if SHADOW_OPTIMIZATIONS & SHOPT_FAST_EMULATION int fast_emul = 0; #endif @@ -2834,6 +2839,9 @@ static int sh_page_fault(struct vcpu *v, perfc_incr(shadow_fault); + if ( regs->error_code & PFEC_write_access ) + access.write_access = 1; + #if SHADOW_OPTIMIZATIONS & SHOPT_FAST_EMULATION /* If faulting frame is successfully emulated in last shadow fault * it's highly likely to reach same emulation action for this frame. @@ -2935,7 +2943,7 @@ static int sh_page_fault(struct vcpu *v, SHADOW_PRINTK("fast path mmio %#"PRIpaddr"\n", gpa); reset_early_unshadow(v); trace_shadow_gen(TRC_SHADOW_FAST_MMIO, va); - return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT) + return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0); } else @@ -3424,7 +3432,7 @@ static int sh_page_fault(struct vcpu *v, paging_unlock(d); put_gfn(d, gfn_x(gfn)); trace_shadow_gen(TRC_SHADOW_MMIO, va); - return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT) + return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0); not_a_shadow_fault: diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index c7ac566..886a9d6 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,8 @@ static inline void register_buffered_io_handler( void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); -int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); +int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn, + struct npfec); int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(ioreq_t *p); diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index db37232..01e0665 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -54,8 +54,9 @@ struct hvm_vcpu_io { * HVM emulation: * Virtual address @mmio_gva maps to MMIO physical frame @mmio_gpfn. * The latter is known to be an MMIO frame (not RAM). - * This translation is only valid if @mmio_gva is non-zero. + * This translation is only valid for accesses as per @mmio_access. */ + struct npfec mmio_access; unsigned long mmio_gva; unsigned long mmio_gpfn; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 30 13:02:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 Aug 2014 13:02:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIv-0003hH-0z; Sat, 30 Aug 2014 13:02:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIt-0003gx-TO for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:52 +0000 Received: from [85.158.137.68:21928] by server-17.bemta-3.messagelabs.com id 18/C7-24995-B7BC1045; Sat, 30 Aug 2014 13:02:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1409403769!11423994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18485 invoked from network); 30 Aug 2014 13:02:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Aug 2014 13:02:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XNiIr-0007CG-22 for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XNiIr-0007Dd-0P for xen-changelog@lists.xensource.com; Sat, 30 Aug 2014 13:02:49 +0000 Date: Sat, 30 Aug 2014 13:02:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EPT: utilize GLA->GPA translation known for certain faults X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ecb69533582e51999e5d76bce513be870222908f Author: Jan Beulich AuthorDate: Fri Aug 29 12:22:42 2014 +0200 Commit: Jan Beulich CommitDate: Fri Aug 29 12:22:42 2014 +0200 EPT: utilize GLA->GPA translation known for certain faults Rather than doing the translation ourselves in __hvmemul_{read,write}() leverage that we know the association for faults other than such having occurred when translating addresses of page tables. There is one intentional but not necessarily obvious (and possibly subtle) adjustment to behavior: __hvmemul_read() no longer blindly bails on instruction fetches matching the MMIO GVA (the callers of handle_mmio_with_translation() now control the behavior via the struct npfec they pass, and it didn't seem right to bail here rather than just falling through to the unaccelerated path) Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/emulate.c | 10 ++++++---- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/arch/x86/hvm/io.c | 9 +++++++-- xen/arch/x86/mm/shadow/multi.c | 12 ++++++++++-- xen/include/asm-x86/hvm/io.h | 3 ++- xen/include/asm-x86/hvm/vcpu.h | 3 ++- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index eac159f..86cf432 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -481,10 +481,11 @@ static int __hvmemul_read( while ( off & (chunk - 1) ) chunk >>= 1; - if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) + if ( ((access_type != hvm_access_insn_fetch + ? vio->mmio_access.read_access + : vio->mmio_access.insn_fetch)) && + (vio->mmio_gva == (addr & PAGE_MASK)) ) { - if ( access_type == hvm_access_insn_fetch ) - return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) { @@ -624,7 +625,8 @@ static int hvmemul_write( while ( off & (chunk - 1) ) chunk >>= 1; - if ( unlikely(vio->mmio_gva == (addr & PAGE_MASK)) && vio->mmio_gva ) + if ( vio->mmio_access.write_access && + (vio->mmio_gva == (addr & PAGE_MASK)) ) { gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); while ( (off + chunk) <= PAGE_SIZE ) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0363714..83e6fae 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2788,7 +2788,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, && is_hvm_vcpu(v) && hvm_mmio_internal(gpa) ) { - if ( !handle_mmio() ) + if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) hvm_inject_hw_exception(TRAP_gp_fault, 0); rc = 1; goto out; @@ -2862,7 +2862,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, if ( unlikely(is_pvh_vcpu(v)) ) goto out; - if ( !handle_mmio() ) + if ( !handle_mmio_with_translation(gla, gpa >> PAGE_SHIFT, npfec) ) hvm_inject_hw_exception(TRAP_gp_fault, 0); rc = 1; goto out; diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index b2b7b27..9f565d6 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -95,7 +95,7 @@ int handle_mmio(void) if ( vio->io_state == HVMIO_awaiting_completion ) vio->io_state = HVMIO_handle_mmio_awaiting_completion; else - vio->mmio_gva = 0; + vio->mmio_access = (struct npfec){}; switch ( rc ) { @@ -124,9 +124,14 @@ int handle_mmio(void) return 1; } -int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn) +int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn, + struct npfec access) { struct hvm_vcpu_io *vio = ¤t->arch.hvm_vcpu.hvm_io; + + vio->mmio_access = access.gla_valid && + access.kind == npfec_kind_with_gla + ? access : (struct npfec){}; vio->mmio_gva = gva & PAGE_MASK; vio->mmio_gpfn = gpfn; return handle_mmio(); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index c6c9d10..225290e 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2824,6 +2824,11 @@ static int sh_page_fault(struct vcpu *v, p2m_type_t p2mt; uint32_t rc; int version; + struct npfec access = { + .read_access = 1, + .gla_valid = 1, + .kind = npfec_kind_with_gla + }; #if SHADOW_OPTIMIZATIONS & SHOPT_FAST_EMULATION int fast_emul = 0; #endif @@ -2834,6 +2839,9 @@ static int sh_page_fault(struct vcpu *v, perfc_incr(shadow_fault); + if ( regs->error_code & PFEC_write_access ) + access.write_access = 1; + #if SHADOW_OPTIMIZATIONS & SHOPT_FAST_EMULATION /* If faulting frame is successfully emulated in last shadow fault * it's highly likely to reach same emulation action for this frame. @@ -2935,7 +2943,7 @@ static int sh_page_fault(struct vcpu *v, SHADOW_PRINTK("fast path mmio %#"PRIpaddr"\n", gpa); reset_early_unshadow(v); trace_shadow_gen(TRC_SHADOW_FAST_MMIO, va); - return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT) + return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0); } else @@ -3424,7 +3432,7 @@ static int sh_page_fault(struct vcpu *v, paging_unlock(d); put_gfn(d, gfn_x(gfn)); trace_shadow_gen(TRC_SHADOW_MMIO, va); - return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT) + return (handle_mmio_with_translation(va, gpa >> PAGE_SHIFT, access) ? EXCRET_fault_fixed : 0); not_a_shadow_fault: diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h index c7ac566..886a9d6 100644 --- a/xen/include/asm-x86/hvm/io.h +++ b/xen/include/asm-x86/hvm/io.h @@ -119,7 +119,8 @@ static inline void register_buffered_io_handler( void send_timeoffset_req(unsigned long timeoff); void send_invalidate_req(void); int handle_mmio(void); -int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn); +int handle_mmio_with_translation(unsigned long gva, unsigned long gpfn, + struct npfec); int handle_pio(uint16_t port, unsigned int size, int dir); void hvm_interrupt_post(struct vcpu *v, int vector, int type); void hvm_io_assist(ioreq_t *p); diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index db37232..01e0665 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -54,8 +54,9 @@ struct hvm_vcpu_io { * HVM emulation: * Virtual address @mmio_gva maps to MMIO physical frame @mmio_gpfn. * The latter is known to be an MMIO frame (not RAM). - * This translation is only valid if @mmio_gva is non-zero. + * This translation is only valid for accesses as per @mmio_access. */ + struct npfec mmio_access; unsigned long mmio_gva; unsigned long mmio_gpfn; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog