From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:44:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542733.846931 (Exim 4.92) (envelope-from ) id 1q4q5U-0003Fb-0V; Thu, 01 Jun 2023 21:44:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542733.846931; Thu, 01 Jun 2023 21:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5T-0003FT-Ts; Thu, 01 Jun 2023 21:44:03 +0000 Received: by outflank-mailman (input) for mailman id 542733; Thu, 01 Jun 2023 21:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5S-0003FL-Ed for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5S-0005Fn-98 for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q5S-0003YK-7d for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eh7wdG3NhQyG6jNrEECpWIUejud41uaqcmGwvgyE/nQ=; b=hkNgfp963HG6mmy8ObDN7jzY1G BkOHbeEQb4nPdUArxVxcbOm9kCwdanMIW7sM9FersfEq6Qm4FuHqAUxWeChB7ZsPnsiH4PSx2fqGu HLXv9zew3pvXgbn7K9BgUKeMaLwjYD6FP22LYRlYhRRPXYjx3XouHN1BDAq0DlaezROA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add VM space layout Message-Id: Date: Thu, 01 Jun 2023 21:44:02 +0000 commit efadb18dd58abaa0c6102e04f1c25ac94c273853 Author: Oleksii Kurochko AuthorDate: Wed May 31 11:55:46 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 11:55:46 2023 +0200 xen/riscv: add VM space layout Also it was added explanation about ignoring of top VA bits Signed-off-by: Oleksii Kurochko Acked-by: Bobby Eshleman --- xen/arch/riscv/include/asm/config.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/xen/arch/riscv/include/asm/config.h b/xen/arch/riscv/include/asm/config.h index 763a922a04..9900d29dab 100644 --- a/xen/arch/riscv/include/asm/config.h +++ b/xen/arch/riscv/include/asm/config.h @@ -4,6 +4,42 @@ #include #include +/* + * RISC-V64 Layout: + * +#if RV_STAGE1_MODE == SATP_MODE_SV39 + * + * From the riscv-privileged doc: + * When mapping between narrower and wider addresses, + * RISC-V zero-extends a narrower physical address to a wider size. + * The mapping between 64-bit virtual addresses and the 39-bit usable + * address space of Sv39 is not based on zero-extension but instead + * follows an entrenched convention that allows an OS to use one or + * a few of the most-significant bits of a full-size (64-bit) virtual + * address to quickly distinguish user and supervisor address regions. + * + * It means that: + * top VA bits are simply ignored for the purpose of translating to PA. + * + * ============================================================================ + * Start addr | End addr | Size | Slot |area description + * ============================================================================ + * FFFFFFFFC0800000 | FFFFFFFFFFFFFFFF |1016 MB | L2 511 | Unused + * FFFFFFFFC0600000 | FFFFFFFFC0800000 | 2 MB | L2 511 | Fixmap + * FFFFFFFFC0200000 | FFFFFFFFC0600000 | 4 MB | L2 511 | FDT + * FFFFFFFFC0000000 | FFFFFFFFC0200000 | 2 MB | L2 511 | Xen + * ... | 1 GB | L2 510 | Unused + * 0000003200000000 | 0000007F80000000 | 309 GB | L2 200-509 | Direct map + * ... | 1 GB | L2 199 | Unused + * 0000003100000000 | 00000031C0000000 | 3 GB | L2 196-198 | Frametable + * ... | 1 GB | L2 195 | Unused + * 0000003080000000 | 00000030C0000000 | 1 GB | L2 194 | VMAP + * ... | 194 GB | L2 0 - 193 | Unused + * ============================================================================ + * +#endif + */ + #if defined(CONFIG_RISCV_64) # define LONG_BYTEORDER 3 # define ELFSIZE 64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:44:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:44:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542734.846937 (Exim 4.92) (envelope-from ) id 1q4q5e-0003HG-2K; Thu, 01 Jun 2023 21:44:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542734.846937; Thu, 01 Jun 2023 21:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5d-0003H7-VU; Thu, 01 Jun 2023 21:44:13 +0000 Received: by outflank-mailman (input) for mailman id 542734; Thu, 01 Jun 2023 21:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5c-0003Go-DP for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5c-0005Fr-CV for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q5c-0003ZE-BO for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5nYMOY70DP3Q1DysxWoJOdsvLDJ85ywsdhp7m4lM4Pc=; b=eA2LUJSPbCypVYdIwtNi17+sRd +003mv4RK3p6G6lZQVcQrsy002rPQCjLDuuevTmO3Gjcry2u7+Ikbp8NbsOFB2kRCim0llDdpndv/ wezoHPZfzDW+aXJvNDeowng+fm9dEUDvdAR5VmSFFy5AQCbvy2IZiQr4k1UFu/TTNFhc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce setup_initial_pages Message-Id: Date: Thu, 01 Jun 2023 21:44:12 +0000 commit e66003e7be1996c9dd8daca54ba34ad5bb58d668 Author: Oleksii Kurochko AuthorDate: Wed May 31 11:55:58 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 11:58:31 2023 +0200 xen/riscv: introduce setup_initial_pages The idea was taken from xvisor but the following changes were done: * Use only a minimal part of the code enough to enable MMU * rename {_}setup_initial_pagetables functions * add an argument for setup_initial_mapping to have an opportunity to make set PTE flags. * update setup_initial_pagetables function to map sections with correct PTE flags. * Rewrite enable_mmu() to C. * map linker addresses range to load addresses range without 1:1 mapping. It will be 1:1 only in case when load_start_addr is equal to linker_start_addr. * add safety checks such as: * Xen size is less than page size * linker addresses range doesn't overlap load addresses range * Rework macros {THIRD,SECOND,FIRST,ZEROETH}_{SHIFT,MASK} * change PTE_LEAF_DEFAULT to RW instead of RWX. * Remove phys_offset as it is not used now * Remove alignment of {map, pa}_start &= XEN_PT_LEVEL_MAP_MASK(0); in setup_inital_mapping() as they should be already aligned. Make a check that {map_pa}_start are aligned. * Remove clear_pagetables() as initial pagetables will be zeroed during bss initialization * Remove __attribute__((section(".entry")) for setup_initial_pagetables() as there is no such section in xen.lds.S * Update the argument of pte_is_valid() to "const pte_t *p" * Add check that Xen's load address is aligned at 4k boundary * Refactor setup_initial_pagetables() so it is mapping linker address range to load address range. After setup needed permissions for specific section ( such as .text, .rodata, etc ) otherwise RW permission will be set by default. * Add function to check that requested SATP_MODE is supported Origin: git@github.com:xvisor/xvisor.git 9be2fdd7 Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Bobby Eshleman --- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/config.h | 14 +- xen/arch/riscv/include/asm/current.h | 11 ++ xen/arch/riscv/include/asm/mm.h | 14 ++ xen/arch/riscv/include/asm/page-bits.h | 10 ++ xen/arch/riscv/include/asm/page.h | 61 ++++++++ xen/arch/riscv/include/asm/processor.h | 5 + xen/arch/riscv/mm.c | 275 +++++++++++++++++++++++++++++++++ xen/arch/riscv/setup.c | 11 ++ xen/arch/riscv/xen.lds.S | 2 + 10 files changed, 403 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index 1156d71b38..2fefe14e7c 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += entry.o +obj-y += mm.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o diff --git a/xen/arch/riscv/include/asm/config.h b/xen/arch/riscv/include/asm/config.h index 9900d29dab..38862df0b8 100644 --- a/xen/arch/riscv/include/asm/config.h +++ b/xen/arch/riscv/include/asm/config.h @@ -75,12 +75,24 @@ name: #endif -#define XEN_VIRT_START _AT(UL, 0x80200000) +#ifdef CONFIG_RISCV_64 +#define XEN_VIRT_START 0xFFFFFFFFC0000000 /* (_AC(-1, UL) + 1 - GB(1)) */ +#else +#error "RV32 isn't supported" +#endif #define SMP_CACHE_BYTES (1 << 6) #define STACK_SIZE PAGE_SIZE +#ifdef CONFIG_RISCV_64 +#define CONFIG_PAGING_LEVELS 3 +#define RV_STAGE1_MODE SATP_MODE_SV39 +#else +#define CONFIG_PAGING_LEVELS 2 +#define RV_STAGE1_MODE SATP_MODE_SV32 +#endif + #endif /* __RISCV_CONFIG_H__ */ /* * Local variables: diff --git a/xen/arch/riscv/include/asm/current.h b/xen/arch/riscv/include/asm/current.h new file mode 100644 index 0000000000..d87e6717e0 --- /dev/null +++ b/xen/arch/riscv/include/asm/current.h @@ -0,0 +1,11 @@ +#ifndef __ASM_CURRENT_H +#define __ASM_CURRENT_H + +#define switch_stack_and_jump(stack, fn) do { \ + asm volatile ( \ + "mv sp, %0\n" \ + "j " #fn :: "r" (stack), "X" (fn) : "memory" ); \ + unreachable(); \ +} while ( false ) + +#endif /* __ASM_CURRENT_H */ diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/mm.h new file mode 100644 index 0000000000..64293eacee --- /dev/null +++ b/xen/arch/riscv/include/asm/mm.h @@ -0,0 +1,14 @@ +#ifndef _ASM_RISCV_MM_H +#define _ASM_RISCV_MM_H + +#include + +#define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) +#define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) + +void setup_initial_pagetables(void); + +void enable_mmu(void); +void cont_after_mmu_is_enabled(void); + +#endif /* _ASM_RISCV_MM_H */ diff --git a/xen/arch/riscv/include/asm/page-bits.h b/xen/arch/riscv/include/asm/page-bits.h index 1801820294..4a3e33589a 100644 --- a/xen/arch/riscv/include/asm/page-bits.h +++ b/xen/arch/riscv/include/asm/page-bits.h @@ -4,4 +4,14 @@ #define PAGE_SHIFT 12 /* 4 KiB Pages */ #define PADDR_BITS 56 /* 44-bit PPN */ +#ifdef CONFIG_RISCV_64 +#define PAGETABLE_ORDER (9) +#else /* CONFIG_RISCV_32 */ +#define PAGETABLE_ORDER (10) +#endif + +#define PAGETABLE_ENTRIES (1 << PAGETABLE_ORDER) + +#define PTE_PPN_SHIFT 10 + #endif /* __RISCV_PAGE_BITS_H__ */ diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h new file mode 100644 index 0000000000..a7e2eee964 --- /dev/null +++ b/xen/arch/riscv/include/asm/page.h @@ -0,0 +1,61 @@ +#ifndef _ASM_RISCV_PAGE_H +#define _ASM_RISCV_PAGE_H + +#include +#include + +#include +#include + +#define VPN_MASK (PAGETABLE_ENTRIES - 1UL) + +#define XEN_PT_LEVEL_ORDER(lvl) ((lvl) * PAGETABLE_ORDER) +#define XEN_PT_LEVEL_SHIFT(lvl) (XEN_PT_LEVEL_ORDER(lvl) + PAGE_SHIFT) +#define XEN_PT_LEVEL_SIZE(lvl) (_AT(paddr_t, 1) << XEN_PT_LEVEL_SHIFT(lvl)) +#define XEN_PT_LEVEL_MAP_MASK(lvl) (~(XEN_PT_LEVEL_SIZE(lvl) - 1)) +#define XEN_PT_LEVEL_MASK(lvl) (VPN_MASK << XEN_PT_LEVEL_SHIFT(lvl)) + +#define PTE_VALID BIT(0, UL) +#define PTE_READABLE BIT(1, UL) +#define PTE_WRITABLE BIT(2, UL) +#define PTE_EXECUTABLE BIT(3, UL) +#define PTE_USER BIT(4, UL) +#define PTE_GLOBAL BIT(5, UL) +#define PTE_ACCESSED BIT(6, UL) +#define PTE_DIRTY BIT(7, UL) +#define PTE_RSW (BIT(8, UL) | BIT(9, UL)) + +#define PTE_LEAF_DEFAULT (PTE_VALID | PTE_READABLE | PTE_WRITABLE) +#define PTE_TABLE (PTE_VALID) + +/* Calculate the offsets into the pagetables for a given VA */ +#define pt_linear_offset(lvl, va) ((va) >> XEN_PT_LEVEL_SHIFT(lvl)) + +#define pt_index(lvl, va) (pt_linear_offset((lvl), (va)) & VPN_MASK) + +/* Page Table entry */ +typedef struct { +#ifdef CONFIG_RISCV_64 + uint64_t pte; +#else + uint32_t pte; +#endif +} pte_t; + +static inline pte_t paddr_to_pte(paddr_t paddr, + unsigned int permissions) +{ + return (pte_t) { .pte = (paddr_to_pfn(paddr) << PTE_PPN_SHIFT) | permissions }; +} + +static inline paddr_t pte_to_paddr(pte_t pte) +{ + return pfn_to_paddr(pte.pte >> PTE_PPN_SHIFT); +} + +static inline bool pte_is_valid(pte_t p) +{ + return p.pte & PTE_VALID; +} + +#endif /* _ASM_RISCV_PAGE_H */ diff --git a/xen/arch/riscv/include/asm/processor.h b/xen/arch/riscv/include/asm/processor.h index a71448e02e..6db681d805 100644 --- a/xen/arch/riscv/include/asm/processor.h +++ b/xen/arch/riscv/include/asm/processor.h @@ -69,6 +69,11 @@ static inline void die(void) wfi(); } +static inline void sfence_vma(void) +{ + asm volatile ( "sfence.vma" ::: "memory" ); +} + #endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_PROCESSOR_H */ diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c new file mode 100644 index 0000000000..8ceed445cf --- /dev/null +++ b/xen/arch/riscv/mm.c @@ -0,0 +1,275 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +struct mmu_desc { + unsigned int num_levels; + unsigned int pgtbl_count; + pte_t *next_pgtbl; + pte_t *pgtbl_base; +}; + +extern unsigned char cpu0_boot_stack[STACK_SIZE]; + +#define PHYS_OFFSET ((unsigned long)_start - XEN_VIRT_START) +#define LOAD_TO_LINK(addr) ((addr) - PHYS_OFFSET) +#define LINK_TO_LOAD(addr) ((addr) + PHYS_OFFSET) + +/* + * It is expected that Xen won't be more then 2 MB. + * The check in xen.lds.S guarantees that. + * At least 3 page tables (in case of Sv39 ) are needed to cover 2 MB. + * One for each page level table with PAGE_SIZE = 4 Kb. + * + * One L0 page table can cover 2 MB(512 entries of one page table * PAGE_SIZE). + * + * It might be needed one more page table in case when Xen load address + * isn't 2 MB aligned. + */ +#define PGTBL_INITIAL_COUNT ((CONFIG_PAGING_LEVELS - 1) + 1) + +pte_t __section(".bss.page_aligned") __aligned(PAGE_SIZE) +stage1_pgtbl_root[PAGETABLE_ENTRIES]; + +pte_t __section(".bss.page_aligned") __aligned(PAGE_SIZE) +stage1_pgtbl_nonroot[PGTBL_INITIAL_COUNT * PAGETABLE_ENTRIES]; + +#define HANDLE_PGTBL(curr_lvl_num) \ + index = pt_index(curr_lvl_num, page_addr); \ + if ( pte_is_valid(pgtbl[index]) ) \ + { \ + /* Find L{ 0-3 } table */ \ + pgtbl = (pte_t *)pte_to_paddr(pgtbl[index]); \ + } \ + else \ + { \ + /* Allocate new L{0-3} page table */ \ + if ( mmu_desc->pgtbl_count == PGTBL_INITIAL_COUNT ) \ + { \ + early_printk("(XEN) No initial table available\n"); \ + /* panic(), BUG() or ASSERT() aren't ready now. */ \ + die(); \ + } \ + mmu_desc->pgtbl_count++; \ + pgtbl[index] = paddr_to_pte((unsigned long)mmu_desc->next_pgtbl, \ + PTE_VALID); \ + pgtbl = mmu_desc->next_pgtbl; \ + mmu_desc->next_pgtbl += PAGETABLE_ENTRIES; \ + } + +static void __init setup_initial_mapping(struct mmu_desc *mmu_desc, + unsigned long map_start, + unsigned long map_end, + unsigned long pa_start) +{ + unsigned int index; + pte_t *pgtbl; + unsigned long page_addr; + + if ( (unsigned long)_start % XEN_PT_LEVEL_SIZE(0) ) + { + early_printk("(XEN) Xen should be loaded at 4k boundary\n"); + die(); + } + + if ( (map_start & ~XEN_PT_LEVEL_MAP_MASK(0)) || + (pa_start & ~XEN_PT_LEVEL_MAP_MASK(0)) ) + { + early_printk("(XEN) map and pa start addresses should be aligned\n"); + /* panic(), BUG() or ASSERT() aren't ready now. */ + die(); + } + + for ( page_addr = map_start; + page_addr < map_end; + page_addr += XEN_PT_LEVEL_SIZE(0) ) + { + pgtbl = mmu_desc->pgtbl_base; + + switch ( mmu_desc->num_levels ) + { + case 4: /* Level 3 */ + HANDLE_PGTBL(3); + case 3: /* Level 2 */ + HANDLE_PGTBL(2); + case 2: /* Level 1 */ + HANDLE_PGTBL(1); + case 1: /* Level 0 */ + { + unsigned long paddr = (page_addr - map_start) + pa_start; + unsigned int permissions = PTE_LEAF_DEFAULT; + pte_t pte_to_be_written; + + index = pt_index(0, page_addr); + + if ( is_kernel_text(LINK_TO_LOAD(page_addr)) || + is_kernel_inittext(LINK_TO_LOAD(page_addr)) ) + permissions = + PTE_EXECUTABLE | PTE_READABLE | PTE_VALID; + + if ( is_kernel_rodata(LINK_TO_LOAD(page_addr)) ) + permissions = PTE_READABLE | PTE_VALID; + + pte_to_be_written = paddr_to_pte(paddr, permissions); + + if ( !pte_is_valid(pgtbl[index]) ) + pgtbl[index] = pte_to_be_written; + else + { + if ( (pgtbl[index].pte ^ pte_to_be_written.pte) & + ~(PTE_DIRTY | PTE_ACCESSED) ) + { + early_printk("PTE overridden has occurred\n"); + /* panic(), aren't ready now. */ + die(); + } + } + } + } + } +} +#undef HANDLE_PGTBL + +static bool __init check_pgtbl_mode_support(struct mmu_desc *mmu_desc, + unsigned long load_start) +{ + bool is_mode_supported = false; + unsigned int index; + unsigned int page_table_level = (mmu_desc->num_levels - 1); + unsigned level_map_mask = XEN_PT_LEVEL_MAP_MASK(page_table_level); + + unsigned long aligned_load_start = load_start & level_map_mask; + unsigned long aligned_page_size = XEN_PT_LEVEL_SIZE(page_table_level); + unsigned long xen_size = (unsigned long)(_end - start); + + if ( (load_start + xen_size) > (aligned_load_start + aligned_page_size) ) + { + early_printk("please place Xen to be in range of PAGE_SIZE " + "where PAGE_SIZE is XEN_PT_LEVEL_SIZE( {L3 | L2 | L1} ) " + "depending on expected SATP_MODE \n" + "XEN_PT_LEVEL_SIZE is defined in \n"); + die(); + } + + index = pt_index(page_table_level, aligned_load_start); + stage1_pgtbl_root[index] = paddr_to_pte(aligned_load_start, + PTE_LEAF_DEFAULT | PTE_EXECUTABLE); + + sfence_vma(); + csr_write(CSR_SATP, + PFN_DOWN((unsigned long)stage1_pgtbl_root) | + RV_STAGE1_MODE << SATP_MODE_SHIFT); + + if ( (csr_read(CSR_SATP) >> SATP_MODE_SHIFT) == RV_STAGE1_MODE ) + is_mode_supported = true; + + csr_write(CSR_SATP, 0); + + sfence_vma(); + + /* Clean MMU root page table */ + stage1_pgtbl_root[index] = paddr_to_pte(0x0, 0x0); + + return is_mode_supported; +} + +/* + * setup_initial_pagetables: + * + * Build the page tables for Xen that map the following: + * 1. Calculate page table's level numbers. + * 2. Init mmu description structure. + * 3. Check that linker addresses range doesn't overlap + * with load addresses range + * 4. Map all linker addresses and load addresses ( it shouldn't + * be 1:1 mapped and will be 1:1 mapped only in case if + * linker address is equal to load address ) with + * RW permissions by default. + * 5. Setup proper PTE permissions for each section. + */ +void __init setup_initial_pagetables(void) +{ + struct mmu_desc mmu_desc = { CONFIG_PAGING_LEVELS, 0, NULL, NULL }; + + /* + * Access to _start, _end is always PC-relative thereby when access + * them we will get load adresses of start and end of Xen. + * To get linker addresses LOAD_TO_LINK() is required to use. + */ + unsigned long load_start = (unsigned long)_start; + unsigned long load_end = (unsigned long)_end; + unsigned long linker_start = LOAD_TO_LINK(load_start); + unsigned long linker_end = LOAD_TO_LINK(load_end); + + if ( (linker_start != load_start) && + (linker_start <= load_end) && (load_start <= linker_end) ) + { + early_printk("(XEN) linker and load address ranges overlap\n"); + die(); + } + + if ( !check_pgtbl_mode_support(&mmu_desc, load_start) ) + { + early_printk("requested MMU mode isn't supported by CPU\n" + "Please choose different in \n"); + die(); + } + + mmu_desc.pgtbl_base = stage1_pgtbl_root; + mmu_desc.next_pgtbl = stage1_pgtbl_nonroot; + + setup_initial_mapping(&mmu_desc, + linker_start, + linker_end, + load_start); +} + +void __init noreturn noinline enable_mmu() +{ + /* + * Calculate a linker time address of the mmu_is_enabled + * label and update CSR_STVEC with it. + * MMU is configured in a way where linker addresses are mapped + * on load addresses so in a case when linker addresses are not equal + * to load addresses, after MMU is enabled, it will cause + * an exception and jump to linker time addresses. + * Otherwise if load addresses are equal to linker addresses the code + * after mmu_is_enabled label will be executed without exception. + */ + csr_write(CSR_STVEC, LOAD_TO_LINK((unsigned long)&&mmu_is_enabled)); + + /* Ensure page table writes precede loading the SATP */ + sfence_vma(); + + /* Enable the MMU and load the new pagetable for Xen */ + csr_write(CSR_SATP, + PFN_DOWN((unsigned long)stage1_pgtbl_root) | + RV_STAGE1_MODE << SATP_MODE_SHIFT); + + asm volatile ( ".p2align 2" ); + mmu_is_enabled: + /* + * Stack should be re-inited as: + * 1. Right now an address of the stack is relative to load time + * addresses what will cause an issue in case of load start address + * isn't equal to linker start address. + * 2. Addresses in stack are all load time relative which can be an + * issue in case when load start address isn't equal to linker + * start address. + * + * We can't return to the caller because the stack was reseted + * and it may have stash some variable on the stack. + * Jump to a brand new function as the stack was reseted + */ + + switch_stack_and_jump((unsigned long)cpu0_boot_stack + STACK_SIZE, + cont_after_mmu_is_enabled); +} diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 3786f337e0..315804aa87 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -2,6 +2,7 @@ #include #include +#include /* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE] @@ -26,3 +27,13 @@ void __init noreturn start_xen(unsigned long bootcpu_id, unreachable(); } + +void __init noreturn cont_after_mmu_is_enabled(void) +{ + early_printk("All set up\n"); + + for ( ;; ) + asm volatile ("wfi"); + + unreachable(); +} diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S index 31e0d3576c..3e80d6632f 100644 --- a/xen/arch/riscv/xen.lds.S +++ b/xen/arch/riscv/xen.lds.S @@ -172,3 +172,5 @@ ASSERT(IS_ALIGNED(__bss_end, POINTER_ALIGN), "__bss_end is misaligned") ASSERT(!SIZEOF(.got), ".got non-empty") ASSERT(!SIZEOF(.got.plt), ".got.plt non-empty") + +ASSERT(_end - _start <= MB(2), "Xen too large for early-boot assumptions") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:44:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:44:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542735.846940 (Exim 4.92) (envelope-from ) id 1q4q5o-0003JW-3y; Thu, 01 Jun 2023 21:44:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542735.846940; Thu, 01 Jun 2023 21:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5o-0003JN-0j; Thu, 01 Jun 2023 21:44:24 +0000 Received: by outflank-mailman (input) for mailman id 542735; Thu, 01 Jun 2023 21:44:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5m-0003JD-Gx for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5m-0005GI-G9 for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q5m-0003Zh-Ea for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=016RMYKTxd2eB90CEUMb+7ZokyAbYfN9/7Z32atHlV0=; b=vPRB0QUPeM/pE+2qa6Zxic4UE7 e/Fs5/ors84Vw6M5OnoXSNhpsEyQBoiqbItDDFGR69CviNIyigmXjORpnSObobdDNjkHOY/YjK3PP CC4/4RgIGfFmUVFLNHWBULkPOwLwlTeEFHCURLsX6/gVXsuPUoPgivuKdivjjHR9Vrvs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: align __bss_start Message-Id: Date: Thu, 01 Jun 2023 21:44:22 +0000 commit ec337ce2e972b70619f5a076b20910a2ff4fea7a Author: Oleksii Kurochko AuthorDate: Wed May 31 11:59:53 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 11:59:53 2023 +0200 xen/riscv: align __bss_start bss clear cycle requires proper alignment of __bss_start. ALIGN(PAGE_SIZE) before "*(.bss.page_aligned)" in xen.lds.S was removed as any contribution to "*(.bss.page_aligned)" have to specify proper aligntment themselves. Fixes: cfa0409f7cbb ("xen/riscv: initialize .bss section") Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich Acked-by: Bobby Eshleman --- xen/arch/riscv/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S index 3e80d6632f..878130f313 100644 --- a/xen/arch/riscv/xen.lds.S +++ b/xen/arch/riscv/xen.lds.S @@ -137,9 +137,9 @@ SECTIONS __init_end = .; .bss : { /* BSS */ + . = ALIGN(POINTER_ALIGN); __bss_start = .; *(.bss.stack_aligned) - . = ALIGN(PAGE_SIZE); *(.bss.page_aligned) . = ALIGN(PAGE_SIZE); __per_cpu_start = .; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:44:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:44:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542736.846943 (Exim 4.92) (envelope-from ) id 1q4q5x-0003NB-6z; Thu, 01 Jun 2023 21:44:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542736.846943; Thu, 01 Jun 2023 21:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5x-0003N3-4J; Thu, 01 Jun 2023 21:44:33 +0000 Received: by outflank-mailman (input) for mailman id 542736; Thu, 01 Jun 2023 21:44:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5w-0003Mv-KR for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q5w-0005GP-Jc for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q5w-0003a9-IA for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JpKj/Dj/xVfiN2qIvKak+2T9nfuYb75LCDZ/v4ybz2E=; b=pESF2MGCoz5lG5E1Ymc/7MhThj DSDOAEjWT2zU7IAzM1OnhiW7YLS7iQDUa3MZAvVDXMpp2+6yofWU+919wEuFnXIc8a2HiQHHjbZog 38rphkhFCIRQSw4nU8Vdob2Z66fkUT7n01SuLeguBUeWkG2JmHXSd01VkYAJwpF8DmiE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: setup initial pagetables Message-Id: Date: Thu, 01 Jun 2023 21:44:32 +0000 commit 0d74fc2b2f85586ceb5672aedc79c666e529381d Author: Oleksii Kurochko AuthorDate: Wed May 31 12:00:05 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 12:00:05 2023 +0200 xen/riscv: setup initial pagetables The patch does two thing: 1. Setup initial pagetables. 2. Enable MMU which end up with code in cont_after_mmu_is_enabled() Signed-off-by: Oleksii Kurochko Acked-by: Bobby Eshleman --- xen/arch/riscv/setup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 315804aa87..cf5dc5824e 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -21,7 +21,10 @@ void __init noreturn start_xen(unsigned long bootcpu_id, { early_printk("Hello from C env\n"); - early_printk("All set up\n"); + setup_initial_pagetables(); + + enable_mmu(); + for ( ;; ) asm volatile ("wfi"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:44:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:44:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542737.846947 (Exim 4.92) (envelope-from ) id 1q4q67-0003QB-8W; Thu, 01 Jun 2023 21:44:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542737.846947; Thu, 01 Jun 2023 21:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q67-0003Q3-5q; Thu, 01 Jun 2023 21:44:43 +0000 Received: by outflank-mailman (input) for mailman id 542737; Thu, 01 Jun 2023 21:44:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q66-0003Pt-NU for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q66-0005Gd-Mm for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q66-0003an-Lm for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=thd0+RcXVDKmw9fwwWz9jTIe4U7791KTzvYPmI1sdVY=; b=vF7jJxrqKeGgdZmJXhTvh3e+Zf jGeaM0H8ROBzkFNxgxdwTiOjavKHmbglCzQruq9njcrdZNdcrBtKzVBNka3J8yGW2FdZ9Nqo65s/V uoLwDLsZ6oRw43EYjgAIzR8QcdLKAMSafaMbl1AnsvxOnGeIjraxK+5pK1r7ww2pb8fk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: remove dummy_bss variable Message-Id: Date: Thu, 01 Jun 2023 21:44:42 +0000 commit 0f80a46ffa6bfd5d111fc2e64ee5983513627e4d Author: Oleksii Kurochko AuthorDate: Wed May 31 12:00:13 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 12:00:13 2023 +0200 xen/riscv: remove dummy_bss variable After introduction of initial pagetables there is no any sense in dummy_bss variable as bss section will not be empty anymore. Signed-off-by: Oleksii Kurochko Acked-by: Bobby Eshleman --- xen/arch/riscv/setup.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index cf5dc5824e..845d18d86f 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -8,14 +8,6 @@ unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __aligned(STACK_SIZE); -/* - * To be sure that .bss isn't zero. It will simplify code of - * .bss initialization. - * TODO: - * To be deleted when the first real .bss user appears - */ -int dummy_bss __attribute__((unused)); - void __init noreturn start_xen(unsigned long bootcpu_id, paddr_t dtb_addr) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:44:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:44:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542738.846953 (Exim 4.92) (envelope-from ) id 1q4q6H-0003Te-BF; Thu, 01 Jun 2023 21:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542738.846953; Thu, 01 Jun 2023 21:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6H-0003TW-7T; Thu, 01 Jun 2023 21:44:53 +0000 Received: by outflank-mailman (input) for mailman id 542738; Thu, 01 Jun 2023 21:44:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6G-0003TO-Qa for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6G-0005Gp-Pm for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q6G-0003bC-Ou for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DOvuYTdXOvFetX9y8CaAM73mvuhbsnr8/fU6YZeoSkM=; b=QeLf91k945PlpL/SYMNqL7ziiK c6l+fWQLkv1cEzxz9WsIalyoKWSHHM/+UcrV8LrBt6e0rds8KM0oICof5JkTRrEkDejl6wdBEW6Xq J+youJFjXjTkCp86LjZ4YbtnpAGSNFY56oAfhjG1MpYBrpgBTTEl9u+vQKcKptXyVWzE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/include/public: fix 9pfs xenstore path description Message-Id: Date: Thu, 01 Jun 2023 21:44:52 +0000 commit 445fdc641e304ff41a544f8f5926a13b604c08ad Author: Juergen Gross AuthorDate: Wed May 31 12:00:40 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 12:00:40 2023 +0200 xen/include/public: fix 9pfs xenstore path description In xen/include/public/io/9pfs.h the name of the Xenstore backend node "security-model" should be "security_model", as this is how the Xen tools are creating it and qemu is reading it. Fixes: ad58142e73a9 ("xen/public: move xenstore related doc into 9pfs.h") Fixes: cf1d2d22fdfd ("docs/misc: Xen transport for 9pfs") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk Acked-by: Stefano Stabellini --- xen/include/public/io/9pfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/public/io/9pfs.h b/xen/include/public/io/9pfs.h index a0ce82d0a8..9ad2773082 100644 --- a/xen/include/public/io/9pfs.h +++ b/xen/include/public/io/9pfs.h @@ -64,7 +64,7 @@ * * Host filesystem path to share. * - * security-model + * security_model * Values: "none" * * *none*: files are stored using the same credentials as they are -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:45:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:45:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542739.846956 (Exim 4.92) (envelope-from ) id 1q4q6S-0003Wt-Cv; Thu, 01 Jun 2023 21:45:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542739.846956; Thu, 01 Jun 2023 21:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6S-0003Wl-9C; Thu, 01 Jun 2023 21:45:04 +0000 Received: by outflank-mailman (input) for mailman id 542739; Thu, 01 Jun 2023 21:45:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6Q-0003Wc-Uq for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6Q-0005HQ-Tx for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q6Q-0003c4-Rz for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tWurMYHqxQCKh/0XhCwUaXJPdaYNqJ2l1TDh71pAlS4=; b=XV73ZA5w5N9cZ9F4LSDrW9mkD6 E3DlI908FVQM489n2PbfEjaePoJsVdfoT8BZLpjR/QxPyCTb+ahIGRuTyxPuXZO0DC5jhsVqZUltF geozdlrf4wDC92mf2FwjNuf5/9Tws3UImcXUG7YAFh0sEzHEeUAuNrGjYXGyPJi583PQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: account for hidden devices Message-Id: Date: Thu, 01 Jun 2023 21:45:02 +0000 commit 465217b0f872602b4084a1b0fa2ef75377cb3589 Author: Jan Beulich AuthorDate: Wed May 31 12:01:11 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 12:01:11 2023 +0200 vPCI: account for hidden devices Hidden devices (e.g. an add-in PCI serial card used for Xen's serial console) are associated with DomXEN, not Dom0. This means that while looking for overlapping BARs such devices cannot be found on Dom0's list of devices; DomXEN's list also needs to be scanned. Suppress vPCI init altogether for r/o devices (which constitute a subset of hidden ones). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Tested-by: Stefano Stabellini --- xen/drivers/vpci/header.c | 94 ++++++++++++++++++++++++++--------------------- xen/drivers/vpci/vpci.c | 30 ++++++++++----- 2 files changed, 74 insertions(+), 50 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 766fd98b21..b41556d007 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -218,6 +218,7 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) struct vpci_header *header = &pdev->vpci->header; struct rangeset *mem = rangeset_new(NULL, NULL, 0); struct pci_dev *tmp, *dev = NULL; + const struct domain *d; const struct vpci_msix *msix = pdev->vpci->msix; unsigned int i; int rc; @@ -285,58 +286,69 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) /* * Check for overlaps with other BARs. Note that only BARs that are - * currently mapped (enabled) are checked for overlaps. + * currently mapped (enabled) are checked for overlaps. Note also that + * for hwdom we also need to include hidden, i.e. DomXEN's, devices. */ - for_each_pdev ( pdev->domain, tmp ) + for ( d = pdev->domain != dom_xen ? pdev->domain : hardware_domain; ; ) { - if ( !tmp->vpci ) - /* - * For the hardware domain it's possible to have devices assigned - * to it that are not handled by vPCI, either because those are - * read-only devices, or because vPCI setup has failed. - */ - continue; - - if ( tmp == pdev ) + for_each_pdev ( d, tmp ) { - /* - * Need to store the device so it's not constified and defer_map - * can modify it in case of error. - */ - dev = tmp; - if ( !rom_only ) + if ( !tmp->vpci ) /* - * If memory decoding is toggled avoid checking against the - * same device, or else all regions will be removed from the - * memory map in the unmap case. + * For the hardware domain it's possible to have devices + * assigned to it that are not handled by vPCI, either because + * those are read-only devices, or because vPCI setup has + * failed. */ continue; - } - for ( i = 0; i < ARRAY_SIZE(tmp->vpci->header.bars); i++ ) - { - const struct vpci_bar *bar = &tmp->vpci->header.bars[i]; - unsigned long start = PFN_DOWN(bar->addr); - unsigned long end = PFN_DOWN(bar->addr + bar->size - 1); - - if ( !bar->enabled || !rangeset_overlaps_range(mem, start, end) || - /* - * If only the ROM enable bit is toggled check against other - * BARs in the same device for overlaps, but not against the - * same ROM BAR. - */ - (rom_only && tmp == pdev && bar->type == VPCI_BAR_ROM) ) - continue; + if ( tmp == pdev ) + { + /* + * Need to store the device so it's not constified and defer_map + * can modify it in case of error. + */ + dev = tmp; + if ( !rom_only ) + /* + * If memory decoding is toggled avoid checking against the + * same device, or else all regions will be removed from the + * memory map in the unmap case. + */ + continue; + } - rc = rangeset_remove_range(mem, start, end); - if ( rc ) + for ( i = 0; i < ARRAY_SIZE(tmp->vpci->header.bars); i++ ) { - printk(XENLOG_G_WARNING "Failed to remove [%lx, %lx]: %d\n", - start, end, rc); - rangeset_destroy(mem); - return rc; + const struct vpci_bar *bar = &tmp->vpci->header.bars[i]; + unsigned long start = PFN_DOWN(bar->addr); + unsigned long end = PFN_DOWN(bar->addr + bar->size - 1); + + if ( !bar->enabled || + !rangeset_overlaps_range(mem, start, end) || + /* + * If only the ROM enable bit is toggled check against + * other BARs in the same device for overlaps, but not + * against the same ROM BAR. + */ + (rom_only && tmp == pdev && bar->type == VPCI_BAR_ROM) ) + continue; + + rc = rangeset_remove_range(mem, start, end); + if ( rc ) + { + printk(XENLOG_G_WARNING "Failed to remove [%lx, %lx]: %d\n", + start, end, rc); + rangeset_destroy(mem); + return rc; + } } } + + if ( !is_hardware_domain(d) ) + break; + + d = dom_xen; } ASSERT(dev); diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 652807a4a4..d73fa76302 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -70,6 +70,7 @@ void vpci_remove_device(struct pci_dev *pdev) int vpci_add_handlers(struct pci_dev *pdev) { unsigned int i; + const unsigned long *ro_map; int rc = 0; if ( !has_vpci(pdev->domain) ) @@ -78,6 +79,11 @@ int vpci_add_handlers(struct pci_dev *pdev) /* We should not get here twice for the same device. */ ASSERT(!pdev->vpci); + /* No vPCI for r/o devices. */ + ro_map = pci_get_ro_map(pdev->sbdf.seg); + if ( ro_map && test_bit(pdev->sbdf.bdf, ro_map) ) + return 0; + pdev->vpci = xzalloc(struct vpci); if ( !pdev->vpci ) return -ENOMEM; @@ -332,8 +338,13 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size) return data; } - /* Find the PCI dev matching the address. */ + /* + * Find the PCI dev matching the address, which for hwdom also requires + * consulting DomXEN. Passthrough everything that's not trapped. + */ pdev = pci_get_pdev(d, sbdf); + if ( !pdev && is_hardware_domain(d) ) + pdev = pci_get_pdev(dom_xen, sbdf); if ( !pdev || !pdev->vpci ) return vpci_read_hw(sbdf, reg, size); @@ -427,7 +438,6 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, const struct pci_dev *pdev; const struct vpci_register *r; unsigned int data_offset = 0; - const unsigned long *ro_map = pci_get_ro_map(sbdf.seg); if ( !size ) { @@ -435,18 +445,20 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, return; } - if ( ro_map && test_bit(sbdf.bdf, ro_map) ) - /* Ignore writes to read-only devices. */ - return; - /* - * Find the PCI dev matching the address. - * Passthrough everything that's not trapped. + * Find the PCI dev matching the address, which for hwdom also requires + * consulting DomXEN. Passthrough everything that's not trapped. */ pdev = pci_get_pdev(d, sbdf); + if ( !pdev && is_hardware_domain(d) ) + pdev = pci_get_pdev(dom_xen, sbdf); if ( !pdev || !pdev->vpci ) { - vpci_write_hw(sbdf, reg, size, data); + /* Ignore writes to read-only devices, which have no ->vpci. */ + const unsigned long *ro_map = pci_get_ro_map(sbdf.seg); + + if ( !ro_map || !test_bit(sbdf.bdf, ro_map) ) + vpci_write_hw(sbdf, reg, size, data); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:45:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:45:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542740.846960 (Exim 4.92) (envelope-from ) id 1q4q6c-0003Z8-Dp; Thu, 01 Jun 2023 21:45:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542740.846960; Thu, 01 Jun 2023 21:45:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6c-0003Z0-B8; Thu, 01 Jun 2023 21:45:14 +0000 Received: by outflank-mailman (input) for mailman id 542740; Thu, 01 Jun 2023 21:45:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6b-0003Yq-1Z for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6b-0005HY-0p for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q6b-0003cV-01 for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=60gh8IYfVne5JHI098IMBqLsWPxXP0y75bdn9W7JaC0=; b=tBxyj0CPEU8edOuM35i4D3k1e9 hYmwF40sVWUOZX9/2ZDHvxmkyKEy9mNS949jP/6XzpS+xTrmiQIAPK/VxRRloeKbY3nK+q84Zj4HM tTOWRI72qHNjtjd36mPLHRr94yNK5HX775Rq/DWF24hnN6V5RJwNyl2GwCyYOx/QTuVA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: add test harness entry to ./MAINTAINERS Message-Id: Date: Thu, 01 Jun 2023 21:45:13 +0000 commit 7a2f0ba0d08562fc09c6dd865c6cb3468185be1f Author: Jan Beulich AuthorDate: Wed May 31 16:04:12 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 16:04:12 2023 +0200 vPCI: add test harness entry to ./MAINTAINERS Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index b0f0823d21..1bb7a6a839 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -568,6 +568,7 @@ F: xen/include/*/vm_event.h VPCI M: Roger Pau Monné S: Supported +F: tools/tests/vpci/ F: xen/drivers/vpci/ F: xen/include/xen/vpci.h -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:45:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:45:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542741.846964 (Exim 4.92) (envelope-from ) id 1q4q6m-0003bo-Fc; Thu, 01 Jun 2023 21:45:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542741.846964; Thu, 01 Jun 2023 21:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6m-0003bg-Ck; Thu, 01 Jun 2023 21:45:24 +0000 Received: by outflank-mailman (input) for mailman id 542741; Thu, 01 Jun 2023 21:45:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6l-0003bS-4p for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6l-0005Hy-45 for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q6l-0003dC-2w for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oz8G4uBS7vEdsBjXw2BeiYZRPQD+6dXDwbhjLh8QZPU=; b=IobuUYAZ+fgUAHo5SlMOZRHHMq zYmbHxOMrsGxDRSDqrdihBSkpWm+dgo4MCE7PDSTGs0kHi7EqNeXCZgfbgPrZ/cZPRqf/Ixt51r/7 G59Zj7x76jGGIG5S0Qd/GJuBOE9uFaQDAtK6a9gYCmitOotY824R8WpAV3cbtQ7GrTUw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] vPCI: fix test harness build Message-Id: Date: Thu, 01 Jun 2023 21:45:23 +0000 commit 04f25e9048c375898430a58e1c570806896252cb Author: Jan Beulich AuthorDate: Wed May 31 16:04:30 2023 +0200 Commit: Jan Beulich CommitDate: Wed May 31 16:04:30 2023 +0200 vPCI: fix test harness build The earlier commit introduced two uses of is_hardware_domain(). Fixes: 465217b0f872 ("vPCI: account for hidden devices") Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- tools/tests/vpci/emul.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index 8c5bcadd5f..3c2f66a18f 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -82,6 +82,8 @@ typedef union { #define __hwdom_init +#define is_hardware_domain(d) ((void)(d), false) + #define has_vpci(d) true #define xzalloc(type) ((type *)calloc(1, sizeof(type))) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:45:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:45:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542742.846968 (Exim 4.92) (envelope-from ) id 1q4q6w-0003fh-H4; Thu, 01 Jun 2023 21:45:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542742.846968; Thu, 01 Jun 2023 21:45:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6w-0003fa-EI; Thu, 01 Jun 2023 21:45:34 +0000 Received: by outflank-mailman (input) for mailman id 542742; Thu, 01 Jun 2023 21:45:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6v-0003fP-7r for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q6v-0005I5-76 for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q6v-0003e0-6E for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DSrgMiv8kOmQ4OkZNRfb4xDsjrg9J6Nz0ARwvBvEQbw=; b=cfaBor98sTpu/cLqoqrbFpcPF9 ZJRYFPfrAzHjOw7hBzsdFHdwL1pid9N4usOzXXVu2l0O6c6xqiHUicAKeSXW3JrE01ibYM38XBGtQ czHGpJHm2KakJBPTtjJy6kgI/UKr6+/IBIeDG8z5vJk6ubwJIWV0uZAltnk71S+mON2g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xentrace: allow xentrace to write to stdout Message-Id: Date: Thu, 01 Jun 2023 21:45:33 +0000 commit 0e0d3c00bc098e41b82a4073e3d3f5432fb9b0c6 Author: George Dunlap AuthorDate: Wed May 31 17:06:55 2023 +0100 Commit: George Dunlap CommitDate: Wed May 31 17:06:55 2023 +0100 xentrace: allow xentrace to write to stdout The output file is optional. In case it is missing, xentrace is supposed to write to stdout - unless it is a tty, which is checked prior using it. Signed-off-by: Olaf Hering Acked-by: George Dunlap --- tools/xentrace/xentrace.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 864e30d50c..b81abe8a51 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -1152,11 +1152,9 @@ static void parse_args(int argc, char **argv) } } - /* get outfile (required last argument) */ - if (optind != (argc-1)) - usage(); - - opts.outfile = argv[optind]; + /* get outfile (optional last argument) */ + if (argc > optind) + opts.outfile = argv[optind]; } /* *BSD has no O_LARGEFILE */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:45:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:45:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542743.846972 (Exim 4.92) (envelope-from ) id 1q4q76-0003iP-Ie; Thu, 01 Jun 2023 21:45:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542743.846972; Thu, 01 Jun 2023 21:45:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q76-0003iH-Fx; Thu, 01 Jun 2023 21:45:44 +0000 Received: by outflank-mailman (input) for mailman id 542743; Thu, 01 Jun 2023 21:45:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q75-0003i7-BS for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q75-0005ID-Am for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q75-0003ei-9U for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u7IWPFFVTGLBhzkqqPRpyRppPNrv4raHYmWsAfb6WO0=; b=LstMneviztlQs93TzWBYydsStQ O9D+rLz7bR/2k7ZuxkJLmZ3Px62RhHafo7ngtPW4TdG1TyRJI3KCibSceKzU8r/TVp48YSXouBYRz zSnKnhNX6YYsGKOZOX4t51xUTKdxcPnaho8vJegZvylUBdg4pSd6X79iGd/8Ey5rOEmg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xentrace: remove return value from monitor_tbufs Message-Id: Date: Thu, 01 Jun 2023 21:45:43 +0000 commit f53c498276588c2aced36d5baa61e4a24e8d1bf8 Author: Olaf Hering AuthorDate: Wed May 31 17:06:56 2023 +0100 Commit: George Dunlap CommitDate: Wed May 31 17:06:56 2023 +0100 xentrace: remove return value from monitor_tbufs The program is structured so that fatal errors cause exit() to be called directly, rather than being passed up the stack; returning a value here may mislead people into believing otherwise. Signed-off-by: Olaf Hering Reviewed-by: George Dunlap --- tools/xentrace/xentrace.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index b81abe8a51..a073cab26d 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -668,7 +668,7 @@ static void wait_for_event_or_timeout(unsigned long milliseconds) * monitor_tbufs - monitor the contents of tbufs and output to a file * @logfile: the FILE * representing the file to log to */ -static int monitor_tbufs(void) +static void monitor_tbufs(void) { int i; @@ -795,8 +795,6 @@ static int monitor_tbufs(void) free(data); /* don't need to munmap - cleanup is automatic */ close(outfd); - - return 0; } @@ -1164,7 +1162,6 @@ static void parse_args(int argc, char **argv) int main(int argc, char **argv) { - int ret; struct sigaction act; opts.outfile = 0; @@ -1226,9 +1223,9 @@ int main(int argc, char **argv) sigaction(SIGINT, &act, NULL); sigaction(SIGALRM, &act, NULL); - ret = monitor_tbufs(); + monitor_tbufs(); - return ret; + return 0; } /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 01 21:45:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Jun 2023 21:45:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.542745.846976 (Exim 4.92) (envelope-from ) id 1q4q7G-0003lf-Lx; Thu, 01 Jun 2023 21:45:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 542745.846976; Thu, 01 Jun 2023 21:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q7G-0003lY-Ii; Thu, 01 Jun 2023 21:45:54 +0000 Received: by outflank-mailman (input) for mailman id 542745; Thu, 01 Jun 2023 21:45:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q7F-0003lG-EV for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q4q7F-0005IM-Dq for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q4q7F-0003fR-Cw for xen-changelog@lists.xenproject.org; Thu, 01 Jun 2023 21:45:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZtI7yFgTU4pBvUDFxlbk3ohi7O9w7s2oXCaI53cRmPQ=; b=Weh1s9BwqeaARWRh2U7tp0+Oci gtgFTg9hV34rA5skihQ2BljGmhby6OyABkq6GZPVMNPCzh8Kf5eoH3VBP/xP1XaNkxXfCVhRTzxK7 U4wufGqE4f3o+MZLR+3RFkZ0N4Pfy+/gHL2jmvys+dDbQD4XBwnmtTecW/8VGddkxI7I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xentrace: close output file in the function which opened it Message-Id: Date: Thu, 01 Jun 2023 21:45:53 +0000 commit dc98fa74446e5abe417e5ba9a6a632b50444cfa1 Author: Olaf Hering AuthorDate: Wed May 31 17:06:58 2023 +0100 Commit: George Dunlap CommitDate: Wed May 31 17:06:58 2023 +0100 xentrace: close output file in the function which opened it Signed-off-by: Olaf Hering Reviewed-by: George Dunlap --- tools/xentrace/xentrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index a073cab26d..3548255123 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -794,7 +794,6 @@ static void monitor_tbufs(void) free(meta); free(data); /* don't need to munmap - cleanup is automatic */ - close(outfd); } @@ -1225,6 +1224,7 @@ int main(int argc, char **argv) monitor_tbufs(); + close(outfd); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 02 09:44:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Jun 2023 09:44:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.543057.847647 (Exim 4.92) (envelope-from ) id 1q51KF-0001aG-Fl; Fri, 02 Jun 2023 09:44:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 543057.847647; Fri, 02 Jun 2023 09:44:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q51KF-0001a8-Cy; Fri, 02 Jun 2023 09:44:03 +0000 Received: by outflank-mailman (input) for mailman id 543057; Fri, 02 Jun 2023 09:44:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q51KE-0001Zj-4s for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 09:44:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q51KD-0007Jf-SR for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 09:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q51KD-00008Y-RV for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 09:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zu+FlnUyA09d2+gLG0OfBjvmyKMQPqYc7fcx2bkJVU0=; b=ktzhxqnI0443VvgI44t+pSheWy U3HyEDRPIGzzk+kfM32pGQ8Yd2EgJX+j9BE/Wkq/mKTfafDYzTn+r7UZvNWk1pOdk8tJogTMggFfn S/VGoyxQEhtXNz9nedg2TtX2FLVtGZm8LsEL04+0s5pR5tpj6McfvUlFtmWPbkxcVxtI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Rearrange guest_common_default_feature_adjustments() Message-Id: Date: Fri, 02 Jun 2023 09:44:01 +0000 commit 064f572f96f1558faae0a74cad616ba95ec8ff34 Author: Andrew Cooper AuthorDate: Fri Mar 10 16:23:20 2023 +0000 Commit: Andrew Cooper CommitDate: Thu Jun 1 10:34:21 2023 +0100 x86/cpu-policy: Rearrange guest_common_default_feature_adjustments() This is prep work, split out to simply the diff on the following change. * Split the INTEL check out of the IvyBridge RDRAND check, as the former will be reused. * Use asm/intel-family.h to remove a raw 0x3a model number. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu-policy.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index fbf0ecb7cc..ee256ff5a1 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -429,21 +430,24 @@ static void __init guest_common_max_feature_adjustments(uint32_t *fs) static void __init guest_common_default_feature_adjustments(uint32_t *fs) { - /* - * IvyBridge client parts suffer from leakage of RDRAND data due to SRBDS - * (XSA-320 / CVE-2020-0543), and won't be receiving microcode to - * compensate. - * - * Mitigate by hiding RDRAND from guests by default, unless explicitly - * overridden on the Xen command line (cpuid=rdrand). Irrespective of the - * default setting, guests can use RDRAND if explicitly enabled - * (cpuid="host,rdrand=1") in the VM's config file, and VMs which were - * previously using RDRAND can migrate in. - */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && - boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x3a && - cpu_has_rdrand && !is_forced_cpu_cap(X86_FEATURE_RDRAND) ) - __clear_bit(X86_FEATURE_RDRAND, fs); + if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + { + /* + * IvyBridge client parts suffer from leakage of RDRAND data due to SRBDS + * (XSA-320 / CVE-2020-0543), and won't be receiving microcode to + * compensate. + * + * Mitigate by hiding RDRAND from guests by default, unless explicitly + * overridden on the Xen command line (cpuid=rdrand). Irrespective of the + * default setting, guests can use RDRAND if explicitly enabled + * (cpuid="host,rdrand=1") in the VM's config file, and VMs which were + * previously using RDRAND can migrate in. + */ + if ( boot_cpu_data.x86 == 6 && + boot_cpu_data.x86_model == INTEL_FAM6_IVYBRIDGE && + cpu_has_rdrand && !is_forced_cpu_cap(X86_FEATURE_RDRAND) ) + __clear_bit(X86_FEATURE_RDRAND, fs); + } /* * On certain hardware, speculative or errata workarounds can result in -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 02 09:44:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Jun 2023 09:44:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.543058.847652 (Exim 4.92) (envelope-from ) id 1q51KP-0001cC-HR; Fri, 02 Jun 2023 09:44:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 543058.847652; Fri, 02 Jun 2023 09:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q51KP-0001c1-EY; Fri, 02 Jun 2023 09:44:13 +0000 Received: by outflank-mailman (input) for mailman id 543058; Fri, 02 Jun 2023 09:44:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q51KO-0001br-0N for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 09:44:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q51KN-0007Jk-Vh for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 09:44:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q51KN-00009D-UW for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 09:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DUxFVI1W5seMotccNIo/nQbLW9hNv1EaD6rerYy5jYw=; b=5x/r1nfpPlYff7e6pKtIQ2XxoD 1P2OTekoCqhLBEGGgyr4hMKhAwmuiuCzNsfNRLll77dvPs3n3TtEgxmTJpU1R5+K1igSfzKd9cSEO 5+u3ui6aDYY1UZGuNGDHJ1l8S5f6hdfpQTShnxvF1x/4guBV8yviTRHqJVMAkHIQJSQc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/cpu-policy: Add an IBRS -> AUTO_IBRS dependency Message-Id: Date: Fri, 02 Jun 2023 09:44:11 +0000 commit 59d0bf62861f5c9b317ccf89f8b5c8b4d19927ad Author: Andrew Cooper AuthorDate: Wed May 31 16:26:56 2023 +0100 Commit: Andrew Cooper CommitDate: Thu Jun 1 10:34:21 2023 +0100 xen/cpu-policy: Add an IBRS -> AUTO_IBRS dependency AUTO_IBRS is an extention over regular (AMD) IBRS, and needs hiding if IBRS is levelled out for any reason. Fixes: defaf651631a ("x86/hvm: Expose Automatic IBRS to guests") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/tools/gen-cpuid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index f28ff708a2..973fcc1c64 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -319,7 +319,7 @@ def crunch_numbers(state): # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. IBRSB: [STIBP, SSBD, INTEL_PSFD], - IBRS: [AMD_STIBP, AMD_SSBD, PSFD, + IBRS: [AMD_STIBP, AMD_SSBD, PSFD, AUTO_IBRS, IBRS_ALWAYS, IBRS_FAST, IBRS_SAME_MODE], AMD_STIBP: [STIBP_ALWAYS], -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 02 21:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Jun 2023 21:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.543250.848068 (Exim 4.92) (envelope-from ) id 1q5CON-0001cc-B9; Fri, 02 Jun 2023 21:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 543250.848068; Fri, 02 Jun 2023 21:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q5CON-0001cS-82; Fri, 02 Jun 2023 21:33:03 +0000 Received: by outflank-mailman (input) for mailman id 543250; Fri, 02 Jun 2023 21:33:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q5COM-0001cM-Af for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 21:33:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q5COM-0006xy-4Q for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 21:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q5COM-00012R-3I for xen-changelog@lists.xenproject.org; Fri, 02 Jun 2023 21:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2ES3Qx0v9tsI7YvbX2OpBKODMksUU3d5W6jC5QL3U60=; b=2Hsb6Svz/tLvNKyscz1kfIhTi0 4ZbrflAR7qPlP1WZZLOR04QuVHtJ+ceqJa+RrUYo+9r4eVV9R6Xa6qUJXHn5BsxG+ADFrGMNk2R5N FqvgooIBJBQ8ylHd0WcQsiL84B1G+ifd65sTnqrA63PBjxQwzY0QXRcoQfKtg+kZzKtg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/ucode: Exit early from early_update_cache() if loading not available Message-Id: Date: Fri, 02 Jun 2023 21:33:02 +0000 commit 71226054f28ad98ab214b56a15899e8f62a7bca8 Author: Andrew Cooper AuthorDate: Thu Jun 1 15:26:02 2023 +0100 Commit: Andrew Cooper CommitDate: Thu Jun 1 20:38:41 2023 +0100 x86/ucode: Exit early from early_update_cache() if loading not available If for any reason early_microcode_init() concludes that no microcode loading is available, early_update_cache() will fall over a NULL function pointer: (XEN) Xen call trace: (XEN) [] R show_code+0x91/0x18f (XEN) [] F show_execution_state+0x2d/0x1fc (XEN) [] F fatal_trap+0x87/0x19a (XEN) [] F init_idt_traps+0/0x1bd (XEN) [] F early_page_fault+0x8f/0x94 (XEN) [<0000000000000000>] F 0000000000000000 (XEN) [] F arch/x86/cpu/microcode/core.c#early_update_cache+0x11/0x74 (XEN) [] F microcode_init_cache+0x5a/0x5c (XEN) [] F __start_xen+0x1e11/0x27ee (XEN) [] F __high_start+0x94/0xa0 which is actually parse_blob()'s use of ucode_ops.collect_cpu_info. Skip trying to cache anything if microcode loading is unavailable. Fixes: dc380df12acf ("x86/ucode: load microcode earlier on boot CPU") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/microcode/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index cd456c476f..c1033f3bc2 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -789,6 +789,9 @@ int __init microcode_init_cache(unsigned long *module_map, { int rc = 0; + if ( !ucode_ops.apply_microcode ) + return -ENODEV; + if ( ucode_scan ) /* Need to rescan the modules because they might have been relocated */ microcode_scan_module(module_map, mbi); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 03 08:22:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Jun 2023 08:22:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.543310.848180 (Exim 4.92) (envelope-from ) id 1q5MWR-0000x7-Hq; Sat, 03 Jun 2023 08:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 543310.848180; Sat, 03 Jun 2023 08:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q5MWR-0000wz-F1; Sat, 03 Jun 2023 08:22:03 +0000 Received: by outflank-mailman (input) for mailman id 543310; Sat, 03 Jun 2023 08:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q5MWP-0000ws-Hz for xen-changelog@lists.xenproject.org; Sat, 03 Jun 2023 08:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q5MWP-0004yH-CZ for xen-changelog@lists.xenproject.org; Sat, 03 Jun 2023 08:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q5MWP-0001fh-An for xen-changelog@lists.xenproject.org; Sat, 03 Jun 2023 08:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JmIkvfv/VSscUukoF7sl+n6/pAf9hxzXGA4jIgareuo=; b=D7X0gxyEwgCIwC3otsIr0rkJJt 4Lz5SEEG8XuV4sdrtoAPJwwkqD1NQOvdkQ4FjutsXTAg0E3tG2QZl6zTz+HHJJcp6sFBbbw78/Xzk Tb6wgBgZmXuOq+JIX/GdqDmtyci5y1pAMfdEqW8l73WTwagbngB0GSlZDtHnmMtJhS00=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: zen3 dom0pvh test Message-Id: Date: Sat, 03 Jun 2023 08:22:01 +0000 commit 67fdffef9246c82cecd8db28838ed09e79e2528a Author: Stefano Stabellini AuthorDate: Wed May 31 16:49:21 2023 -0700 Commit: Stefano Stabellini CommitDate: Fri Jun 2 13:07:10 2023 -0700 automation: zen3 dom0pvh test Add a PVH Dom0 test for the zen3 runner. Signed-off-by: Stefano Stabellini Acked-by: Marek Marczykowski-Górecki --- automation/gitlab-ci/test.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index fbe2c0589a..d5cb238b0a 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -202,6 +202,14 @@ zen3p-smoke-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.12-gcc-debug +zen3p-smoke-x86-64-dom0pvh-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.12-gcc-debug + zen3p-pci-hvm-x86-64-gcc-debug: extends: .zen3p-x86-64 script: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:55:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:55:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544009.849439 (Exim 4.92) (envelope-from ) id 1q6ST1-0008HA-OW; Tue, 06 Jun 2023 08:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544009.849439; Tue, 06 Jun 2023 08:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6ST1-0008H2-Ll; Tue, 06 Jun 2023 08:55:03 +0000 Received: by outflank-mailman (input) for mailman id 544009; Tue, 06 Jun 2023 08:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SSz-0008Gw-VH for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SSz-0005wn-U0 for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6SSz-0000on-Sw for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xgA9ssXc2nnhaue0Q9bwNQFzaYF/CXYn+tO14WOXZOs=; b=AX8A4ebkjl7CGiJgnkYizk/PQz NR35L4a/5jrdXJLdxMGomKcHefMfpMrhf7+9Vd8K47gUrxnIZ3h37GIe+anWyrTg1G0BhUGjdo/WN wV4pdib1LtsulCfSAAJHwi1l7+jRIYLbX4VRDqNZFb9uVBZ65CstkchnT4GFohKnLc2c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: rework compiler probing in the test harness Message-Id: Date: Tue, 06 Jun 2023 08:55:01 +0000 commit 7c6fdc40a0006a2c5a92387316acf2ba89e703c5 Author: Jan Beulich AuthorDate: Mon Jun 5 14:53:54 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:53:54 2023 +0200 x86emul: rework compiler probing in the test harness Checking for what $(SIMD) contains was initially right, but already the addition of $(FMA) wasn't. Later categories (correctly) weren't added. Instead what is of interest is anything the main harness source file uses outside of suitable #if and without resorting to .byte, as that's the one file (containing actual tests) which has to succeed in building. The auxiliary binary blobs we utilize may fail to build; the resulting empty blobs are recognized and reported as "n/a" when the harness is run. Note that strictly speaking we'd need to probe the assembler. We assume that a compiler knowing of a certain ISA extension is backed by an equally capable assembler. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 4b1f75de05..a6f5bfa53e 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -104,11 +104,13 @@ TARGET-y := $(TARGET) ifeq ($(filter run%,$(MAKECMDGOALS)),) -define simd-check-cc +define isa-check-cc TARGET-$(shell echo 'int i;' | $(CC) -x c -c -o /dev/null -m$(1) - || echo y) := endef -$(foreach flavor,$(SIMD) $(FMA),$(eval $(call simd-check-cc,$(flavor)))) +ISA := bmi bmi2 tbm sse4.1 sse4.2 sse4a avx avx2 f16c +ISA += $(addprefix avx512,f bw dq 4fmaps) +$(foreach isa,$(ISA),$(eval $(call isa-check-cc,$(isa)))) # Also explicitly check for {evex} pseudo-prefix support, which got introduced # only after AVX512F and some of its extensions. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544010.849443 (Exim 4.92) (envelope-from ) id 1q6STB-0008JV-Q2; Tue, 06 Jun 2023 08:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544010.849443; Tue, 06 Jun 2023 08:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STB-0008JN-NE; Tue, 06 Jun 2023 08:55:13 +0000 Received: by outflank-mailman (input) for mailman id 544010; Tue, 06 Jun 2023 08:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STA-0008JA-2r for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STA-0005wy-1q for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6STA-0000pE-0q for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=2+Ldi9xvzySV/2Ozz3Y9chXM1RGD+UViOS6bIZuOx9U=; b=cBdEIUjQKHf9xxu11oaTqJGGky 7EhArL5dcwaLfCoh3oc9emv5ay86206ZhWy4X7UiEOrNNmKKWzRuDQZ7e8UwRVfmLPrwB46NZAhCu JZIcAWaEVs4QgYEocM+FgamatMwsJta+uZi3sb2NuMEs24noe6Q1HRYtMdhacSJOZjac=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 insns encoded in 0f3a opcode map Message-Id: Date: Tue, 06 Jun 2023 08:55:12 +0000 commit b67934082e13d414a947607a9de93a7894461d1e Author: Jan Beulich AuthorDate: Mon Jun 5 14:55:07 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:55:07 2023 +0200 x86emul: handle AVX512-FP16 insns encoded in 0f3a opcode map In order to re-use (also in subsequent patches) existing code and tables as much as possible, simply introduce a new boolean field in emulator state indicating whether an insn is one with a half-precision source. Everything else then follows "naturally". Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 21 ++++++++++-- tools/tests/x86_emulator/predicates.c | 10 ++++++ tools/tests/x86_emulator/test_x86_emulator.c | 38 +++++++++++++++++++++ tools/tests/x86_emulator/x86-emulate.h | 1 + xen/arch/x86/x86_emulate/decode.c | 33 ++++++++++++++++--- xen/arch/x86/x86_emulate/private.h | 2 ++ xen/arch/x86/x86_emulate/x86_emulate.c | 49 +++++++++++++++++++++++++++- 7 files changed, 146 insertions(+), 8 deletions(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index 78153847a0..63ed0fca40 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -76,6 +76,7 @@ enum esz { ESZ_b, ESZ_w, ESZ_bw, + ESZ_fp16, }; #ifndef __i386__ @@ -601,6 +602,19 @@ static const struct test avx512_vpopcntdq_all[] = { INSN(popcnt, 66, 0f38, 55, vl, dq, vl) }; +static const struct test avx512_fp16_all[] = { + INSN(cmpph, , 0f3a, c2, vl, fp16, vl), + INSN(cmpsh, f3, 0f3a, c2, el, fp16, el), + INSN(fpclassph, , 0f3a, 66, vl, fp16, vl), + INSN(fpclasssh, , 0f3a, 67, el, fp16, el), + INSN(getmantph, , 0f3a, 26, vl, fp16, vl), + INSN(getmantsh, , 0f3a, 27, el, fp16, el), + INSN(reduceph, , 0f3a, 56, vl, fp16, vl), + INSN(reducesh, , 0f3a, 57, el, fp16, el), + INSN(rndscaleph, , 0f3a, 08, vl, fp16, vl), + INSN(rndscalesh, , 0f3a, 0a, el, fp16, el), +}; + static const struct test gfni_all[] = { INSN(gf2p8affineinvqb, 66, 0f3a, cf, vl, q, vl), INSN(gf2p8affineqb, 66, 0f3a, ce, vl, q, vl), @@ -728,8 +742,10 @@ static void test_one(const struct test *test, enum vl vl, break; case ESZ_w: - esz = 2; evex.w = 1; + /* fall through */ + case ESZ_fp16: + esz = 2; break; #ifdef __i386__ @@ -845,7 +861,7 @@ static void test_one(const struct test *test, enum vl vl, case ESZ_b: case ESZ_w: case ESZ_bw: return; - case ESZ_d: case ESZ_q: + case ESZ_d: case ESZ_q: case ESZ_fp16: break; default: @@ -1002,6 +1018,7 @@ void evex_disp8_test(void *instr, struct x86_emulate_ctxt *ctxt, RUN(avx512_vnni, all); RUN(avx512_vp2intersect, all); RUN(avx512_vpopcntdq, all); + RUN(avx512_fp16, all); if ( cpu_has_avx512f ) { diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 80db0e4cf3..50b5c75cbf 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -1988,8 +1988,10 @@ static const struct evex { { { 0x03 }, 3, T, R, pfx_66, Wn, Ln }, /* valign{d,q} */ { { 0x04 }, 3, T, R, pfx_66, W0, Ln }, /* vpermilps */ { { 0x05 }, 3, T, R, pfx_66, W1, Ln }, /* vpermilpd */ + { { 0x08 }, 3, T, R, pfx_no, W0, Ln }, /* vrndscaleph */ { { 0x08 }, 3, T, R, pfx_66, W0, Ln }, /* vrndscaleps */ { { 0x09 }, 3, T, R, pfx_66, W1, Ln }, /* vrndscalepd */ + { { 0x0a }, 3, T, R, pfx_no, W0, LIG }, /* vrndscalesh */ { { 0x0a }, 3, T, R, pfx_66, W0, LIG }, /* vrndscaless */ { { 0x0b }, 3, T, R, pfx_66, W1, LIG }, /* vrndscalesd */ { { 0x0f }, 3, T, R, pfx_66, WIG, Ln }, /* vpalignr */ @@ -2009,7 +2011,9 @@ static const struct evex { { { 0x22 }, 3, T, R, pfx_66, Wn, L0 }, /* vpinsr{d,q} */ { { 0x23 }, 3, T, R, pfx_66, Wn, L1|L2 }, /* vshuff{32x4,64x2} */ { { 0x25 }, 3, T, R, pfx_66, Wn, Ln }, /* vpternlog{d,q} */ + { { 0x26 }, 3, T, R, pfx_no, W0, Ln }, /* vgetmantph */ { { 0x26 }, 3, T, R, pfx_66, Wn, Ln }, /* vgetmantp{s,d} */ + { { 0x27 }, 3, T, R, pfx_no, W0, LIG }, /* vgetmantsh */ { { 0x27 }, 3, T, R, pfx_66, Wn, LIG }, /* vgetmants{s,d} */ { { 0x38 }, 3, T, R, pfx_66, Wn, L1|L2 }, /* vinserti{32x4,64x2} */ { { 0x39 }, 3, T, W, pfx_66, Wn, L1|L2 }, /* vextracti{32x4,64x2} */ @@ -2024,14 +2028,20 @@ static const struct evex { { { 0x51 }, 3, T, R, pfx_66, Wn, LIG }, /* vranges{s,d} */ { { 0x54 }, 3, T, R, pfx_66, Wn, Ln }, /* vfixupimmp{s,d} */ { { 0x55 }, 3, T, R, pfx_66, Wn, LIG }, /* vfixumpimms{s,d} */ + { { 0x56 }, 3, T, R, pfx_no, W0, Ln }, /* vreduceph */ { { 0x56 }, 3, T, R, pfx_66, Wn, Ln }, /* vreducep{s,d} */ + { { 0x57 }, 3, T, R, pfx_no, W0, LIG }, /* vreducesh */ { { 0x57 }, 3, T, R, pfx_66, Wn, LIG }, /* vreduces{s,d} */ + { { 0x66 }, 3, T, R, pfx_no, W0, Ln }, /* vfpclassph */ { { 0x66 }, 3, T, R, pfx_66, Wn, Ln }, /* vfpclassp{s,d} */ + { { 0x67 }, 3, T, R, pfx_no, W0, LIG }, /* vfpclasssh */ { { 0x67 }, 3, T, R, pfx_66, Wn, LIG }, /* vfpclasss{s,d} */ { { 0x70 }, 3, T, R, pfx_66, W1, Ln }, /* vshldw */ { { 0x71 }, 3, T, R, pfx_66, Wn, Ln }, /* vshld{d,q} */ { { 0x72 }, 3, T, R, pfx_66, W1, Ln }, /* vshrdw */ { { 0x73 }, 3, T, R, pfx_66, Wn, Ln }, /* vshrd{d,q} */ + { { 0xc2 }, 3, T, R, pfx_no, W0, Ln }, /* vcmpph */ + { { 0xc2 }, 3, T, R, pfx_f3, W0, LIG }, /* vcmpsh */ { { 0xce }, 3, T, R, pfx_66, W1, Ln }, /* vgf2p8affineqb */ { { 0xcf }, 3, T, R, pfx_66, W1, Ln }, /* vgf2p8affineinvqb */ }; diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 5592b91914..c0d908cc4f 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -4710,6 +4710,44 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vfpclassphz $0x46,128(%ecx),%k3..."); + if ( stack_exec && cpu_has_avx512_fp16 ) + { + decl_insn(vfpclassph); + + asm volatile ( put_insn(vfpclassph, + /* 0x46: check for +/- 0 and neg. */ + /* vfpclassphz $0x46, 128(%0), %%k3 */ + ".byte 0x62, 0xf3, 0x7c, 0x48\n\t" + ".byte 0x66, 0x59, 0x02, 0x46") + :: "c" (NULL) ); + + set_insn(vfpclassph); + for ( i = 0; i < 3; ++i ) + { + res[16 + i * 5 + 0] = 0x7fff0000; /* +0 / +NaN */ + res[16 + i * 5 + 1] = 0xffff8000; /* -0 / -NaN */ + res[16 + i * 5 + 2] = 0x80010001; /* +DEN / -DEN */ + res[16 + i * 5 + 3] = 0xfc00f800; /* -FIN / -INF */ + res[16 + i * 5 + 4] = 0x7c007800; /* +FIN / +INF */ + } + res[31] = 0; + regs.ecx = (unsigned long)res - 64; + rc = x86_emulate(&ctxt, &emulops); + if ( rc != X86EMUL_OKAY || !check_eip(vfpclassph) ) + goto fail; + asm volatile ( "kmovd %%k3, %0" : "=g" (rc) ); + /* + * 0b11(0001100101)*3 + * 0b1100_0110_0101_0001_1001_0100_0110_0101 + */ + if ( rc != 0xc6519465 ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + /* * The following compress/expand tests are not only making sure the * accessed data is correct, but they also verify (by placing operands diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 256ccb9fef..de1f826680 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -183,6 +183,7 @@ void wrpkru(unsigned int val); #define cpu_has_avx512_4fmaps (cp.feat.avx512_4fmaps && xcr0_mask(0xe6)) #define cpu_has_avx512_vp2intersect (cp.feat.avx512_vp2intersect && xcr0_mask(0xe6)) #define cpu_has_serialize cp.feat.serialize +#define cpu_has_avx512_fp16 (cp.feat.avx512_fp16 && xcr0_mask(0xe6)) #define cpu_has_avx_vnni (cp.feat.avx_vnni && xcr0_mask(6)) #define cpu_has_avx512_bf16 (cp.feat.avx512_bf16 && xcr0_mask(0xe6)) #define cpu_has_avx_ifma (cp.feat.avx_ifma && xcr0_mask(6)) diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 362de670bc..13d71bd7e1 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -508,6 +508,7 @@ static const struct ext0f3a_table { [0x7a ... 0x7b] = { .simd_size = simd_scalar_opc, .four_op = 1 }, [0x7c ... 0x7d] = { .simd_size = simd_packed_fp, .four_op = 1 }, [0x7e ... 0x7f] = { .simd_size = simd_scalar_opc, .four_op = 1 }, + [0xc2] = { .simd_size = simd_any_fp, .d8s = d8s_vl }, [0xcc] = { .simd_size = simd_other }, [0xce ... 0xcf] = { .simd_size = simd_packed_int, .d8s = d8s_vl }, [0xdf] = { .simd_size = simd_packed_int, .two_op = 1 }, @@ -569,7 +570,7 @@ static unsigned int decode_disp8scale(enum disp8scale scale, if ( s->evex.brs ) { case d8s_dq: - return 2 + s->evex.w; + return 1 + !s->fp16 + s->evex.w; } break; @@ -586,7 +587,7 @@ static unsigned int decode_disp8scale(enum disp8scale scale, /* fall through */ case simd_scalar_opc: case simd_scalar_vexw: - return 2 + s->evex.w; + return 1 + !s->fp16 + s->evex.w; case simd_128: /* These should have an explicit size specified. */ @@ -1406,7 +1407,29 @@ int x86emul_decode(struct x86_emulate_state *s, */ s->simd_size = ext0f3a_table[b].simd_size; if ( evex_encoded() ) + { + switch ( b ) + { + case 0x08: /* vrndscaleph */ + case 0x0a: /* vrndscalesh */ + case 0x26: /* vfpclassph */ + case 0x27: /* vfpclasssh */ + case 0x56: /* vgetmantph */ + case 0x57: /* vgetmantsh */ + case 0x66: /* vreduceph */ + case 0x67: /* vreducesh */ + if ( !s->evex.pfx ) + s->fp16 = true; + break; + + case 0xc2: /* vpcmp{p,s}h */ + if ( !(s->evex.pfx & VEX_PREFIX_DOUBLE_MASK) ) + s->fp16 = true; + break; + } + disp8scale = decode_disp8scale(ext0f3a_table[b].d8s, s); + } break; case ext_8f09: @@ -1701,7 +1724,7 @@ int x86emul_decode(struct x86_emulate_state *s, break; case vex_f3: generate_exception_if(evex_encoded() && s->evex.w, X86_EXC_UD); - s->op_bytes = 4; + s->op_bytes = 4 >> s->fp16; break; case vex_f2: generate_exception_if(evex_encoded() && !s->evex.w, X86_EXC_UD); @@ -1711,11 +1734,11 @@ int x86emul_decode(struct x86_emulate_state *s, break; case simd_scalar_opc: - s->op_bytes = 4 << (ctxt->opcode & 1); + s->op_bytes = 2 << (!s->fp16 + (ctxt->opcode & 1)); break; case simd_scalar_vexw: - s->op_bytes = 4 << s->vex.w; + s->op_bytes = 2 << (!s->fp16 + s->vex.w); break; case simd_128: diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index bd05a37183..3644b5fbee 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -293,6 +293,7 @@ struct x86_emulate_state { bool lock_prefix; bool not_64bit; /* Instruction not available in 64bit. */ bool fpu_ctrl; /* Instruction is an FPU control one. */ + bool fp16; /* Instruction has half-precision FP source operand. */ opcode_desc_t desc; union vex vex; union evex evex; @@ -581,6 +582,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_vp2intersect() (ctxt->cpuid->feat.avx512_vp2intersect) #define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) #define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) +#define vcpu_has_avx512_fp16() (ctxt->cpuid->feat.avx512_fp16) #define vcpu_has_avx_vnni() (ctxt->cpuid->feat.avx_vnni) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) #define vcpu_has_wrmsrns() (ctxt->cpuid->feat.wrmsrns) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6ff12384ec..5f1c439346 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1266,7 +1266,7 @@ x86_emulate( b = ctxt->opcode; d = state.desc; #define state (&state) - elem_bytes = 4 << evex.w; + elem_bytes = 2 << (!state->fp16 + evex.w); generate_exception_if(state->not_64bit && mode_64bit(), X86_EXC_UD); @@ -7148,6 +7148,15 @@ x86_emulate( avx512_vlen_check(b & 2); goto simd_imm8_zmm; + case X86EMUL_OPC_EVEX(0x0f3a, 0x0a): /* vrndscalesh $imm8,xmm/mem,xmm,xmm{k} */ + generate_exception_if(ea.type != OP_REG && evex.brs, X86_EXC_UD); + /* fall through */ + case X86EMUL_OPC_EVEX(0x0f3a, 0x08): /* vrndscaleph $imm8,[xyz]mm/mem,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + avx512_vlen_check(b & 2); + goto simd_imm8_zmm; + #endif /* X86EMUL_NO_SIMD */ CASE_SIMD_PACKED_INT(0x0f3a, 0x0f): /* palignr $imm8,{,x}mm/mem,{,x}mm */ @@ -7458,6 +7467,14 @@ x86_emulate( avx512_vlen_check(false); goto simd_imm8_zmm; + case X86EMUL_OPC_EVEX(0x0f3a, 0x26): /* vgetmantph $imm8,[xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX(0x0f3a, 0x56): /* vreduceph $imm8,[xyz]mm/mem,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + if ( ea.type != OP_REG || !evex.brs ) + avx512_vlen_check(false); + goto simd_imm8_zmm; + case X86EMUL_OPC_EVEX_66(0x0f3a, 0x51): /* vranges{s,d} $imm8,xmm/mem,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(0x0f3a, 0x57): /* vreduces{s,d} $imm8,xmm/mem,xmm,xmm{k} */ host_and_vcpu_must_have(avx512dq); @@ -7470,6 +7487,16 @@ x86_emulate( avx512_vlen_check(true); goto simd_imm8_zmm; + case X86EMUL_OPC_EVEX(0x0f3a, 0x27): /* vgetmantsh $imm8,xmm/mem,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX(0x0f3a, 0x57): /* vreducesh $imm8,xmm/mem,xmm,xmm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + if ( !evex.brs ) + avx512_vlen_check(true); + else + generate_exception_if(ea.type != OP_REG, X86_EXC_UD); + goto simd_imm8_zmm; + case X86EMUL_OPC_VEX_66(0x0f3a, 0x30): /* kshiftr{b,w} $imm8,k,k */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x32): /* kshiftl{b,w} $imm8,k,k */ if ( !vex.w ) @@ -7633,6 +7660,16 @@ x86_emulate( avx512_vlen_check(true); goto simd_imm8_zmm; + case X86EMUL_OPC_EVEX(0x0f3a, 0x66): /* vfpclassph $imm8,[xyz]mm/mem,k{k} */ + case X86EMUL_OPC_EVEX(0x0f3a, 0x67): /* vfpclasssh $imm8,xmm/mem,k{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w || !evex.r || !evex.R || evex.z, X86_EXC_UD); + if ( !(b & 1) ) + goto avx512f_imm8_no_sae; + generate_exception_if(evex.brs, X86_EXC_UD); + avx512_vlen_check(true); + goto simd_imm8_zmm; + case X86EMUL_OPC_EVEX_66(0x0f3a, 0x70): /* vpshldw $imm8,[xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(0x0f3a, 0x72): /* vpshrdw $imm8,[xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ generate_exception_if(!evex.w, X86_EXC_UD); @@ -7643,6 +7680,16 @@ x86_emulate( host_and_vcpu_must_have(avx512_vbmi2); goto avx512f_imm8_no_sae; + case X86EMUL_OPC_EVEX_F3(0x0f3a, 0xc2): /* vcmpsh $imm8,xmm/mem,xmm,k{k} */ + generate_exception_if(ea.type != OP_REG && evex.brs, X86_EXC_UD); + /* fall through */ + case X86EMUL_OPC_EVEX(0x0f3a, 0xc2): /* vcmpph $imm8,[xyz]mm/mem,[xyz]mm,k{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w || !evex.r || !evex.R || evex.z, X86_EXC_UD); + if ( ea.type != OP_REG || !evex.brs ) + avx512_vlen_check(evex.pfx & VEX_PREFIX_SCALAR_MASK); + goto simd_imm8_zmm; + case X86EMUL_OPC(0x0f3a, 0xcc): /* sha1rnds4 $imm8,xmm/m128,xmm */ host_and_vcpu_must_have(sha); op_bytes = 16; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544011.849448 (Exim 4.92) (envelope-from ) id 1q6STL-0008Ls-SQ; Tue, 06 Jun 2023 08:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544011.849448; Tue, 06 Jun 2023 08:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STL-0008Lk-Ol; Tue, 06 Jun 2023 08:55:23 +0000 Received: by outflank-mailman (input) for mailman id 544011; Tue, 06 Jun 2023 08:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STK-0008LO-6f for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STK-0005x6-5t for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6STK-0000q0-4u for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=fMaWYEx3Jl696xn82m4FE9taCys5oIJ6ldirWQDJzto=; b=n8hHv/HhxavSlKYJ5CiB78UvKW hdMo5VyRjbWbnmPkCFDf8ZR7+gegsgMS8QludRdaRekgEFXOwWWCFkkGpctnLFzvMpr8ne6bvo49I 0UVAmlN0FLA7k0FFltXMSVmWhW3o4dHcqKxmiUL6ATswhGQ7Y3HsTIJ2JPpeKO3IUfQ4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 Map5 arithmetic insns Message-Id: Date: Tue, 06 Jun 2023 08:55:22 +0000 commit 6b4d5c26a6234943d8b7307df3e66f997c6fe74e Author: Jan Beulich AuthorDate: Mon Jun 5 14:56:25 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:56:25 2023 +0200 x86emul: handle AVX512-FP16 Map5 arithmetic insns This encoding space is a very sparse clone of the "twobyte" one. Re-use that table, as the entries corresponding to invalid opcodes in Map5 are simply benign with simd_size forced to other than simd_none (preventing undue memory reads in SrcMem handling early in x86_emulate()). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 26 +++++++++++++++++++++--- tools/tests/x86_emulator/predicates.c | 19 +++++++++++++++++ xen/arch/x86/x86_emulate/decode.c | 37 ++++++++++++++++++++++++++++++++-- xen/arch/x86/x86_emulate/private.h | 6 ++++-- xen/arch/x86/x86_emulate/x86_emulate.c | 25 ++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.h | 1 + 6 files changed, 106 insertions(+), 8 deletions(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index 63ed0fca40..f526321198 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -6,7 +6,7 @@ struct test { const char *mnemonic; unsigned int opc:8; - unsigned int spc:2; + unsigned int spc:3; unsigned int pfx:2; unsigned int vsz:3; unsigned int esz:4; @@ -19,6 +19,10 @@ enum spc { SPC_0f, SPC_0f38, SPC_0f3a, + SPC_unused4, + SPC_map5, + SPC_map6, + SPC_unused7, }; enum pfx { @@ -603,16 +607,32 @@ static const struct test avx512_vpopcntdq_all[] = { }; static const struct test avx512_fp16_all[] = { + INSN(addph, , map5, 58, vl, fp16, vl), + INSN(addsh, f3, map5, 58, el, fp16, el), INSN(cmpph, , 0f3a, c2, vl, fp16, vl), INSN(cmpsh, f3, 0f3a, c2, el, fp16, el), + INSN(comish, , map5, 2f, el, fp16, el), + INSN(divph, , map5, 5e, vl, fp16, vl), + INSN(divsh, f3, map5, 5e, el, fp16, el), INSN(fpclassph, , 0f3a, 66, vl, fp16, vl), INSN(fpclasssh, , 0f3a, 67, el, fp16, el), INSN(getmantph, , 0f3a, 26, vl, fp16, vl), INSN(getmantsh, , 0f3a, 27, el, fp16, el), + INSN(maxph, , map5, 5f, vl, fp16, vl), + INSN(maxsh, f3, map5, 5f, el, fp16, el), + INSN(minph, , map5, 5d, vl, fp16, vl), + INSN(minsh, f3, map5, 5d, el, fp16, el), + INSN(mulph, , map5, 59, vl, fp16, vl), + INSN(mulsh, f3, map5, 59, el, fp16, el), INSN(reduceph, , 0f3a, 56, vl, fp16, vl), INSN(reducesh, , 0f3a, 57, el, fp16, el), INSN(rndscaleph, , 0f3a, 08, vl, fp16, vl), INSN(rndscalesh, , 0f3a, 0a, el, fp16, el), + INSN(sqrtph, , map5, 51, vl, fp16, vl), + INSN(sqrtsh, f3, map5, 51, el, fp16, el), + INSN(subph, , map5, 5c, vl, fp16, vl), + INSN(subsh, f3, map5, 5c, el, fp16, el), + INSN(ucomish, , map5, 2e, el, fp16, el), }; static const struct test gfni_all[] = { @@ -713,8 +733,8 @@ static void test_one(const struct test *test, enum vl vl, union evex { uint8_t raw[3]; struct { - uint8_t opcx:2; - uint8_t mbz:2; + uint8_t opcx:3; + uint8_t mbz:1; uint8_t R:1; uint8_t b:1; uint8_t x:1; diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 50b5c75cbf..746bc2dec1 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2044,6 +2044,23 @@ static const struct evex { { { 0xc2 }, 3, T, R, pfx_f3, W0, LIG }, /* vcmpsh */ { { 0xce }, 3, T, R, pfx_66, W1, Ln }, /* vgf2p8affineqb */ { { 0xcf }, 3, T, R, pfx_66, W1, Ln }, /* vgf2p8affineinvqb */ +}, evex_map5[] = { + { { 0x2e }, 2, T, R, pfx_no, W0, LIG }, /* vucomish */ + { { 0x2f }, 2, T, R, pfx_no, W0, LIG }, /* vcomish */ + { { 0x51 }, 2, T, R, pfx_no, W0, Ln }, /* vsqrtph */ + { { 0x51 }, 2, T, R, pfx_f3, W0, LIG }, /* vsqrtsh */ + { { 0x58 }, 2, T, R, pfx_no, W0, Ln }, /* vaddph */ + { { 0x58 }, 2, T, R, pfx_f3, W0, LIG }, /* vaddsh */ + { { 0x59 }, 2, T, R, pfx_no, W0, Ln }, /* vmulph */ + { { 0x59 }, 2, T, R, pfx_f3, W0, LIG }, /* vmulsh */ + { { 0x5c }, 2, T, R, pfx_no, W0, Ln }, /* vsubph */ + { { 0x5c }, 2, T, R, pfx_f3, W0, LIG }, /* vsubsh */ + { { 0x5d }, 2, T, R, pfx_no, W0, Ln }, /* vminph */ + { { 0x5d }, 2, T, R, pfx_f3, W0, LIG }, /* vminsh */ + { { 0x5e }, 2, T, R, pfx_no, W0, Ln }, /* vdivph */ + { { 0x5e }, 2, T, R, pfx_f3, W0, LIG }, /* vdivsh */ + { { 0x5f }, 2, T, R, pfx_no, W0, Ln }, /* vmaxph */ + { { 0x5f }, 2, T, R, pfx_f3, W0, LIG }, /* vmaxsh */ }; static const struct { @@ -2053,6 +2070,8 @@ static const struct { { evex_0f, ARRAY_SIZE(evex_0f) }, { evex_0f38, ARRAY_SIZE(evex_0f38) }, { evex_0f3a, ARRAY_SIZE(evex_0f3a) }, + { NULL, 0 }, + { evex_map5, ARRAY_SIZE(evex_map5) }, }; #undef Wn diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 13d71bd7e1..7d97c9ecb0 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -1208,9 +1208,22 @@ int x86emul_decode(struct x86_emulate_state *s, opcode |= MASK_INSR(0x0f3a, X86EMUL_OPC_EXT_MASK); d = twobyte_table[0x3a].desc; break; + + case evex_map5: + if ( !evex_encoded() ) + { default: - rc = X86EMUL_UNRECOGNIZED; - goto done; + rc = X86EMUL_UNRECOGNIZED; + goto done; + } + opcode |= MASK_INSR(5, X86EMUL_OPC_EXT_MASK); + /* + * Re-use twobyte_table[] here, for the similarity of + * the entries valid in map 5. + */ + d = twobyte_table[b].desc; + s->simd_size = twobyte_table[b].size ?: simd_other; + break; } } else if ( s->ext < ext_8f08 + ARRAY_SIZE(xop_table) ) @@ -1432,6 +1445,25 @@ int x86emul_decode(struct x86_emulate_state *s, } break; + case ext_map5: + switch ( b ) + { + default: + if ( !(s->evex.pfx & VEX_PREFIX_DOUBLE_MASK) ) + s->fp16 = true; + break; + + case 0x2e: case 0x2f: /* v{,u}comish */ + if ( !s->evex.pfx ) + s->fp16 = true; + s->simd_size = simd_none; + break; + } + + /* Like above re-use twobyte_table[] here. */ + disp8scale = decode_disp8scale(twobyte_table[b].d8s, s); + break; + case ext_8f09: if ( ext8f09_table[b].two_op ) d |= TwoOp; @@ -1650,6 +1682,7 @@ int x86emul_decode(struct x86_emulate_state *s, s->simd_size = ext8f08_table[b].simd_size; break; + case ext_map5: case ext_8f09: case ext_8f0a: break; diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 3644b5fbee..8775c7019f 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -183,6 +183,7 @@ enum vex_opcx { vex_0f = vex_none + 1, vex_0f38, vex_0f3a, + evex_map5 = 5, }; enum vex_pfx { @@ -211,8 +212,8 @@ union vex { union evex { uint8_t raw[3]; struct { /* SDM names */ - uint8_t opcx:2; /* mm */ - uint8_t mbz:2; + uint8_t opcx:3; /* mmm */ + uint8_t mbz:1; uint8_t R:1; /* R' */ uint8_t b:1; /* B */ uint8_t x:1; /* X */ @@ -237,6 +238,7 @@ struct x86_emulate_state { ext_0f = vex_0f, ext_0f38 = vex_0f38, ext_0f3a = vex_0f3a, + ext_map5 = evex_map5, /* * For XOP use values such that the respective instruction field * can be used without adjustment. diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5f1c439346..09f1f9ace5 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3723,6 +3723,13 @@ x86_emulate( ASSERT(!state->simd_size); break; +#ifndef X86EMUL_NO_SIMD + + case X86EMUL_OPC_EVEX(5, 0x2e): /* vucomish xmm/m16,xmm */ + case X86EMUL_OPC_EVEX(5, 0x2f): /* vcomish xmm/m16,xmm */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + /* fall through */ CASE_SIMD_PACKED_FP(_EVEX, 0x0f, 0x2e): /* vucomis{s,d} xmm/mem,xmm */ CASE_SIMD_PACKED_FP(_EVEX, 0x0f, 0x2f): /* vcomis{s,d} xmm/mem,xmm */ generate_exception_if((evex.reg != 0xf || !evex.RX || evex.opmsk || @@ -3735,9 +3742,11 @@ x86_emulate( get_fpu(X86EMUL_FPU_zmm); opc = init_evex(stub); - op_bytes = 4 << evex.w; + op_bytes = 2 << (!state->fp16 + evex.w); goto vcomi; +#endif + case X86EMUL_OPC(0x0f, 0x30): /* wrmsr */ generate_exception_if(!mode_ring0(), X86_EXC_GP, 0); fail_if(ops->write_msr == NULL); @@ -7739,6 +7748,20 @@ x86_emulate( #ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_F3(5, 0x51): /* vsqrtsh xmm/m16,xmm,xmm{k} */ + d &= ~TwoOp; + /* fall through */ + case X86EMUL_OPC_EVEX(5, 0x51): /* vsqrtph [xyz]mm/mem,[xyz]mm{k} */ + CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x58): /* vadd{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x59): /* vmul{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x5c): /* vsub{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x5d): /* vmin{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x5e): /* vdiv{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x5f): /* vmax{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + goto avx512f_all_fp; + case X86EMUL_OPC_XOP(08, 0x85): /* vpmacssww xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x86): /* vpmacsswd xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x87): /* vpmacssdql xmm,xmm/m128,xmm,xmm */ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 6afbc877f1..a0ed6f050b 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -610,6 +610,7 @@ struct x86_emulate_ctxt * 0x0fxxxx for 0f-prefixed opcodes (or their VEX/EVEX equivalents) * 0x0f38xxxx for 0f38-prefixed opcodes (or their VEX/EVEX equivalents) * 0x0f3axxxx for 0f3a-prefixed opcodes (or their VEX/EVEX equivalents) + * 0x5xxxx for Map5 opcodes (EVEX only) * 0x8f08xxxx for 8f/8-prefixed XOP opcodes * 0x8f09xxxx for 8f/9-prefixed XOP opcodes * 0x8f0axxxx for 8f/a-prefixed XOP opcodes -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544012.849450 (Exim 4.92) (envelope-from ) id 1q6STV-0008P1-UM; Tue, 06 Jun 2023 08:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544012.849450; Tue, 06 Jun 2023 08:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STV-0008Ot-Ro; Tue, 06 Jun 2023 08:55:33 +0000 Received: by outflank-mailman (input) for mailman id 544012; Tue, 06 Jun 2023 08:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STU-0008Og-BM for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STU-0005xV-Ab for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6STU-0000qX-8w for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=HunPUiyShff0p42lwAEXDxuoD8/lLjGLXmn1aXMxBkw=; b=aYSoKx41uLgQz4EGSp0jyiUpqX q3yVPI0Aqgl1qQ5GnGZ9KMERIgmR3NqNeko+leJNKktixcUASJXxPa5CfagsfNkWZZtqVgYpSTpef isaI0XTUJRNMsaEbvWeSA+xD+MrGg47KZJV55YP1rsG/qpMykj/Dr15dGbnE3wuNBrh0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 move insns Message-Id: Date: Tue, 06 Jun 2023 08:55:32 +0000 commit da2e0057c7e6ca3e449ae840839b83798c7d15c7 Author: Jan Beulich AuthorDate: Mon Jun 5 14:57:10 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:57:10 2023 +0200 x86emul: handle AVX512-FP16 move insns Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 8 ++++ tools/tests/x86_emulator/predicates.c | 4 ++ tools/tests/x86_emulator/test_x86_emulator.c | 70 ++++++++++++++++++++++++++++ xen/arch/x86/x86_emulate/decode.c | 11 ++++- xen/arch/x86/x86_emulate/x86_emulate.c | 21 ++++++++- 5 files changed, 112 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index f526321198..d0159199f8 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -622,6 +622,8 @@ static const struct test avx512_fp16_all[] = { INSN(maxsh, f3, map5, 5f, el, fp16, el), INSN(minph, , map5, 5d, vl, fp16, vl), INSN(minsh, f3, map5, 5d, el, fp16, el), + INSN(movsh, f3, map5, 10, el, fp16, el), + INSN(movsh, f3, map5, 11, el, fp16, el), INSN(mulph, , map5, 59, vl, fp16, vl), INSN(mulsh, f3, map5, 59, el, fp16, el), INSN(reduceph, , 0f3a, 56, vl, fp16, vl), @@ -635,6 +637,11 @@ static const struct test avx512_fp16_all[] = { INSN(ucomish, , map5, 2e, el, fp16, el), }; +static const struct test avx512_fp16_128[] = { + INSN(movw, 66, map5, 6e, el, fp16, el), + INSN(movw, 66, map5, 7e, el, fp16, el), +}; + static const struct test gfni_all[] = { INSN(gf2p8affineinvqb, 66, 0f3a, cf, vl, q, vl), INSN(gf2p8affineqb, 66, 0f3a, ce, vl, q, vl), @@ -1039,6 +1046,7 @@ void evex_disp8_test(void *instr, struct x86_emulate_ctxt *ctxt, RUN(avx512_vp2intersect, all); RUN(avx512_vpopcntdq, all); RUN(avx512_fp16, all); + RUN(avx512_fp16, 128); if ( cpu_has_avx512f ) { diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 746bc2dec1..9a44195458 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2045,6 +2045,8 @@ static const struct evex { { { 0xce }, 3, T, R, pfx_66, W1, Ln }, /* vgf2p8affineqb */ { { 0xcf }, 3, T, R, pfx_66, W1, Ln }, /* vgf2p8affineinvqb */ }, evex_map5[] = { + { { 0x10 }, 2, T, R, pfx_f3, W0, LIG }, /* vmovsh */ + { { 0x11 }, 2, T, W, pfx_f3, W0, LIG }, /* vmovsh */ { { 0x2e }, 2, T, R, pfx_no, W0, LIG }, /* vucomish */ { { 0x2f }, 2, T, R, pfx_no, W0, LIG }, /* vcomish */ { { 0x51 }, 2, T, R, pfx_no, W0, Ln }, /* vsqrtph */ @@ -2061,6 +2063,8 @@ static const struct evex { { { 0x5e }, 2, T, R, pfx_f3, W0, LIG }, /* vdivsh */ { { 0x5f }, 2, T, R, pfx_no, W0, Ln }, /* vmaxph */ { { 0x5f }, 2, T, R, pfx_f3, W0, LIG }, /* vmaxsh */ + { { 0x6e }, 2, T, R, pfx_66, WIG, L0 }, /* vmovw */ + { { 0x7e }, 2, T, W, pfx_66, WIG, L0 }, /* vmovw */ }; static const struct { diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index c0d908cc4f..bbb0d67a3b 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -5173,6 +5173,76 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing vmovsh 8(%ecx),%xmm5..."); + if ( stack_exec && cpu_has_avx512_fp16 ) + { + decl_insn(vmovsh_from_mem); + decl_insn(vmovw_to_gpr); + + asm volatile ( "vpcmpeqw %%ymm5, %%ymm5, %%ymm5\n\t" + put_insn(vmovsh_from_mem, + /* vmovsh 8(%0), %%xmm5 */ + ".byte 0x62, 0xf5, 0x7e, 0x08\n\t" + ".byte 0x10, 0x69, 0x04") + :: "c" (NULL) ); + + set_insn(vmovsh_from_mem); + res[2] = 0x3c00bc00; + regs.ecx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || !check_eip(vmovsh_from_mem) ) + goto fail; + asm volatile ( "kmovw %2, %%k1\n\t" + "vmovdqu16 %1, %%zmm4%{%%k1%}%{z%}\n\t" + "vpcmpeqw %%zmm4, %%zmm5, %%k0\n\t" + "kmovw %%k0, %0" + : "=g" (rc) + : "m" (res[2]), "r" (1) ); + if ( rc != 0xffff ) + goto fail; + printf("okay\n"); + + printf("%-40s", "Testing vmovsh %xmm4,2(%eax){%k3}..."); + memset(res, ~0, 8); + res[2] = 0xbc00ffff; + memset(res + 3, ~0, 8); + regs.eax = (unsigned long)res; + regs.ecx = ~0; + for ( i = 0; i < 2; ++i ) + { + decl_insn(vmovsh_to_mem); + + asm volatile ( "kmovw %1, %%k3\n\t" + put_insn(vmovsh_to_mem, + /* vmovsh %%xmm4, 2(%0)%{%%k3%} */ + ".byte 0x62, 0xf5, 0x7e, 0x0b\n\t" + ".byte 0x11, 0x60, 0x01") + :: "a" (NULL), "r" (i) ); + + set_insn(vmovsh_to_mem); + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || !check_eip(vmovsh_to_mem) || + memcmp(res, res + 3 - i, 8) ) + goto fail; + } + printf("okay\n"); + + printf("%-40s", "Testing vmovw %xmm5,%ecx..."); + asm volatile ( put_insn(vmovw_to_gpr, + /* vmovw %%xmm5, %0 */ + ".byte 0x62, 0xf5, 0x7d, 0x08\n\t" + ".byte 0x7e, 0xe9") + :: "c" (NULL) ); + set_insn(vmovw_to_gpr); + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || !check_eip(vmovw_to_gpr) || + regs.ecx != 0xbc00 ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing invpcid 16(%ecx),%%edx..."); if ( stack_exec ) { diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 7d97c9ecb0..b0a70340c9 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -575,7 +575,7 @@ static unsigned int decode_disp8scale(enum disp8scale scale, break; case d8s_dq64: - return 2 + (s->op_bytes == 8); + return 1 + !s->fp16 + (s->op_bytes == 8); } switch ( s->simd_size ) @@ -1458,6 +1458,15 @@ int x86emul_decode(struct x86_emulate_state *s, s->fp16 = true; s->simd_size = simd_none; break; + + case 0x6e: /* vmovw r/m16, xmm */ + d = (d & ~SrcMask) | SrcMem16; + /* fall through */ + case 0x7e: /* vmovw xmm, r/m16 */ + if ( s->evex.pfx == vex_66 ) + s->fp16 = true; + s->simd_size = simd_none; + break; } /* Like above re-use twobyte_table[] here. */ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 09f1f9ace5..fa3406ee91 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4357,6 +4357,15 @@ x86_emulate( #ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(5, 0x7e): /* vmovw xmm,r/m16 */ + ASSERT(dst.bytes >= 4); + if ( dst.type == OP_MEM ) + dst.bytes = 2; + /* fall through */ + case X86EMUL_OPC_EVEX_66(5, 0x6e): /* vmovw r/m16,xmm */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + /* fall through */ case X86EMUL_OPC_EVEX_66(0x0f, 0x6e): /* vmov{d,q} r/m,xmm */ case X86EMUL_OPC_EVEX_66(0x0f, 0x7e): /* vmov{d,q} xmm,r/m */ generate_exception_if((evex.lr || evex.opmsk || evex.brs || @@ -7748,8 +7757,18 @@ x86_emulate( #ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_F3(5, 0x10): /* vmovsh m16,xmm{k} */ + /* vmovsh xmm,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_F3(5, 0x11): /* vmovsh xmm,m16{k} */ + /* vmovsh xmm,xmm,xmm{k} */ + generate_exception_if(evex.brs, X86_EXC_UD); + if ( ea.type == OP_MEM ) + d |= TwoOp; + else + { case X86EMUL_OPC_EVEX_F3(5, 0x51): /* vsqrtsh xmm/m16,xmm,xmm{k} */ - d &= ~TwoOp; + d &= ~TwoOp; + } /* fall through */ case X86EMUL_OPC_EVEX(5, 0x51): /* vsqrtph [xyz]mm/mem,[xyz]mm{k} */ CASE_SIMD_SINGLE_FP(_EVEX, 5, 0x58): /* vadd{p,s}h [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:55:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544013.849455 (Exim 4.92) (envelope-from ) id 1q6STe-0008Rf-Vt; Tue, 06 Jun 2023 08:55:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544013.849455; Tue, 06 Jun 2023 08:55:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STe-0008RX-TG; Tue, 06 Jun 2023 08:55:42 +0000 Received: by outflank-mailman (input) for mailman id 544013; Tue, 06 Jun 2023 08:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STe-0008RN-FJ for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STe-0005xg-EP for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6STe-0000qw-Da for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=+ruPh5BijkvY8N1W1wcmJeZ2V+RrAIF2id1RvP1wEmY=; b=Giv6Mv0y4vw6Lx05KNM0b+ebXC /dllJgkWngftMtPZ8RFKR6PPbFNW7P5X1loQO4q8Px3tFgR/WKjLG+nOhxO5onTGgu61ZuJHa78rI 9odvT5b4refEEzQ+di76VZhynifE6yW5NvukWki8O/WK3gpuo/GudKtNWVYyJpfwSm3A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 fma-like insns Message-Id: Date: Tue, 06 Jun 2023 08:55:42 +0000 commit 67d458c84a93413e52662d00f1c5434f3c58e088 Author: Jan Beulich AuthorDate: Mon Jun 5 14:57:47 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:57:47 2023 +0200 x86emul: handle AVX512-FP16 fma-like insns The Map6 encoding space is a very sparse clone of the "0f38" one. Once again re-use that table, as the entries corresponding to invalid opcodes in Map6 are simply benign with simd_size forced to other than simd_none (preventing undue memory reads in SrcMem handling early in x86_emulate()). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 30 ++++++++++++++++++++++++ tools/tests/x86_emulator/predicates.c | 32 +++++++++++++++++++++++++ xen/arch/x86/x86_emulate/decode.c | 37 +++++++++++++++++++++++++++++ xen/arch/x86/x86_emulate/private.h | 2 ++ xen/arch/x86/x86_emulate/x86_emulate.c | 43 ++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_emulate/x86_emulate.h | 1 + 6 files changed, 145 insertions(+) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index d0159199f8..de4daddc5f 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -614,6 +614,36 @@ static const struct test avx512_fp16_all[] = { INSN(comish, , map5, 2f, el, fp16, el), INSN(divph, , map5, 5e, vl, fp16, vl), INSN(divsh, f3, map5, 5e, el, fp16, el), + INSN(fmadd132ph, 66, map6, 98, vl, fp16, vl), + INSN(fmadd132sh, 66, map6, 99, el, fp16, el), + INSN(fmadd213ph, 66, map6, a8, vl, fp16, vl), + INSN(fmadd213sh, 66, map6, a9, el, fp16, el), + INSN(fmadd231ph, 66, map6, b8, vl, fp16, vl), + INSN(fmadd231sh, 66, map6, b9, el, fp16, el), + INSN(fmaddsub132ph, 66, map6, 96, vl, fp16, vl), + INSN(fmaddsub213ph, 66, map6, a6, vl, fp16, vl), + INSN(fmaddsub231ph, 66, map6, b6, vl, fp16, vl), + INSN(fmsub132ph, 66, map6, 9a, vl, fp16, vl), + INSN(fmsub132sh, 66, map6, 9b, el, fp16, el), + INSN(fmsub213ph, 66, map6, aa, vl, fp16, vl), + INSN(fmsub213sh, 66, map6, ab, el, fp16, el), + INSN(fmsub231ph, 66, map6, ba, vl, fp16, vl), + INSN(fmsub231sh, 66, map6, bb, el, fp16, el), + INSN(fmsubadd132ph, 66, map6, 97, vl, fp16, vl), + INSN(fmsubadd213ph, 66, map6, a7, vl, fp16, vl), + INSN(fmsubadd231ph, 66, map6, b7, vl, fp16, vl), + INSN(fnmadd132ph, 66, map6, 9c, vl, fp16, vl), + INSN(fnmadd132sh, 66, map6, 9d, el, fp16, el), + INSN(fnmadd213ph, 66, map6, ac, vl, fp16, vl), + INSN(fnmadd213sh, 66, map6, ad, el, fp16, el), + INSN(fnmadd231ph, 66, map6, bc, vl, fp16, vl), + INSN(fnmadd231sh, 66, map6, bd, el, fp16, el), + INSN(fnmsub132ph, 66, map6, 9e, vl, fp16, vl), + INSN(fnmsub132sh, 66, map6, 9f, el, fp16, el), + INSN(fnmsub213ph, 66, map6, ae, vl, fp16, vl), + INSN(fnmsub213sh, 66, map6, af, el, fp16, el), + INSN(fnmsub231ph, 66, map6, be, vl, fp16, vl), + INSN(fnmsub231sh, 66, map6, bf, el, fp16, el), INSN(fpclassph, , 0f3a, 66, vl, fp16, vl), INSN(fpclasssh, , 0f3a, 67, el, fp16, el), INSN(getmantph, , 0f3a, 26, vl, fp16, vl), diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 9a44195458..2fff04635e 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2065,6 +2065,37 @@ static const struct evex { { { 0x5f }, 2, T, R, pfx_f3, W0, LIG }, /* vmaxsh */ { { 0x6e }, 2, T, R, pfx_66, WIG, L0 }, /* vmovw */ { { 0x7e }, 2, T, W, pfx_66, WIG, L0 }, /* vmovw */ +}, evex_map6[] = { + { { 0x96 }, 2, T, R, pfx_66, W0, Ln }, /* vfmaddsub132ph */ + { { 0x97 }, 2, T, R, pfx_66, W0, Ln }, /* vfmsubadd132ph */ + { { 0x98 }, 2, T, R, pfx_66, W0, Ln }, /* vfmadd132ph */ + { { 0x99 }, 2, T, R, pfx_66, W0, LIG }, /* vfmadd132sh */ + { { 0x9a }, 2, T, R, pfx_66, W0, Ln }, /* vfmsub132ph */ + { { 0x9b }, 2, T, R, pfx_66, W0, LIG }, /* vfmsub132sh */ + { { 0x9c }, 2, T, R, pfx_66, W0, Ln }, /* vfnmadd132ph */ + { { 0x9d }, 2, T, R, pfx_66, W0, LIG }, /* vfnmadd132sh */ + { { 0x9e }, 2, T, R, pfx_66, W0, Ln }, /* vfnmsub132ph */ + { { 0x9f }, 2, T, R, pfx_66, W0, LIG }, /* vfnmsub132sh */ + { { 0xa6 }, 2, T, R, pfx_66, W0, Ln }, /* vfmaddsub213ph */ + { { 0xa7 }, 2, T, R, pfx_66, W0, Ln }, /* vfmsubadd213ph */ + { { 0xa8 }, 2, T, R, pfx_66, W0, Ln }, /* vfmadd213ph */ + { { 0xa9 }, 2, T, R, pfx_66, W0, LIG }, /* vfmadd213sh */ + { { 0xaa }, 2, T, R, pfx_66, W0, Ln }, /* vfmsub213ph */ + { { 0xab }, 2, T, R, pfx_66, W0, LIG }, /* vfmsub213sh */ + { { 0xac }, 2, T, R, pfx_66, W0, Ln }, /* vfnmadd213ph */ + { { 0xad }, 2, T, R, pfx_66, W0, LIG }, /* vfnmadd213sh */ + { { 0xae }, 2, T, R, pfx_66, W0, Ln }, /* vfnmsub213ph */ + { { 0xaf }, 2, T, R, pfx_66, W0, LIG }, /* vfnmsub213sh */ + { { 0xb6 }, 2, T, R, pfx_66, W0, Ln }, /* vfmaddsub231ph */ + { { 0xb7 }, 2, T, R, pfx_66, W0, Ln }, /* vfmsubadd231ph */ + { { 0xb8 }, 2, T, R, pfx_66, W0, Ln }, /* vfmadd231ph */ + { { 0xb9 }, 2, T, R, pfx_66, W0, LIG }, /* vfmadd231sh */ + { { 0xba }, 2, T, R, pfx_66, W0, Ln }, /* vfmsub231ph */ + { { 0xbb }, 2, T, R, pfx_66, W0, LIG }, /* vfmsub231sh */ + { { 0xbc }, 2, T, R, pfx_66, W0, Ln }, /* vfnmadd231ph */ + { { 0xbd }, 2, T, R, pfx_66, W0, LIG }, /* vfnmadd231sh */ + { { 0xbe }, 2, T, R, pfx_66, W0, Ln }, /* vfnmsub231ph */ + { { 0xbf }, 2, T, R, pfx_66, W0, LIG }, /* vfnmsub231sh */ }; static const struct { @@ -2076,6 +2107,7 @@ static const struct { { evex_0f3a, ARRAY_SIZE(evex_0f3a) }, { NULL, 0 }, { evex_map5, ARRAY_SIZE(evex_map5) }, + { evex_map6, ARRAY_SIZE(evex_map6) }, }; #undef Wn diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index b0a70340c9..9f68ac299d 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -1224,6 +1224,20 @@ int x86emul_decode(struct x86_emulate_state *s, d = twobyte_table[b].desc; s->simd_size = twobyte_table[b].size ?: simd_other; break; + + case evex_map6: + if ( !evex_encoded() ) + { + rc = X86EMUL_UNRECOGNIZED; + goto done; + } + opcode |= MASK_INSR(6, X86EMUL_OPC_EXT_MASK); + /* + * Re-use twobyte_table[]'s 0x38 entry here, for the + * similarity of the 0F38 entries with map 6. + */ + d = twobyte_table[0x38].desc; + break; } } else if ( s->ext < ext_8f08 + ARRAY_SIZE(xop_table) ) @@ -1473,6 +1487,28 @@ int x86emul_decode(struct x86_emulate_state *s, disp8scale = decode_disp8scale(twobyte_table[b].d8s, s); break; + case ext_map6: + /* + * Re-use ext0f38_table[] here, for the similarity of the entries + * valid in map 6. + */ + d = ext0f38_table[b].to_mem ? DstMem | SrcReg + : DstReg | SrcMem; + if ( ext0f38_table[b].two_op ) + d |= TwoOp; + s->simd_size = ext0f38_table[b].simd_size ?: simd_other; + + switch ( b ) + { + default: + if ( s->evex.pfx == vex_66 ) + s->fp16 = true; + break; + } + + disp8scale = decode_disp8scale(ext0f38_table[b].d8s, s); + break; + case ext_8f09: if ( ext8f09_table[b].two_op ) d |= TwoOp; @@ -1692,6 +1728,7 @@ int x86emul_decode(struct x86_emulate_state *s, break; case ext_map5: + case ext_map6: case ext_8f09: case ext_8f0a: break; diff --git a/xen/arch/x86/x86_emulate/private.h b/xen/arch/x86/x86_emulate/private.h index 8775c7019f..719dad59cd 100644 --- a/xen/arch/x86/x86_emulate/private.h +++ b/xen/arch/x86/x86_emulate/private.h @@ -184,6 +184,7 @@ enum vex_opcx { vex_0f38, vex_0f3a, evex_map5 = 5, + evex_map6, }; enum vex_pfx { @@ -239,6 +240,7 @@ struct x86_emulate_state { ext_0f38 = vex_0f38, ext_0f3a = vex_0f3a, ext_map5 = evex_map5, + ext_map6 = evex_map6, /* * For XOP use values such that the respective instruction field * can be used without adjustment. diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index fa3406ee91..8fb695c464 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7781,6 +7781,49 @@ x86_emulate( generate_exception_if(evex.w, X86_EXC_UD); goto avx512f_all_fp; + case X86EMUL_OPC_EVEX_66(6, 0x96): /* vfmaddsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x97): /* vfmsubadd132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x98): /* vfmadd132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x9a): /* vfmsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x9c): /* vfnmadd132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x9e): /* vfnmsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xa6): /* vfmaddsub213ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xa7): /* vfmsubadd213ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xa8): /* vfmadd213ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xaa): /* vfmsub213ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xac): /* vfnmadd213ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xae): /* vfnmsub213ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xb6): /* vfmaddsub231ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xb7): /* vfmsubadd231ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xb8): /* vfmadd231ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xba): /* vfmsub231ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xbc): /* vfnmadd231ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xbe): /* vfnmsub231ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + if ( ea.type != OP_REG || !evex.brs ) + avx512_vlen_check(false); + goto simd_zmm; + + case X86EMUL_OPC_EVEX_66(6, 0x99): /* vfmadd132sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x9b): /* vfmsub132sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x9d): /* vfnmadd132sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x9f): /* vfnmsub132sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xa9): /* vfmadd213sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xab): /* vfmsub213sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xad): /* vfnmadd213sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xaf): /* vfnmsub213sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xb9): /* vfmadd231sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xbb): /* vfmsub231sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xbd): /* vfnmadd231sh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0xbf): /* vfnmsub231sh xmm/m16,xmm,xmm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w || (ea.type != OP_REG && evex.brs), + X86_EXC_UD); + if ( !evex.brs ) + avx512_vlen_check(true); + goto simd_zmm; + case X86EMUL_OPC_XOP(08, 0x85): /* vpmacssww xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x86): /* vpmacsswd xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x87): /* vpmacssdql xmm,xmm/m128,xmm,xmm */ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index a0ed6f050b..40d5054fb7 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -611,6 +611,7 @@ struct x86_emulate_ctxt * 0x0f38xxxx for 0f38-prefixed opcodes (or their VEX/EVEX equivalents) * 0x0f3axxxx for 0f3a-prefixed opcodes (or their VEX/EVEX equivalents) * 0x5xxxx for Map5 opcodes (EVEX only) + * 0x6xxxx for Map6 opcodes (EVEX only) * 0x8f08xxxx for 8f/8-prefixed XOP opcodes * 0x8f09xxxx for 8f/9-prefixed XOP opcodes * 0x8f0axxxx for 8f/a-prefixed XOP opcodes -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:55:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:55:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544014.849459 (Exim 4.92) (envelope-from ) id 1q6STp-0008Uj-1L; Tue, 06 Jun 2023 08:55:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544014.849459; Tue, 06 Jun 2023 08:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STo-0008Ub-Up; Tue, 06 Jun 2023 08:55:52 +0000 Received: by outflank-mailman (input) for mailman id 544014; Tue, 06 Jun 2023 08:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STo-0008UV-J3 for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STo-0005xt-IK for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6STo-0000rW-HI for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vvSN9aq16ovKwMDBfLce9V4dXS4hWNG+J5wogfbFsKY=; b=3YzpOtDlv9tKfwdImBPRqYza2A yF0SD6MDDAoUGi6/liddX/d2hjbD7BEC4A0lKbMJOweUhhuedJw5jBoKe6gdJ4D28AAYYPfw6W00X vLGcwHRk+D87XhA0jDNpb6wHNHF3m284gsm1WEjuqE1jIm+ZF0RYokSsBixVFyvR/fgo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 Map6 misc insns Message-Id: Date: Tue, 06 Jun 2023 08:55:52 +0000 commit 520f0acc7ad104ebb5c5a6e2e575c204f7ba6248 Author: Jan Beulich AuthorDate: Mon Jun 5 14:58:25 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:58:25 2023 +0200 x86emul: handle AVX512-FP16 Map6 misc insns While, as before, this leverages that the Map6 encoding space is a very sparse clone of the "0f38" one, switch around the simd_size overriding for opcode 2D. This way fewer separate overrides are needed. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 8 ++++++++ tools/tests/x86_emulator/predicates.c | 8 ++++++++ xen/arch/x86/x86_emulate/decode.c | 6 +++--- xen/arch/x86/x86_emulate/x86_emulate.c | 17 +++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index de4daddc5f..137b88a325 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -646,6 +646,8 @@ static const struct test avx512_fp16_all[] = { INSN(fnmsub231sh, 66, map6, bf, el, fp16, el), INSN(fpclassph, , 0f3a, 66, vl, fp16, vl), INSN(fpclasssh, , 0f3a, 67, el, fp16, el), + INSN(getexpph, 66, map6, 42, vl, fp16, vl), + INSN(getexpsh, 66, map6, 43, el, fp16, el), INSN(getmantph, , 0f3a, 26, vl, fp16, vl), INSN(getmantsh, , 0f3a, 27, el, fp16, el), INSN(maxph, , map5, 5f, vl, fp16, vl), @@ -656,10 +658,16 @@ static const struct test avx512_fp16_all[] = { INSN(movsh, f3, map5, 11, el, fp16, el), INSN(mulph, , map5, 59, vl, fp16, vl), INSN(mulsh, f3, map5, 59, el, fp16, el), + INSN(rcpph, 66, map6, 4c, vl, fp16, vl), + INSN(rcpsh, 66, map6, 4d, el, fp16, el), INSN(reduceph, , 0f3a, 56, vl, fp16, vl), INSN(reducesh, , 0f3a, 57, el, fp16, el), INSN(rndscaleph, , 0f3a, 08, vl, fp16, vl), INSN(rndscalesh, , 0f3a, 0a, el, fp16, el), + INSN(rsqrtph, 66, map6, 4e, vl, fp16, vl), + INSN(rsqrtsh, 66, map6, 4f, el, fp16, el), + INSN(scalefph, 66, map6, 2c, vl, fp16, vl), + INSN(scalefsh, 66, map6, 2d, el, fp16, el), INSN(sqrtph, , map5, 51, vl, fp16, vl), INSN(sqrtsh, f3, map5, 51, el, fp16, el), INSN(subph, , map5, 5c, vl, fp16, vl), diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 2fff04635e..a9d0a2af12 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2066,6 +2066,14 @@ static const struct evex { { { 0x6e }, 2, T, R, pfx_66, WIG, L0 }, /* vmovw */ { { 0x7e }, 2, T, W, pfx_66, WIG, L0 }, /* vmovw */ }, evex_map6[] = { + { { 0x2c }, 2, T, R, pfx_66, W0, Ln }, /* vscalefph */ + { { 0x2d }, 2, T, R, pfx_66, W0, LIG }, /* vscalefsh */ + { { 0x42 }, 2, T, R, pfx_66, W0, Ln }, /* vgetexpph */ + { { 0x43 }, 2, T, R, pfx_66, W0, LIG }, /* vgetexpsh */ + { { 0x4c }, 2, T, R, pfx_66, W0, Ln }, /* vrcpph */ + { { 0x4d }, 2, T, R, pfx_66, W0, LIG }, /* vrcpsh */ + { { 0x4e }, 2, T, R, pfx_66, W0, Ln }, /* vrsqrtph */ + { { 0x4f }, 2, T, R, pfx_66, W0, LIG }, /* vrsqrtsh */ { { 0x96 }, 2, T, R, pfx_66, W0, Ln }, /* vfmaddsub132ph */ { { 0x97 }, 2, T, R, pfx_66, W0, Ln }, /* vfmsubadd132ph */ { { 0x98 }, 2, T, R, pfx_66, W0, Ln }, /* vfmadd132ph */ diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 9f68ac299d..9d9bc75f3b 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -346,7 +346,7 @@ static const struct ext0f38_table { [0x2a] = { .simd_size = simd_packed_int, .two_op = 1, .d8s = d8s_vl }, [0x2b] = { .simd_size = simd_packed_int, .d8s = d8s_vl }, [0x2c] = { .simd_size = simd_packed_fp, .d8s = d8s_vl }, - [0x2d] = { .simd_size = simd_packed_fp, .d8s = d8s_dq }, + [0x2d] = { .simd_size = simd_scalar_vexw, .d8s = d8s_dq }, [0x2e ... 0x2f] = { .simd_size = simd_packed_fp, .to_mem = 1 }, [0x30] = { .simd_size = simd_other, .two_op = 1, .d8s = d8s_vl_by_2 }, [0x31] = { .simd_size = simd_other, .two_op = 1, .d8s = d8s_vl_by_4 }, @@ -899,8 +899,8 @@ decode_0f38(struct x86_emulate_state *s, ctxt->opcode |= MASK_INSR(s->vex.pfx, X86EMUL_OPC_PFX_MASK); break; - case X86EMUL_OPC_EVEX_66(0, 0x2d): /* vscalefs{s,d} */ - s->simd_size = simd_scalar_vexw; + case X86EMUL_OPC_VEX_66(0, 0x2d): /* vmaskmovpd */ + s->simd_size = simd_packed_fp; break; case X86EMUL_OPC_EVEX_66(0, 0x7a): /* vpbroadcastb */ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8fb695c464..905a3dc432 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7781,6 +7781,8 @@ x86_emulate( generate_exception_if(evex.w, X86_EXC_UD); goto avx512f_all_fp; + case X86EMUL_OPC_EVEX_66(6, 0x2c): /* vscalefph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x42): /* vgetexpph [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x96): /* vfmaddsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x97): /* vfmsubadd132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x98): /* vfmadd132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ @@ -7805,6 +7807,8 @@ x86_emulate( avx512_vlen_check(false); goto simd_zmm; + case X86EMUL_OPC_EVEX_66(6, 0x2d): /* vscalefsh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x43): /* vgetexpsh xmm/m16,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x99): /* vfmadd132sh xmm/m16,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x9b): /* vfmsub132sh xmm/m16,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x9d): /* vfnmadd132sh xmm/m16,xmm,xmm{k} */ @@ -7824,6 +7828,19 @@ x86_emulate( avx512_vlen_check(true); goto simd_zmm; + case X86EMUL_OPC_EVEX_66(6, 0x4c): /* vrcpph [xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x4e): /* vrsqrtph [xyz]mm/mem,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + goto avx512f_no_sae; + + case X86EMUL_OPC_EVEX_66(6, 0x4d): /* vrcpsh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_66(6, 0x4f): /* vrsqrtsh xmm/m16,xmm,xmm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w || evex.brs, X86_EXC_UD); + avx512_vlen_check(true); + goto simd_zmm; + case X86EMUL_OPC_XOP(08, 0x85): /* vpmacssww xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x86): /* vpmacsswd xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x87): /* vpmacssdql xmm,xmm/m128,xmm,xmm */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:56:03 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:56:03 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544015.849463 (Exim 4.92) (envelope-from ) id 1q6STz-00006e-4d; Tue, 06 Jun 2023 08:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544015.849463; Tue, 06 Jun 2023 08:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STz-00006X-1p; Tue, 06 Jun 2023 08:56:03 +0000 Received: by outflank-mailman (input) for mailman id 544015; Tue, 06 Jun 2023 08:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STy-00006M-N0 for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6STy-0005yF-MA for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6STy-0000sM-LH for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=A2ijFJMXpIV6ITAI5FzNg3IpoE45AgFeoGz7lmYs84k=; b=S0c5lVCbT4gqtFJEQ5H9SECCL1 aSHO4BNA7+8vFovhAAXYAEu2/XNQ7j/aoUpWO7U9zBqT+/7UIs2fnDDUDoZkxlmnLfcEJxB7rEjd5 EQWK4K018cX/WqxvyJdRNjW+SAgHteBLOzGueQ+Hid7cQWMUFYOGYf1DHFfPgD6BxhjY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 complex multiplication insns Message-Id: Date: Tue, 06 Jun 2023 08:56:02 +0000 commit d14c52cba0f544774b49f38ecceef1eed6349628 Author: Jan Beulich AuthorDate: Mon Jun 5 14:59:36 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 14:59:36 2023 +0200 x86emul: handle AVX512-FP16 complex multiplication insns Aspects to consider are that these have 32-bit element size (pairs of FP16) and that there are restrictions on the registers valid to use. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 8 ++++++++ tools/tests/x86_emulator/predicates.c | 8 ++++++++ xen/arch/x86/x86_emulate/decode.c | 8 ++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index 137b88a325..b5329fcfc3 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -614,12 +614,18 @@ static const struct test avx512_fp16_all[] = { INSN(comish, , map5, 2f, el, fp16, el), INSN(divph, , map5, 5e, vl, fp16, vl), INSN(divsh, f3, map5, 5e, el, fp16, el), + INSNX(fcmaddcph, f2, map6, 56, 1, vl, d, vl), + INSNX(fcmaddcsh, f2, map6, 57, 1, el, d, el), + INSNX(fcmulcph, f2, map6, d6, 1, vl, d, vl), + INSNX(fcmulcsh, f2, map6, d7, 1, el, d, el), INSN(fmadd132ph, 66, map6, 98, vl, fp16, vl), INSN(fmadd132sh, 66, map6, 99, el, fp16, el), INSN(fmadd213ph, 66, map6, a8, vl, fp16, vl), INSN(fmadd213sh, 66, map6, a9, el, fp16, el), INSN(fmadd231ph, 66, map6, b8, vl, fp16, vl), INSN(fmadd231sh, 66, map6, b9, el, fp16, el), + INSNX(fmaddcph, f3, map6, 56, 1, vl, d, vl), + INSNX(fmaddcsh, f3, map6, 57, 1, el, d, el), INSN(fmaddsub132ph, 66, map6, 96, vl, fp16, vl), INSN(fmaddsub213ph, 66, map6, a6, vl, fp16, vl), INSN(fmaddsub231ph, 66, map6, b6, vl, fp16, vl), @@ -632,6 +638,8 @@ static const struct test avx512_fp16_all[] = { INSN(fmsubadd132ph, 66, map6, 97, vl, fp16, vl), INSN(fmsubadd213ph, 66, map6, a7, vl, fp16, vl), INSN(fmsubadd231ph, 66, map6, b7, vl, fp16, vl), + INSNX(fmulcph, f3, map6, d6, 1, vl, d, vl), + INSNX(fmulcsh, f3, map6, d7, 1, el, d, el), INSN(fnmadd132ph, 66, map6, 9c, vl, fp16, vl), INSN(fnmadd132sh, 66, map6, 9d, el, fp16, el), INSN(fnmadd213ph, 66, map6, ac, vl, fp16, vl), diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index a9d0a2af12..acbd32a5be 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2074,6 +2074,10 @@ static const struct evex { { { 0x4d }, 2, T, R, pfx_66, W0, LIG }, /* vrcpsh */ { { 0x4e }, 2, T, R, pfx_66, W0, Ln }, /* vrsqrtph */ { { 0x4f }, 2, T, R, pfx_66, W0, LIG }, /* vrsqrtsh */ + { { 0x56 }, 2, T, R, pfx_f3, W0, Ln }, /* vfmaddcph */ + { { 0x56 }, 2, T, R, pfx_f2, W0, Ln }, /* vfcmaddcph */ + { { 0x57 }, 2, T, R, pfx_f3, W0, LIG }, /* vfmaddcsh */ + { { 0x57 }, 2, T, R, pfx_f2, W0, LIG }, /* vfcmaddcsh */ { { 0x96 }, 2, T, R, pfx_66, W0, Ln }, /* vfmaddsub132ph */ { { 0x97 }, 2, T, R, pfx_66, W0, Ln }, /* vfmsubadd132ph */ { { 0x98 }, 2, T, R, pfx_66, W0, Ln }, /* vfmadd132ph */ @@ -2104,6 +2108,10 @@ static const struct evex { { { 0xbd }, 2, T, R, pfx_66, W0, LIG }, /* vfnmadd231sh */ { { 0xbe }, 2, T, R, pfx_66, W0, Ln }, /* vfnmsub231ph */ { { 0xbf }, 2, T, R, pfx_66, W0, LIG }, /* vfnmsub231sh */ + { { 0xd6 }, 2, T, R, pfx_f3, W0, Ln }, /* vfmulcph */ + { { 0xd6 }, 2, T, R, pfx_f2, W0, Ln }, /* vfcmulcph */ + { { 0xd7 }, 2, T, R, pfx_f3, W0, LIG }, /* vfmulcsh */ + { { 0xd7 }, 2, T, R, pfx_f2, W0, LIG }, /* vfcmulcsh */ }; static const struct { diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 9d9bc75f3b..aef64d9854 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -367,6 +367,8 @@ static const struct ext0f38_table { [0x4f] = { .simd_size = simd_scalar_vexw, .d8s = d8s_dq }, [0x50 ... 0x53] = { .simd_size = simd_packed_int, .d8s = d8s_vl }, [0x54 ... 0x55] = { .simd_size = simd_packed_int, .two_op = 1, .d8s = d8s_vl }, + [0x56] = { .simd_size = simd_other, .d8s = d8s_vl }, + [0x57] = { .simd_size = simd_scalar_vexw, .d8s = d8s_dq }, [0x58] = { .simd_size = simd_other, .two_op = 1, .d8s = 2 }, [0x59] = { .simd_size = simd_other, .two_op = 1, .d8s = 3 }, [0x5a] = { .simd_size = simd_128, .two_op = 1, .d8s = 4 }, @@ -431,6 +433,8 @@ static const struct ext0f38_table { [0xcc] = { .simd_size = simd_packed_fp, .two_op = 1, .d8s = d8s_vl }, [0xcd] = { .simd_size = simd_scalar_vexw, .d8s = d8s_dq }, [0xcf] = { .simd_size = simd_packed_int, .d8s = d8s_vl }, + [0xd6] = { .simd_size = simd_other, .d8s = d8s_vl }, + [0xd7] = { .simd_size = simd_scalar_vexw, .d8s = d8s_dq }, [0xdb] = { .simd_size = simd_packed_int, .two_op = 1 }, [0xdc ... 0xdf] = { .simd_size = simd_packed_int, .d8s = d8s_vl }, [0xf0] = { .two_op = 1 }, @@ -1504,6 +1508,10 @@ int x86emul_decode(struct x86_emulate_state *s, if ( s->evex.pfx == vex_66 ) s->fp16 = true; break; + + case 0x56: case 0x57: /* vf{,c}maddc{p,s}h */ + case 0xd6: case 0xd7: /* vf{,c}mulc{p,s}h */ + break; } disp8scale = decode_disp8scale(ext0f38_table[b].d8s, s); diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 905a3dc432..5c1ec668de 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7841,6 +7841,34 @@ x86_emulate( avx512_vlen_check(true); goto simd_zmm; + case X86EMUL_OPC_EVEX_F3(6, 0x56): /* vfmaddcph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_F2(6, 0x56): /* vfcmaddcph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_F3(6, 0xd6): /* vfmulcph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_F2(6, 0xd6): /* vfcmulcph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ + op_bytes = 16 << evex.lr; + /* fall through */ + case X86EMUL_OPC_EVEX_F3(6, 0x57): /* vfmaddcsh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_F2(6, 0x57): /* vfcmaddcsh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_F3(6, 0xd7): /* vfmulcsh xmm/m16,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX_F2(6, 0xd7): /* vfcmulcsh xmm/m16,xmm,xmm{k} */ + { + unsigned int src1 = ~evex.reg; + + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w || ((b & 1) && ea.type != OP_REG && evex.brs), + X86_EXC_UD); + if ( mode_64bit() ) + src1 = (src1 & 0xf) | (!evex.RX << 4); + else + src1 &= 7; + generate_exception_if(modrm_reg == src1 || + (ea.type != OP_MEM && modrm_reg == modrm_rm), + X86_EXC_UD); + if ( ea.type != OP_REG || (b & 1) || !evex.brs ) + avx512_vlen_check(!(b & 1)); + goto simd_zmm; + } + case X86EMUL_OPC_XOP(08, 0x85): /* vpmacssww xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x86): /* vpmacsswd xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x87): /* vpmacssdql xmm,xmm/m128,xmm,xmm */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:56:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544016.849468 (Exim 4.92) (envelope-from ) id 1q6SUA-00009i-70; Tue, 06 Jun 2023 08:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544016.849468; Tue, 06 Jun 2023 08:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUA-00009Z-3a; Tue, 06 Jun 2023 08:56:14 +0000 Received: by outflank-mailman (input) for mailman id 544016; Tue, 06 Jun 2023 08:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SU8-00009O-Sr for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SU8-0005yM-Pl for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6SU8-0000sl-Ow for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R7iWrk71fQ/Z557YZ9yWyK8keLgzrt+kFEQyc4OTgWk=; b=cbzLnAWWTrtvHdlVkp2/pLeMIw eDD7cx7YiIaLXmbAQt623FlB0WTNMT7nD9rlRo8W0F44RO93BP1NTJZXvZf5E4QwUfl+KTrm9/74Y 0ZWxjWAtrRDvj0agzNzzVC0lj2qegqTQiyM8Ne3HZJfJhkNMF8ImXddMtnpJzRBlWM7I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 conversion to/from (packed) int16 insns Message-Id: Date: Tue, 06 Jun 2023 08:56:12 +0000 commit 59c2c9c2a003d61a2c5f2e7f88342db765c283c3 Author: Jan Beulich AuthorDate: Mon Jun 5 15:00:15 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 15:00:15 2023 +0200 x86emul: handle AVX512-FP16 conversion to/from (packed) int16 insns These are easiest in that they have same-size source and destination vectors, yet they're different from other conversion insns in that they use opcodes which have different meaning in the 0F encoding space ({,V}H{ADD,SUB}P{S,D}), hence requiring a little bit of overriding. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 6 ++++++ tools/tests/x86_emulator/predicates.c | 6 ++++++ xen/arch/x86/x86_emulate/decode.c | 8 +++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 8 ++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index b5329fcfc3..381cb488fe 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -612,6 +612,12 @@ static const struct test avx512_fp16_all[] = { INSN(cmpph, , 0f3a, c2, vl, fp16, vl), INSN(cmpsh, f3, 0f3a, c2, el, fp16, el), INSN(comish, , map5, 2f, el, fp16, el), + INSN(cvtph2uw, , map5, 7d, vl, fp16, vl), + INSN(cvtph2w, 66, map5, 7d, vl, fp16, vl), + INSN(cvttph2uw, , map5, 7c, vl, fp16, vl), + INSN(cvttph2w, 66, map5, 7c, vl, fp16, vl), + INSN(cvtuw2ph, f2, map5, 7d, vl, fp16, vl), + INSN(cvtw2ph, f3, map5, 7d, vl, fp16, vl), INSN(divph, , map5, 5e, vl, fp16, vl), INSN(divsh, f3, map5, 5e, el, fp16, el), INSNX(fcmaddcph, f2, map6, 56, 1, vl, d, vl), diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index acbd32a5be..614432a42d 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2064,6 +2064,12 @@ static const struct evex { { { 0x5f }, 2, T, R, pfx_no, W0, Ln }, /* vmaxph */ { { 0x5f }, 2, T, R, pfx_f3, W0, LIG }, /* vmaxsh */ { { 0x6e }, 2, T, R, pfx_66, WIG, L0 }, /* vmovw */ + { { 0x7c }, 2, T, R, pfx_no, W0, Ln }, /* vcvttph2uw */ + { { 0x7c }, 2, T, R, pfx_66, W0, Ln }, /* vcvttph2w */ + { { 0x7d }, 2, T, R, pfx_no, W0, Ln }, /* vcvtph2uw */ + { { 0x7d }, 2, T, R, pfx_66, W0, Ln }, /* vcvtph2w */ + { { 0x7d }, 2, T, R, pfx_f3, W0, Ln }, /* vcvtw2ph */ + { { 0x7d }, 2, T, R, pfx_f2, W0, Ln }, /* vcvtuwph */ { { 0x7e }, 2, T, W, pfx_66, WIG, L0 }, /* vmovw */ }, evex_map6[] = { { { 0x2c }, 2, T, R, pfx_66, W0, Ln }, /* vscalefph */ diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index aef64d9854..a5baa3ed62 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -247,7 +247,7 @@ static const struct twobyte_table { [0x78 ... 0x79] = { DstImplicit|SrcMem|ModRM|Mov, simd_other, d8s_vl }, [0x7a] = { DstImplicit|SrcMem|ModRM|Mov, simd_packed_fp, d8s_vl }, [0x7b] = { DstImplicit|SrcMem|ModRM|Mov, simd_other, d8s_dq64 }, - [0x7c ... 0x7d] = { DstImplicit|SrcMem|ModRM, simd_other }, + [0x7c ... 0x7d] = { DstImplicit|SrcMem|ModRM, simd_other, d8s_vl }, [0x7e] = { DstMem|SrcImplicit|ModRM|Mov, simd_none, d8s_dq64 }, [0x7f] = { DstMem|SrcImplicit|ModRM|Mov, simd_packed_int, d8s_vl }, [0x80 ... 0x8f] = { DstImplicit|SrcImm }, @@ -1485,6 +1485,12 @@ int x86emul_decode(struct x86_emulate_state *s, s->fp16 = true; s->simd_size = simd_none; break; + + case 0x7c: /* vcvttph2{,u}w */ + case 0x7d: /* vcvtph2{,u}w / vcvt{,u}w2ph */ + d = DstReg | SrcMem | TwoOp; + s->fp16 = true; + break; } /* Like above re-use twobyte_table[] here. */ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5c1ec668de..eb40938b0f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7781,6 +7781,14 @@ x86_emulate( generate_exception_if(evex.w, X86_EXC_UD); goto avx512f_all_fp; + case X86EMUL_OPC_EVEX (5, 0x7c): /* vcvttph2uw [xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(5, 0x7c): /* vcvttph2w [xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX (5, 0x7d): /* vcvtph2uw [xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(5, 0x7d): /* vcvtph2w [xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_F3(5, 0x7d): /* vcvtw2ph [xyz]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_F2(5, 0x7d): /* vcvtuw2ph [xyz]mm/mem,[xyz]mm{k} */ + op_bytes = 16 << evex.lr; + /* fall through */ case X86EMUL_OPC_EVEX_66(6, 0x2c): /* vscalefph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x42): /* vgetexpph [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x96): /* vfmaddsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:56:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544017.849472 (Exim 4.92) (envelope-from ) id 1q6SUK-0000CM-8C; Tue, 06 Jun 2023 08:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544017.849472; Tue, 06 Jun 2023 08:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUK-0000CE-5C; Tue, 06 Jun 2023 08:56:24 +0000 Received: by outflank-mailman (input) for mailman id 544017; Tue, 06 Jun 2023 08:56:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUI-0000C6-UK for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUI-0005yX-TQ for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6SUI-0000tK-SY for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pNPXIw9YnqxFWjzy5YxT1FfN2+TIE0RWwkSoZox6N1U=; b=jH7s4VF1JEnJN02ebbiLORg4rN Zcfc2C7+5fdNKjhL8asL08QNV3QTKbAYvvkZ9vVHkTGpBc0WvS4dJ5WNiAHSxTyHc/kcOwPDUDJmq u+2dUD87gpCcBJ7xS1vxmghyS8xlDGmMDxcF+ayF3xmbxPo1s0tOYmfrDgMT/I6QgOIM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 floating point conversion insns Message-Id: Date: Tue, 06 Jun 2023 08:56:22 +0000 commit ae11304c595c97a06286839c7359549fa71f7c84 Author: Jan Beulich AuthorDate: Mon Jun 5 15:00:52 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 15:00:52 2023 +0200 x86emul: handle AVX512-FP16 floating point conversion insns Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 8 ++++++++ tools/tests/x86_emulator/predicates.c | 8 ++++++++ xen/arch/x86/x86_emulate/decode.c | 37 +++++++++++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.c | 15 +++++++++++++- 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index 381cb488fe..e31a3e807c 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -612,8 +612,16 @@ static const struct test avx512_fp16_all[] = { INSN(cmpph, , 0f3a, c2, vl, fp16, vl), INSN(cmpsh, f3, 0f3a, c2, el, fp16, el), INSN(comish, , map5, 2f, el, fp16, el), + INSN(cvtpd2ph, 66, map5, 5a, vl, q, vl), + INSN(cvtph2pd, , map5, 5a, vl_4, fp16, vl), + INSN(cvtph2psx, 66, map6, 13, vl_2, fp16, vl), INSN(cvtph2uw, , map5, 7d, vl, fp16, vl), INSN(cvtph2w, 66, map5, 7d, vl, fp16, vl), + INSN(cvtps2phx, 66, map5, 1d, vl, d, vl), + INSN(cvtsd2sh, f2, map5, 5a, el, q, el), + INSN(cvtsh2sd, f3, map5, 5a, el, fp16, el), + INSN(cvtsh2ss, , map6, 13, el, fp16, el), + INSN(cvtss2sh, , map5, 1d, el, d, el), INSN(cvttph2uw, , map5, 7c, vl, fp16, vl), INSN(cvttph2w, 66, map5, 7c, vl, fp16, vl), INSN(cvtuw2ph, f2, map5, 7d, vl, fp16, vl), diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 614432a42d..7d2fafb08c 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2047,6 +2047,8 @@ static const struct evex { }, evex_map5[] = { { { 0x10 }, 2, T, R, pfx_f3, W0, LIG }, /* vmovsh */ { { 0x11 }, 2, T, W, pfx_f3, W0, LIG }, /* vmovsh */ + { { 0x1d }, 2, T, R, pfx_66, W0, Ln }, /* vcvtps2phx */ + { { 0x1d }, 2, T, R, pfx_no, W0, LIG }, /* vcvtss2sh */ { { 0x2e }, 2, T, R, pfx_no, W0, LIG }, /* vucomish */ { { 0x2f }, 2, T, R, pfx_no, W0, LIG }, /* vcomish */ { { 0x51 }, 2, T, R, pfx_no, W0, Ln }, /* vsqrtph */ @@ -2055,6 +2057,10 @@ static const struct evex { { { 0x58 }, 2, T, R, pfx_f3, W0, LIG }, /* vaddsh */ { { 0x59 }, 2, T, R, pfx_no, W0, Ln }, /* vmulph */ { { 0x59 }, 2, T, R, pfx_f3, W0, LIG }, /* vmulsh */ + { { 0x5a }, 2, T, R, pfx_no, W0, Ln }, /* vcvtph2pd */ + { { 0x5a }, 2, T, R, pfx_66, W1, Ln }, /* vcvtpd2ph */ + { { 0x5a }, 2, T, R, pfx_f3, W0, LIG }, /* vcvtsh2sd */ + { { 0x5a }, 2, T, R, pfx_f2, W1, LIG }, /* vcvtsd2sh */ { { 0x5c }, 2, T, R, pfx_no, W0, Ln }, /* vsubph */ { { 0x5c }, 2, T, R, pfx_f3, W0, LIG }, /* vsubsh */ { { 0x5d }, 2, T, R, pfx_no, W0, Ln }, /* vminph */ @@ -2072,6 +2078,8 @@ static const struct evex { { { 0x7d }, 2, T, R, pfx_f2, W0, Ln }, /* vcvtuwph */ { { 0x7e }, 2, T, W, pfx_66, WIG, L0 }, /* vmovw */ }, evex_map6[] = { + { { 0x13 }, 2, T, R, pfx_66, W0, Ln }, /* vcvtph2psx */ + { { 0x13 }, 2, T, R, pfx_no, W0, LIG }, /* vcvtsh2ss */ { { 0x2c }, 2, T, R, pfx_66, W0, Ln }, /* vscalefph */ { { 0x2d }, 2, T, R, pfx_66, W0, LIG }, /* vscalefsh */ { { 0x42 }, 2, T, R, pfx_66, W0, Ln }, /* vgetexpph */ diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index a5baa3ed62..5275d07fcf 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -212,7 +212,9 @@ static const struct twobyte_table { [0x14 ... 0x15] = { DstImplicit|SrcMem|ModRM, simd_packed_fp, d8s_vl }, [0x16] = { DstImplicit|SrcMem|ModRM|Mov, simd_other, 3 }, [0x17] = { DstMem|SrcImplicit|ModRM|Mov, simd_other, 3 }, - [0x18 ... 0x1f] = { ImplicitOps|ModRM }, + [0x18 ... 0x1c] = { ImplicitOps|ModRM }, + [0x1d] = { ImplicitOps|ModRM, simd_none, d8s_vl }, + [0x1e ... 0x1f] = { ImplicitOps|ModRM }, [0x20 ... 0x21] = { DstMem|SrcImplicit|ModRM }, [0x22 ... 0x23] = { DstImplicit|SrcMem|ModRM }, [0x28] = { DstImplicit|SrcMem|ModRM|Mov, simd_packed_fp, d8s_vl }, @@ -1471,6 +1473,19 @@ int x86emul_decode(struct x86_emulate_state *s, s->fp16 = true; break; + case 0x1d: /* vcvtps2phx / vcvtss2sh */ + if ( s->evex.pfx & VEX_PREFIX_SCALAR_MASK ) + break; + d = DstReg | SrcMem; + if ( s->evex.pfx & VEX_PREFIX_DOUBLE_MASK ) + { + s->simd_size = simd_packed_fp; + d |= TwoOp; + } + else + s->simd_size = simd_scalar_vexw; + break; + case 0x2e: case 0x2f: /* v{,u}comish */ if ( !s->evex.pfx ) s->fp16 = true; @@ -1495,6 +1510,15 @@ int x86emul_decode(struct x86_emulate_state *s, /* Like above re-use twobyte_table[] here. */ disp8scale = decode_disp8scale(twobyte_table[b].d8s, s); + + switch ( b ) + { + case 0x5a: /* vcvtph2pd needs special casing */ + if ( !s->evex.pfx && !s->evex.brs ) + disp8scale -= 2; + break; + } + break; case ext_map6: @@ -1515,6 +1539,17 @@ int x86emul_decode(struct x86_emulate_state *s, s->fp16 = true; break; + case 0x13: /* vcvtph2psx / vcvtsh2ss */ + if ( s->evex.pfx & VEX_PREFIX_SCALAR_MASK ) + break; + s->fp16 = true; + if ( !(s->evex.pfx & VEX_PREFIX_DOUBLE_MASK) ) + { + s->simd_size = simd_scalar_vexw; + d &= ~TwoOp; + } + break; + case 0x56: case 0x57: /* vf{,c}maddc{p,s}h */ case 0xd6: case 0xd7: /* vf{,c}mulc{p,s}h */ break; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index eb40938b0f..97d20bdd98 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -7781,14 +7781,25 @@ x86_emulate( generate_exception_if(evex.w, X86_EXC_UD); goto avx512f_all_fp; + CASE_SIMD_ALL_FP(_EVEX, 5, 0x5a): /* vcvtp{h,d}2p{h,d} [xyz]mm/mem,[xyz]mm{k} */ + /* vcvts{h,d}2s{h,d} xmm/mem,xmm,xmm{k} */ + host_and_vcpu_must_have(avx512_fp16); + if ( vex.pfx & VEX_PREFIX_SCALAR_MASK ) + d &= ~TwoOp; + op_bytes = 2 << (((evex.pfx & VEX_PREFIX_SCALAR_MASK) ? 0 : 1 + evex.lr) + + 2 * evex.w); + goto avx512f_all_fp; + case X86EMUL_OPC_EVEX (5, 0x7c): /* vcvttph2uw [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(5, 0x7c): /* vcvttph2w [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX (5, 0x7d): /* vcvtph2uw [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(5, 0x7d): /* vcvtph2w [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_F3(5, 0x7d): /* vcvtw2ph [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_F2(5, 0x7d): /* vcvtuw2ph [xyz]mm/mem,[xyz]mm{k} */ - op_bytes = 16 << evex.lr; + case X86EMUL_OPC_EVEX_66(6, 0x13): /* vcvtph2psx [xy]mm/mem,[xyz]mm{k} */ + op_bytes = 8 << ((ext == ext_map5) + evex.lr); /* fall through */ + case X86EMUL_OPC_EVEX_66(5, 0x1d): /* vcvtps2phx [xyz]mm/mem,[xy]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x2c): /* vscalefph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x42): /* vgetexpph [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x96): /* vfmaddsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ @@ -7815,6 +7826,8 @@ x86_emulate( avx512_vlen_check(false); goto simd_zmm; + case X86EMUL_OPC_EVEX(5, 0x1d): /* vcvtss2sh xmm/mem,xmm,xmm{k} */ + case X86EMUL_OPC_EVEX(6, 0x13): /* vcvtsh2ss xmm/mem,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x2d): /* vscalefsh xmm/m16,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x43): /* vgetexpsh xmm/m16,xmm,xmm{k} */ case X86EMUL_OPC_EVEX_66(6, 0x99): /* vfmadd132sh xmm/m16,xmm,xmm{k} */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:56:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544018.849476 (Exim 4.92) (envelope-from ) id 1q6SUU-0000F2-A3; Tue, 06 Jun 2023 08:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544018.849476; Tue, 06 Jun 2023 08:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUU-0000Et-6k; Tue, 06 Jun 2023 08:56:34 +0000 Received: by outflank-mailman (input) for mailman id 544018; Tue, 06 Jun 2023 08:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUT-0000Ej-1o for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUT-0005z9-11 for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6SUT-0000tj-04 for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NmUrotr7f+RrSFd/WIDdZynpYSt+Cs9aV6WxAd0W1gg=; b=oqwQXc617oVF19GAHD3b5N4vr7 Y1Zd/KBOZZBq8Z/rBMW2Wc+FJttZJ8y1nqILyyUWvih7dDN8TtgUzzZc/VyusWnCS+UnwH8UyZVLv 4u2GKe8x7R2PedvHMvgqv9Fv+kKOG9zeQXgyKKnVVRaUYBN+VMQQ2o2b+uW3gItREV3o=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: handle AVX512-FP16 conversion to/from (packed) int{32,64} insns Message-Id: Date: Tue, 06 Jun 2023 08:56:33 +0000 commit e3631d797d17cf472bd065a2251a19cce5a5d4c5 Author: Jan Beulich AuthorDate: Mon Jun 5 15:01:38 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 15:01:38 2023 +0200 x86emul: handle AVX512-FP16 conversion to/from (packed) int{32,64} insns Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/evex-disp8.c | 18 ++++++++++++ tools/tests/x86_emulator/predicates.c | 18 ++++++++++++ xen/arch/x86/x86_emulate/decode.c | 48 ++++++++++++++++++++++++++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 50 ++++++++++++++++++++++++++++++++-- 4 files changed, 131 insertions(+), 3 deletions(-) diff --git a/tools/tests/x86_emulator/evex-disp8.c b/tools/tests/x86_emulator/evex-disp8.c index e31a3e807c..9984e6d714 100644 --- a/tools/tests/x86_emulator/evex-disp8.c +++ b/tools/tests/x86_emulator/evex-disp8.c @@ -612,18 +612,36 @@ static const struct test avx512_fp16_all[] = { INSN(cmpph, , 0f3a, c2, vl, fp16, vl), INSN(cmpsh, f3, 0f3a, c2, el, fp16, el), INSN(comish, , map5, 2f, el, fp16, el), + INSN(cvtdq2ph, , map5, 5b, vl, d, vl), INSN(cvtpd2ph, 66, map5, 5a, vl, q, vl), + INSN(cvtph2dq, 66, map5, 5b, vl_2, fp16, vl), INSN(cvtph2pd, , map5, 5a, vl_4, fp16, vl), INSN(cvtph2psx, 66, map6, 13, vl_2, fp16, vl), + INSN(cvtph2qq, 66, map5, 7b, vl_4, fp16, vl), + INSN(cvtph2udq, , map5, 79, vl_2, fp16, vl), + INSN(cvtph2uqq, 66, map5, 79, vl_4, fp16, vl), INSN(cvtph2uw, , map5, 7d, vl, fp16, vl), INSN(cvtph2w, 66, map5, 7d, vl, fp16, vl), INSN(cvtps2phx, 66, map5, 1d, vl, d, vl), + INSN(cvtqq2ph, , map5, 5b, vl, q, vl), INSN(cvtsd2sh, f2, map5, 5a, el, q, el), INSN(cvtsh2sd, f3, map5, 5a, el, fp16, el), + INSN(cvtsh2si, f3, map5, 2d, el, fp16, el), INSN(cvtsh2ss, , map6, 13, el, fp16, el), + INSN(cvtsh2usi, f3, map5, 79, el, fp16, el), + INSN(cvtsi2sh, f3, map5, 2a, el, dq64, el), INSN(cvtss2sh, , map5, 1d, el, d, el), + INSN(cvttph2dq, f3, map5, 5b, vl_2, fp16, vl), + INSN(cvttph2qq, 66, map5, 7a, vl_4, fp16, vl), + INSN(cvttph2udq, , map5, 78, vl_2, fp16, vl), + INSN(cvttph2uqq, 66, map5, 78, vl_4, fp16, vl), INSN(cvttph2uw, , map5, 7c, vl, fp16, vl), INSN(cvttph2w, 66, map5, 7c, vl, fp16, vl), + INSN(cvttsh2si, f3, map5, 2c, el, fp16, el), + INSN(cvttsh2usi, f3, map5, 78, el, fp16, el), + INSN(cvtudq2ph, f2, map5, 7a, vl, d, vl), + INSN(cvtuqq2ph, f2, map5, 7a, vl, q, vl), + INSN(cvtusi2sh, f3, map5, 7b, el, dq64, el), INSN(cvtuw2ph, f2, map5, 7d, vl, fp16, vl), INSN(cvtw2ph, f3, map5, 7d, vl, fp16, vl), INSN(divph, , map5, 5e, vl, fp16, vl), diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 7d2fafb08c..744cc847bc 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -2049,6 +2049,9 @@ static const struct evex { { { 0x11 }, 2, T, W, pfx_f3, W0, LIG }, /* vmovsh */ { { 0x1d }, 2, T, R, pfx_66, W0, Ln }, /* vcvtps2phx */ { { 0x1d }, 2, T, R, pfx_no, W0, LIG }, /* vcvtss2sh */ + { { 0x2a }, 2, T, R, pfx_f3, Wn, LIG }, /* vcvtsi2sh */ + { { 0x2c }, 2, T, R, pfx_f3, Wn, LIG }, /* vcvttsh2si */ + { { 0x2d }, 2, T, R, pfx_f3, Wn, LIG }, /* vcvtsh2si */ { { 0x2e }, 2, T, R, pfx_no, W0, LIG }, /* vucomish */ { { 0x2f }, 2, T, R, pfx_no, W0, LIG }, /* vcomish */ { { 0x51 }, 2, T, R, pfx_no, W0, Ln }, /* vsqrtph */ @@ -2061,6 +2064,10 @@ static const struct evex { { { 0x5a }, 2, T, R, pfx_66, W1, Ln }, /* vcvtpd2ph */ { { 0x5a }, 2, T, R, pfx_f3, W0, LIG }, /* vcvtsh2sd */ { { 0x5a }, 2, T, R, pfx_f2, W1, LIG }, /* vcvtsd2sh */ + { { 0x5b }, 2, T, R, pfx_no, W0, Ln }, /* vcvtdq2ph */ + { { 0x5b }, 2, T, R, pfx_no, W1, Ln }, /* vcvtqq2ph */ + { { 0x5b }, 2, T, R, pfx_66, W0, Ln }, /* vcvtph2dq */ + { { 0x5b }, 2, T, R, pfx_f3, W0, Ln }, /* vcvttph2dq */ { { 0x5c }, 2, T, R, pfx_no, W0, Ln }, /* vsubph */ { { 0x5c }, 2, T, R, pfx_f3, W0, LIG }, /* vsubsh */ { { 0x5d }, 2, T, R, pfx_no, W0, Ln }, /* vminph */ @@ -2070,6 +2077,17 @@ static const struct evex { { { 0x5f }, 2, T, R, pfx_no, W0, Ln }, /* vmaxph */ { { 0x5f }, 2, T, R, pfx_f3, W0, LIG }, /* vmaxsh */ { { 0x6e }, 2, T, R, pfx_66, WIG, L0 }, /* vmovw */ + { { 0x78 }, 2, T, R, pfx_no, W0, Ln }, /* vcvttph2udq */ + { { 0x78 }, 2, T, R, pfx_66, W0, Ln }, /* vcvttph2uqq */ + { { 0x78 }, 2, T, R, pfx_f3, Wn, LIG }, /* vcvttsh2usi */ + { { 0x79 }, 2, T, R, pfx_no, W0, Ln }, /* vcvtph2udq */ + { { 0x79 }, 2, T, R, pfx_66, W0, Ln }, /* vcvtph2uqq */ + { { 0x79 }, 2, T, R, pfx_f3, Wn, LIG }, /* vcvtsh2usi */ + { { 0x7a }, 2, T, R, pfx_66, W0, Ln }, /* vcvttph2qq */ + { { 0x7a }, 2, T, R, pfx_f2, W0, Ln }, /* vcvtudq2ph */ + { { 0x7a }, 2, T, R, pfx_f2, W1, Ln }, /* vcvtuqq2ph */ + { { 0x7b }, 2, T, R, pfx_66, W0, Ln }, /* vcvtph2qq */ + { { 0x7b }, 2, T, R, pfx_f3, Wn, LIG }, /* vcvtusi2sh */ { { 0x7c }, 2, T, R, pfx_no, W0, Ln }, /* vcvttph2uw */ { { 0x7c }, 2, T, R, pfx_66, W0, Ln }, /* vcvttph2w */ { { 0x7d }, 2, T, R, pfx_no, W0, Ln }, /* vcvtph2uw */ diff --git a/xen/arch/x86/x86_emulate/decode.c b/xen/arch/x86/x86_emulate/decode.c index 5275d07fcf..f58ca3984e 100644 --- a/xen/arch/x86/x86_emulate/decode.c +++ b/xen/arch/x86/x86_emulate/decode.c @@ -1486,12 +1486,25 @@ int x86emul_decode(struct x86_emulate_state *s, s->simd_size = simd_scalar_vexw; break; + case 0x2a: /* vcvtsi2sh */ + break; + + case 0x2c: case 0x2d: /* vcvt{,t}sh2si */ + if ( s->evex.pfx == vex_f3 ) + s->fp16 = true; + break; + case 0x2e: case 0x2f: /* v{,u}comish */ if ( !s->evex.pfx ) s->fp16 = true; s->simd_size = simd_none; break; + case 0x5b: /* vcvt{d,q}q2ph, vcvt{,t}ph2dq */ + if ( s->evex.pfx && s->evex.pfx != vex_f2 ) + s->fp16 = true; + break; + case 0x6e: /* vmovw r/m16, xmm */ d = (d & ~SrcMask) | SrcMem16; /* fall through */ @@ -1501,6 +1514,17 @@ int x86emul_decode(struct x86_emulate_state *s, s->simd_size = simd_none; break; + case 0x78: case 0x79: /* vcvt{,t}ph2u{d,q}q, vcvt{,t}sh2usi */ + if ( s->evex.pfx != vex_f2 ) + s->fp16 = true; + break; + + case 0x7a: /* vcvttph2qq, vcvtu{d,q}q2ph */ + case 0x7b: /* vcvtph2qq, vcvtusi2sh */ + if ( s->evex.pfx == vex_66 ) + s->fp16 = true; + break; + case 0x7c: /* vcvttph2{,u}w */ case 0x7d: /* vcvtph2{,u}w / vcvt{,u}w2ph */ d = DstReg | SrcMem | TwoOp; @@ -1513,10 +1537,34 @@ int x86emul_decode(struct x86_emulate_state *s, switch ( b ) { + case 0x78: + case 0x79: + /* vcvt{,t}ph2u{d,q}q need special casing */ + if ( s->evex.pfx <= vex_66 ) + { + if ( !s->evex.brs ) + disp8scale -= 1 + (s->evex.pfx == vex_66); + break; + } + /* vcvt{,t}sh2usi needs special casing: fall through */ + case 0x2c: case 0x2d: /* vcvt{,t}sh2si need special casing */ + disp8scale = 1; + break; + case 0x5a: /* vcvtph2pd needs special casing */ if ( !s->evex.pfx && !s->evex.brs ) disp8scale -= 2; break; + + case 0x5b: /* vcvt{,t}ph2dq need special casing */ + if ( s->evex.pfx && !s->evex.brs ) + --disp8scale; + break; + + case 0x7a: case 0x7b: /* vcvt{,t}ph2qq need special casing */ + if ( s->evex.pfx == vex_66 && !s->evex.brs ) + disp8scale = s->evex.brs ? 1 : 2 + s->evex.lr; + break; } break; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 97d20bdd98..be2e3c6b11 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3544,6 +3544,12 @@ x86_emulate( state->simd_size = simd_none; goto simd_0f_rm; +#ifndef X86EMUL_NO_SIMD + + case X86EMUL_OPC_EVEX_F3(5, 0x2a): /* vcvtsi2sh r/m,xmm,xmm */ + case X86EMUL_OPC_EVEX_F3(5, 0x7b): /* vcvtusi2sh r/m,xmm,xmm */ + host_and_vcpu_must_have(avx512_fp16); + /* fall through */ CASE_SIMD_SCALAR_FP(_EVEX, 0x0f, 0x2a): /* vcvtsi2s{s,d} r/m,xmm,xmm */ CASE_SIMD_SCALAR_FP(_EVEX, 0x0f, 0x7b): /* vcvtusi2s{s,d} r/m,xmm,xmm */ generate_exception_if(evex.opmsk || (ea.type != OP_REG && evex.brs), @@ -3622,7 +3628,9 @@ x86_emulate( opc[1] = 0x01; rc = ops->read(ea.mem.seg, ea.mem.off, mmvalp, - vex.pfx & VEX_PREFIX_DOUBLE_MASK ? 8 : 4, ctxt); + vex.pfx & VEX_PREFIX_DOUBLE_MASK + ? 8 : 2 << !state->fp16, + ctxt); if ( rc != X86EMUL_OKAY ) goto done; } @@ -3652,6 +3660,12 @@ x86_emulate( state->simd_size = simd_none; break; + case X86EMUL_OPC_EVEX_F3(5, 0x2c): /* vcvttsh2si xmm/mem,reg */ + case X86EMUL_OPC_EVEX_F3(5, 0x2d): /* vcvtsh2si xmm/mem,reg */ + case X86EMUL_OPC_EVEX_F3(5, 0x78): /* vcvttsh2usi xmm/mem,reg */ + case X86EMUL_OPC_EVEX_F3(5, 0x79): /* vcvtsh2usi xmm/mem,reg */ + host_and_vcpu_must_have(avx512_fp16); + /* fall through */ CASE_SIMD_SCALAR_FP(_EVEX, 0x0f, 0x2c): /* vcvtts{s,d}2si xmm/mem,reg */ CASE_SIMD_SCALAR_FP(_EVEX, 0x0f, 0x2d): /* vcvts{s,d}2si xmm/mem,reg */ CASE_SIMD_SCALAR_FP(_EVEX, 0x0f, 0x78): /* vcvtts{s,d}2usi xmm/mem,reg */ @@ -3723,8 +3737,6 @@ x86_emulate( ASSERT(!state->simd_size); break; -#ifndef X86EMUL_NO_SIMD - case X86EMUL_OPC_EVEX(5, 0x2e): /* vucomish xmm/m16,xmm */ case X86EMUL_OPC_EVEX(5, 0x2f): /* vcomish xmm/m16,xmm */ host_and_vcpu_must_have(avx512_fp16); @@ -7790,6 +7802,38 @@ x86_emulate( 2 * evex.w); goto avx512f_all_fp; + case X86EMUL_OPC_EVEX (5, 0x5b): /* vcvtdq2ph [xyz]mm/mem,[xy]mm{k} */ + /* vcvtqq2ph [xyz]mm/mem,xmm{k} */ + case X86EMUL_OPC_EVEX_F2(5, 0x7a): /* vcvtudq2ph [xyz]mm/mem,[xy]mm{k} */ + /* vcvtuqq2ph [xyz]mm/mem,xmm{k} */ + host_and_vcpu_must_have(avx512_fp16); + if ( ea.type != OP_REG || !evex.brs ) + avx512_vlen_check(false); + op_bytes = 16 << evex.lr; + goto simd_zmm; + + case X86EMUL_OPC_EVEX_66(5, 0x5b): /* vcvtph2dq [xy]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_F3(5, 0x5b): /* vcvttph2dq [xy]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX (5, 0x78): /* vcvttph2udq [xy]mm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX (5, 0x79): /* vcvtph2udq [xy]mm/mem,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + if ( ea.type != OP_REG || !evex.brs ) + avx512_vlen_check(false); + op_bytes = 8 << evex.lr; + goto simd_zmm; + + case X86EMUL_OPC_EVEX_66(5, 0x78): /* vcvttph2uqq xmm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(5, 0x79): /* vcvtph2uqq xmm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(5, 0x7a): /* vcvttph2qq xmm/mem,[xyz]mm{k} */ + case X86EMUL_OPC_EVEX_66(5, 0x7b): /* vcvtph2qq xmm/mem,[xyz]mm{k} */ + host_and_vcpu_must_have(avx512_fp16); + generate_exception_if(evex.w, X86_EXC_UD); + if ( ea.type != OP_REG || !evex.brs ) + avx512_vlen_check(false); + op_bytes = 4 << (evex.w + evex.lr); + goto simd_zmm; + case X86EMUL_OPC_EVEX (5, 0x7c): /* vcvttph2uw [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(5, 0x7c): /* vcvttph2w [xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX (5, 0x7d): /* vcvtph2uw [xyz]mm/mem,[xyz]mm{k} */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:56:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544019.849480 (Exim 4.92) (envelope-from ) id 1q6SUe-0000IY-EM; Tue, 06 Jun 2023 08:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544019.849480; Tue, 06 Jun 2023 08:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUe-0000IQ-A1; Tue, 06 Jun 2023 08:56:44 +0000 Received: by outflank-mailman (input) for mailman id 544019; Tue, 06 Jun 2023 08:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUd-0000I9-4s for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUd-0005zI-44 for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6SUd-0000uC-3I for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cLc7FwBjv65p9UO6oLSUyPG/oYEGAsGuQEJhpSSpSdk=; b=wN2nYyJ2w42P0H+lPhhZNLNwjI 9Mgo7zIk+i6XfxqX8ijuxXIEk8WQKCgKOZBBlpOrJrRc/lKQLTvkmu3S8On2vKWSdatqSzMDavMWf DUjvda2vsU9ipJbePOe1ueIkVP+9YDcr+Tt0VYWH7g+9r+YWmcE5+IawHAKr4vIELXuc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: use $(dot-target) Message-Id: Date: Tue, 06 Jun 2023 08:56:43 +0000 commit 4f86b96779701f430ddbea104c7ce5c76482e16e Author: Jan Beulich AuthorDate: Mon Jun 5 15:02:39 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 15:02:39 2023 +0200 build: use $(dot-target) While slightly longer, I agree with Andrew that using it helps readability. Where touching them anyway, also wrap some overly long lines. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/arch/arm/Makefile | 20 +++++++++++--------- xen/arch/x86/Makefile | 49 ++++++++++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index d85fc040df..7bf07e9920 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -93,17 +93,19 @@ endif $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ - $(objtree)/common/symbols-dummy.o -o $(@D)/.$(@F).0 - $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).0.o + $(objtree)/common/symbols-dummy.o -o $(dot-target).0 + $(NM) -pa --format=sysv $(dot-target).0 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).0.S + $(MAKE) $(build)=$(@D) $(dot-target).0.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ - $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 - $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o + $(dot-target).0.o -o $(dot-target).1 + $(NM) -pa --format=sysv $(dot-target).1 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).1.S + $(MAKE) $(build)=$(@D) $(dot-target).1.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(@D)/.$(@F).1.o -o $@ + $(dot-target).1.o -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index a3a3c3ba41..e642ad6c55 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -123,7 +123,7 @@ syms-warn-dup-$(CONFIG_ENFORCE_UNIQUE_SYMBOLS) := --error-dup orphan-handling-$(call ld-option,--orphan-handling=warn) += --orphan-handling=warn -$(TARGET): TMP = $(@D)/.$(@F).elf32 +$(TARGET): TMP = $(dot-target).elf32 $(TARGET): $(TARGET)-syms $(efi-y) $(obj)/boot/mkelf32 $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) $(XEN_IMG_OFFSET) \ `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . __2M_rwdata_end$$/0x\1/p'` @@ -137,23 +137,23 @@ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(objtree)/common/symbols-dummy.o -o $(@D)/.$(@F).0 - $(NM) -pa --format=sysv $(@D)/.$(@F).0 \ + $(objtree)/common/symbols-dummy.o -o $(dot-target).0 + $(NM) -pa --format=sysv $(dot-target).0 \ | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ - >$(@D)/.$(@F).0.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).0.o + > $(dot-target).0.S + $(MAKE) $(build)=$(@D) $(dot-target).0.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1 - $(NM) -pa --format=sysv $(@D)/.$(@F).1 \ + $(dot-target).0.o -o $(dot-target).1 + $(NM) -pa --format=sysv $(dot-target).1 \ | $(objtree)/tools/symbols $(all_symbols) --sysv --sort $(syms-warn-dup-y) \ - >$(@D)/.$(@F).1.S - $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o + > $(dot-target).1.S + $(MAKE) $(build)=$(@D) $(dot-target).1.o $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ - $(orphan-handling-y) $(@D)/.$(@F).1.o -o $@ + $(orphan-handling-y) $(dot-target).1.o -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map - rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* + rm -f $(dot-target).[0-9]* $(@D)/..$(@F).[0-9]* ifeq ($(CONFIG_XEN_IBT),y) $(SHELL) $(srctree)/tools/check-endbr.sh $@ endif @@ -210,27 +210,34 @@ ifeq ($(CONFIG_DEBUG_INFO),y) endif $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< $(relocs-dummy) \ - $(objtree)/common/symbols-dummy.o $(note_file_option) -o $(@D)/.$(@F).$(base).0 &&) : - $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S - $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S + $(objtree)/common/symbols-dummy.o $(note_file_option) \ + -o $(dot-target).$(base).0 &&) : + $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).0) \ + > $(dot-target).0r.S + $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).0 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).0s.S $(MAKE) $(build)=$(@D) .$(@F).0r.o .$(@F).0s.o $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< \ - $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : - $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S - $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ - | $(objtree)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S + $(dot-target).0r.o $(dot-target).0s.o $(note_file_option) \ + -o $(dot-target).$(base).1 &&) : + $(MKRELOC) $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(dot-target).$(base).1) \ + > $(dot-target).1r.S + $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).1 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).1s.S $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds -N $< \ - $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(orphan-handling-y) $(note_file_option) -o $@ + $(dot-target).1r.o $(dot-target).1s.o $(orphan-handling-y) \ + $(note_file_option) -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > $@.map ifeq ($(CONFIG_DEBUG_INFO),y) $(if $(filter --strip-debug,$(EFI_LDFLAGS)),:$(space))$(OBJCOPY) -O elf64-x86-64 $@ $@.elf endif - rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* + rm -f $(dot-target).[0-9]* $(@D)/..$(@F).[0-9]* ifeq ($(CONFIG_XEN_IBT),y) $(SHELL) $(srctree)/tools/check-endbr.sh $@ endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue Jun 06 08:56:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Jun 2023 08:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.544021.849483 (Exim 4.92) (envelope-from ) id 1q6SUo-0000Li-EN; Tue, 06 Jun 2023 08:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 544021.849483; Tue, 06 Jun 2023 08:56:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUo-0000La-Bg; Tue, 06 Jun 2023 08:56:54 +0000 Received: by outflank-mailman (input) for mailman id 544021; Tue, 06 Jun 2023 08:56:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUn-0000LQ-7v for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q6SUn-0005zP-7G for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q6SUn-0000ud-6I for xen-changelog@lists.xenproject.org; Tue, 06 Jun 2023 08:56:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Le8s6g8MjjWoGHG4lGsZ2HmMGMrhSztcBVBTXg9vLP8=; b=eV40+5rv5KpQ6Jql8InBjiSyTB BTPEidFYE+252yy6SiuDRp9Yuz+ToPy6ddO9bERsW8MQ6FoekfCddmLD+P5sbY5u3MHC2lt442CPO Vgw2j4HhGSPnyvou7l3nAMLZh+muInp5E5AutPXr+Fdf60D4woc7/H5L5BwWAkNQoZcY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] MAINTAINERS: remove xenstore related files from LIBS Message-Id: Date: Tue, 06 Jun 2023 08:56:53 +0000 commit b3880c365db89051728e1de6b6889c750cbdd915 Author: Juergen Gross AuthorDate: Mon Jun 5 15:03:21 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 15:03:21 2023 +0200 MAINTAINERS: remove xenstore related files from LIBS There is no need to have the Xenstore headers listed in the LIBS section now that they have been added to the XENSTORE section. Suggested-by: Jan Beulich Signed-off-by: Juergen Gross Acked-by: Anthony PERARD --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1bb7a6a839..7961c4bf07 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -411,8 +411,6 @@ F: tools/include/xengnttab.h F: tools/include/xenguest.h F: tools/include/xenhypfs.h F: tools/include/xenstat.h -F: tools/include/xenstore*.h -F: tools/include/xenstore-compat/*.h F: tools/include/xentoolcore*.h F: tools/include/xentoollog.h F: tools/libs/ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 08 02:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Jun 2023 02:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.545075.851290 (Exim 4.92) (envelope-from ) id 1q75SQ-0001wg-VN; Thu, 08 Jun 2023 02:33:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 545075.851290; Thu, 08 Jun 2023 02:33:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75SQ-0001wX-S6; Thu, 08 Jun 2023 02:33:02 +0000 Received: by outflank-mailman (input) for mailman id 545075; Thu, 08 Jun 2023 02:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75SP-0001wR-RP for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75SP-0005TE-FH for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q75SP-00084F-ED for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=d40cNcWXoc4C1EJ76VL/Xkwy0nTngYkYCzexMp0rWe4=; b=RfRHuWjGA5OZ/Y/BJPSoKUzRx7 rp9WcubYQq61rbrr3R6AStmFyRiN/LmROfJ9PHaiAWX+HOaJ7EiL5FgbJbSVcBp8sp/DA3Nk26GGw SX5kAbMjW3VdcxYLp45AQgPG43Zt+Zk97xL15AR2cocvTNJngXwK7cAv5YpjEppr4KmI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86emul: AVX512-FP16 testing Message-Id: Date: Thu, 08 Jun 2023 02:33:01 +0000 commit e291c4c3e1ec1a693e6b8de5562d6a9607ad2722 Author: Jan Beulich AuthorDate: Mon Jun 5 16:54:30 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 5 16:54:30 2023 +0200 x86emul: AVX512-FP16 testing Naming of some of the builtins isn't fully consistent with that of pre- existing ones, so there's a need for a new BR2() wrapper macro. With the tests providing some proof of proper functioning of the emulator code also enable use of the feature by guests, as there's no other infrastructure involved in enabling this ISA extension. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Henry Wang # CHANGELOG --- CHANGELOG.md | 1 + tools/tests/x86_emulator/Makefile | 7 +- tools/tests/x86_emulator/simd-fma.c | 165 +++++++++++++++++++++++++++ tools/tests/x86_emulator/simd.c | 90 ++++++++++++++- tools/tests/x86_emulator/simd.h | 16 +++ tools/tests/x86_emulator/test_x86_emulator.c | 15 +++ xen/include/public/arch-x86/cpufeatureset.h | 2 +- 7 files changed, 292 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bfd3aa5c0..ceedaf333a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bus-lock detection, used by Xen to mitigate (by rate-limiting) the system wide impact of a guest misusing atomic instructions. - xl/libxl can customize SMBIOS strings for HVM guests. + - Add support for AVX512-FP16 on x86. ## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.17.0) - 2022-12-12 diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index a6f5bfa53e..4079412d2e 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -16,7 +16,7 @@ vpath %.c $(XEN_ROOT)/xen/lib/x86 CFLAGS += $(CFLAGS_xeninclude) -SIMD := 3dnow sse sse2 sse4 avx avx2 xop avx512f avx512bw avx512dq avx512er avx512vbmi +SIMD := 3dnow sse sse2 sse4 avx avx2 xop avx512f avx512bw avx512dq avx512er avx512vbmi avx512fp16 FMA := fma4 fma SG := avx2-sg avx512f-sg avx512vl-sg AES := ssse3-aes avx-aes avx2-vaes avx512bw-vaes @@ -91,6 +91,9 @@ avx512vbmi-vecs := $(avx512bw-vecs) avx512vbmi-ints := $(avx512bw-ints) avx512vbmi-flts := $(avx512bw-flts) avx512vbmi2-vecs := $(avx512bw-vecs) +avx512fp16-vecs := $(avx512bw-vecs) +avx512fp16-ints := +avx512fp16-flts := 2 avx512f-opmask-vecs := 2 avx512dq-opmask-vecs := 1 2 @@ -248,7 +251,7 @@ $(addsuffix .c,$(GF)): $(addsuffix .h,$(SIMD) $(FMA) $(SG) $(AES) $(CLMUL) $(SHA) $(GF)): simd.h -xop.h avx512f.h: simd-fma.c +xop.h avx512f.h avx512fp16.h: simd-fma.c endif # 32-bit override diff --git a/tools/tests/x86_emulator/simd-fma.c b/tools/tests/x86_emulator/simd-fma.c index d2ccefac9b..56c4d1ae8c 100644 --- a/tools/tests/x86_emulator/simd-fma.c +++ b/tools/tests/x86_emulator/simd-fma.c @@ -28,6 +28,8 @@ ENTRY(fma_test); # define fmaddsub(x, y, z) BR(vfmaddsubps, _mask, x, y, z, ~0) # elif FLOAT_SIZE == 8 # define fmaddsub(x, y, z) BR(vfmaddsubpd, _mask, x, y, z, ~0) +# elif FLOAT_SIZE == 2 +# define fmaddsub(x, y, z) BR(vfmaddsubph, _mask, x, y, z, ~0) # endif #elif VEC_SIZE == 16 # if FLOAT_SIZE == 4 @@ -70,6 +72,75 @@ ENTRY(fma_test); # endif #endif +#ifdef __AVX512FP16__ +# define I (1.if16) +# if VEC_SIZE > FLOAT_SIZE +# define CELEM_COUNT (ELEM_COUNT / 2) +static const unsigned int conj_mask = 0x80000000; +# define conj(z) ({ \ + vec_t r_; \ + asm ( "vpxord %2%{1to%c3%}, %1, %0" \ + : "=v" (r_) \ + : "v" (z), "m" (conj_mask), "i" (CELEM_COUNT) ); \ + r_; \ +}) +# define _cmul_vv(a, b, c) BR2(vf##c##mulcph, , a, b) +# define _cmul_vs(a, b, c) ({ \ + vec_t r_; \ + _Complex _Float16 b_ = (b); \ + asm ( "vf"#c"mulcph %2%{1to%c3%}, %1, %0" \ + : "=v" (r_) \ + : "v" (a), "m" (b_), "i" (CELEM_COUNT) ); \ + r_; \ +}) +# define cmadd_vv(a, b, c) BR2(vfmaddcph, , a, b, c) +# define cmadd_vs(a, b, c) ({ \ + _Complex _Float16 b_ = (b); \ + vec_t r_; \ + asm ( "vfmaddcph %2%{1to%c3%}, %1, %0" \ + : "=v" (r_) \ + : "v" (a), "m" (b_), "i" (CELEM_COUNT), "0" (c) ); \ + r_; \ +}) +# else +# define CELEM_COUNT 1 +typedef _Float16 __attribute__((vector_size(4))) cvec_t; +# define conj(z) ({ \ + cvec_t r_; \ + asm ( "xor $0x80000000, %0" : "=rm" (r_) : "0" (z) ); \ + r_; \ +}) +# define _cmul_vv(a, b, c) ({ \ + cvec_t r_; \ + /* "=&x" to force destination to be different from both sources */ \ + asm ( "vf"#c"mulcsh %2, %1, %0" : "=&x" (r_) : "x" (a), "m" (b) ); \ + r_; \ +}) +# define _cmul_vs(a, b, c) ({ \ + _Complex _Float16 b_ = (b); \ + cvec_t r_; \ + /* "=&x" to force destination to be different from both sources */ \ + asm ( "vf"#c"mulcsh %2, %1, %0" : "=&x" (r_) : "x" (a), "m" (b_) ); \ + r_; \ +}) +# define cmadd_vv(a, b, c) ({ \ + cvec_t r_ = (c); \ + asm ( "vfmaddcsh %2, %1, %0" : "+x" (r_) : "x" (a), "m" (b) ); \ + r_; \ +}) +# define cmadd_vs(a, b, c) ({ \ + _Complex _Float16 b_ = (b); \ + cvec_t r_ = (c); \ + asm ( "vfmaddcsh %2, %1, %0" : "+x" (r_) : "x" (a), "m" (b_) ); \ + r_; \ +}) +# endif +# define cmul_vv(a, b) _cmul_vv(a, b, ) +# define cmulc_vv(a, b) _cmul_vv(a, b, c) +# define cmul_vs(a, b) _cmul_vs(a, b, ) +# define cmulc_vs(a, b) _cmul_vs(a, b, c) +#endif + int fma_test(void) { unsigned int i; @@ -156,5 +227,99 @@ int fma_test(void) touch(inv); #endif +#ifdef CELEM_COUNT + +# if VEC_SIZE > FLOAT_SIZE +# define cvec_t vec_t +# define ceq eq +# else + { + /* Cannot re-use the function-scope variables (for being too small). */ + cvec_t x, y, z, src = { 1, 2 }, inv = { 2, 1 }, one = { 1, 1 }; +# define ceq(x, y) ({ \ + unsigned int r_; \ + asm ( "vcmpph $0, %1, %2, %0" : "=k" (r_) : "x" (x), "x" (y) ); \ + (r_ & 3) == 3; \ +}) +# endif + + /* (a * i)² == -a² */ + x = cmul_vs(src, I); + y = cmul_vv(x, x); + x = -src; + touch(src); + z = cmul_vv(x, src); + if ( !ceq(y, z) ) return __LINE__; + + /* conj(a * b) == conj(a) * conj(b) */ + touch(src); + x = conj(src); + touch(inv); + y = cmulc_vv(x, inv); + touch(src); + touch(inv); + z = conj(cmul_vv(src, inv)); + if ( !ceq(y, z) ) return __LINE__; + + /* a * conj(a) == |a|² */ + touch(src); + y = src; + touch(src); + x = cmulc_vv(y, src); + y *= y; + for ( i = 0; i < ELEM_COUNT; i += 2 ) + { + if ( x[i] != y[i] + y[i + 1] ) return __LINE__; + if ( x[i + 1] ) return __LINE__; + } + + /* a * b == b * a + 0 */ + touch(src); + touch(inv); + x = cmul_vv(src, inv); + touch(src); + touch(inv); + y = cmadd_vv(inv, src, (cvec_t){}); + if ( !ceq(x, y) ) return __LINE__; + + /* a * 1 + b == b * 1 + a */ + touch(src); + touch(inv); + x = cmadd_vs(src, 1, inv); + for ( i = 0; i < ELEM_COUNT; i += 2 ) + { + z[i] = 1; + z[i + 1] = 0; + } + touch(z); + y = cmadd_vv(inv, z, src); + if ( !ceq(x, y) ) return __LINE__; + + /* (a + b) * c == a * c + b * c */ + touch(one); + touch(inv); + x = cmul_vv(src + one, inv); + touch(inv); + y = cmul_vv(one, inv); + touch(inv); + z = cmadd_vv(src, inv, y); + if ( !ceq(x, z) ) return __LINE__; + + /* a * i + conj(a) == (Re(a) - Im(a)) * (1 + i) */ + x = cmadd_vs(src, I, conj(src)); + for ( i = 0; i < ELEM_COUNT; i += 2 ) + { + typeof(x[0]) val = src[i] - src[i + 1]; + + if ( x[i] != val ) return __LINE__; + if ( x[i + 1] != val ) return __LINE__; + } + +# if VEC_SIZE == FLOAT_SIZE + } +# endif + +#endif /* CELEM_COUNT */ + return 0; } diff --git a/tools/tests/x86_emulator/simd.c b/tools/tests/x86_emulator/simd.c index c805f1cc1e..263cea662d 100644 --- a/tools/tests/x86_emulator/simd.c +++ b/tools/tests/x86_emulator/simd.c @@ -20,6 +20,14 @@ ENTRY(simd_test); asm ( "vcmpsd $0, %1, %2, %0" : "=k" (r_) : "m" (x_), "v" (y_) ); \ r_ == 1; \ }) +# elif VEC_SIZE == 2 +# define eq(x, y) ({ \ + _Float16 x_ = (x)[0]; \ + _Float16 __attribute__((vector_size(16))) y_ = { (y)[0] }; \ + unsigned int r_; \ + asm ( "vcmpsh $0, %1, %2, %0" : "=k" (r_) : "m" (x_), "v" (y_) ); \ + r_ == 1; \ +}) # elif FLOAT_SIZE == 4 /* * gcc's (up to at least 8.2) __builtin_ia32_cmpps256_mask() has an anomaly in @@ -31,6 +39,8 @@ ENTRY(simd_test); # define eq(x, y) ((BR(cmpps, _mask, x, y, 0, -1) & ALL_TRUE) == ALL_TRUE) # elif FLOAT_SIZE == 8 # define eq(x, y) (BR(cmppd, _mask, x, y, 0, -1) == ALL_TRUE) +# elif FLOAT_SIZE == 2 +# define eq(x, y) (B(cmpph, _mask, x, y, 0, -1) == ALL_TRUE) # elif (INT_SIZE == 1 || UINT_SIZE == 1) && defined(__AVX512BW__) # define eq(x, y) (B(pcmpeqb, _mask, (vqi_t)(x), (vqi_t)(y), -1) == ALL_TRUE) # elif (INT_SIZE == 2 || UINT_SIZE == 2) && defined(__AVX512BW__) @@ -116,6 +126,14 @@ static inline bool _to_bool(byte_vec_t bv) asm ( "vcvtusi2sd%z1 %1, %0, %0" : "=v" (t_) : "m" (u_) ); \ (vec_t){ t_[0] }; \ }) +# elif FLOAT_SIZE == 2 +# define to_u_int(type, x) ({ \ + unsigned type u_; \ + _Float16 __attribute__((vector_size(16))) t_; \ + asm ( "vcvtsh2usi %1, %0" : "=r" (u_) : "m" ((x)[0]) ); \ + asm ( "vcvtusi2sh%z1 %1, %0, %0" : "=v" (t_) : "m" (u_) ); \ + (vec_t){ t_[0] }; \ +}) # endif # define to_uint(x) to_u_int(int, x) # ifdef __x86_64__ @@ -153,6 +171,43 @@ static inline bool _to_bool(byte_vec_t bv) # define to_wint(x) BR(cvtqq2pd, _mask, BR(cvtpd2qq, _mask, x, (vdi_t)undef(), ~0), undef(), ~0) # define to_uwint(x) BR(cvtuqq2pd, _mask, BR(cvtpd2uqq, _mask, x, (vdi_t)undef(), ~0), undef(), ~0) # endif +# elif FLOAT_SIZE == 2 +# define to_int(x) BR2(vcvtw2ph, _mask, BR2(vcvtph2w, _mask, x, (vhi_t)undef(), ~0), undef(), ~0) +# define to_uint(x) BR2(vcvtuw2ph, _mask, BR2(vcvtph2uw, _mask, x, (vhi_t)undef(), ~0), undef(), ~0) +# if VEC_SIZE == 16 +# define low_half(x) (x) +# define high_half(x) ((vec_t)B_(movhlps, , (vsf_t)undef(), (vsf_t)(x))) +# define insert_half(x, y, p) ((vec_t)((p) ? B_(movlhps, , (vsf_t)(x), (vsf_t)(y)) \ + : B_(shufps, , (vsf_t)(y), (vsf_t)(x), 0b11100100))) +# elif VEC_SIZE == 32 +# define _half(x, lh) ((vhf_half_t)B(extracti32x4_, _mask, (vsi_t)(x), lh, (vsi_half_t){}, ~0)) +# define low_half(x) _half(x, 0) +# define high_half(x) _half(x, 1) +# define insert_half(x, y, p) \ + ((vec_t)B(inserti32x4_, _mask, (vsi_t)(x), (vsi_half_t)(y), p, (vsi_t)undef(), ~0)) +# elif VEC_SIZE == 64 +# define _half(x, lh) \ + ((vhf_half_t)__builtin_ia32_extracti64x4_mask((vdi_t)(x), lh, (vdi_half_t){}, ~0)) +# define low_half(x) _half(x, 0) +# define high_half(x) _half(x, 1) +# define insert_half(x, y, p) \ + ((vec_t)__builtin_ia32_inserti64x4_mask((vdi_t)(x), (vdi_half_t)(y), p, (vdi_t)undef(), ~0)) +# endif +# define to_w_int(x, s) ({ \ + vhf_half_t t_ = low_half(x); \ + vsi_t lo_, hi_; \ + touch(t_); \ + lo_ = BR2(vcvtph2 ## s ## dq, _mask, t_, (vsi_t)undef(), ~0); \ + t_ = high_half(x); \ + touch(t_); \ + hi_ = BR2(vcvtph2 ## s ## dq, _mask, t_, (vsi_t)undef(), ~0); \ + touch(lo_); touch(hi_); \ + insert_half(insert_half(undef(), \ + BR2(vcvt ## s ## dq2ph, _mask, lo_, (vhf_half_t){}, ~0), 0), \ + BR2(vcvt ## s ## dq2ph, _mask, hi_, (vhf_half_t){}, ~0), 1); \ +}) +# define to_wint(x) to_w_int(x, ) +# define to_uwint(x) to_w_int(x, u) # endif #elif VEC_SIZE == 16 && defined(__SSE2__) # if FLOAT_SIZE == 4 @@ -240,10 +295,18 @@ static inline vec_t movlhps(vec_t x, vec_t y) { # define scale(x, y) scalar_2op(x, y, "vscalefsd %[in2], %[in1], %[out]") # define sqrt(x) scalar_1op(x, "vsqrtsd %[in], %[out], %[out]") # define trunc(x) scalar_1op(x, "vrndscalesd $0b1011, %[in], %[out], %[out]") +# elif FLOAT_SIZE == 2 +# define getexp(x) scalar_1op(x, "vgetexpsh %[in], %[out], %[out]") +# define getmant(x) scalar_1op(x, "vgetmantsh $0, %[in], %[out], %[out]") +# define recip(x) scalar_1op(x, "vrcpsh %[in], %[out], %[out]") +# define rsqrt(x) scalar_1op(x, "vrsqrtsh %[in], %[out], %[out]") +# define scale(x, y) scalar_2op(x, y, "vscalefsh %[in2], %[in1], %[out]") +# define sqrt(x) scalar_1op(x, "vsqrtsh %[in], %[out], %[out]") +# define trunc(x) scalar_1op(x, "vrndscalesh $0b1011, %[in], %[out], %[out]") # endif #elif defined(FLOAT_SIZE) && defined(__AVX512F__) && \ (VEC_SIZE == 64 || defined(__AVX512VL__)) -# if ELEM_COUNT == 8 /* vextractf{32,64}x4 */ || \ +# if (ELEM_COUNT == 8 && ELEM_SIZE >= 4) /* vextractf{32,64}x4 */ || \ (ELEM_COUNT == 16 && ELEM_SIZE == 4 && defined(__AVX512DQ__)) /* vextractf32x8 */ || \ (ELEM_COUNT == 4 && ELEM_SIZE == 8 && defined(__AVX512DQ__)) /* vextractf64x2 */ # define _half(x, lh) ({ \ @@ -398,6 +461,21 @@ static inline vec_t movlhps(vec_t x, vec_t y) { VEC_SIZE == 32 ? 0b01 : 0b00011011, undef(), ~0), \ 0b01010101, undef(), ~0) # endif +# elif FLOAT_SIZE == 2 +# define frac(x) BR2(reduceph, _mask, x, 0b00001011, undef(), ~0) +# define getexp(x) BR(getexpph, _mask, x, undef(), ~0) +# define getmant(x) BR(getmantph, _mask, x, 0, undef(), ~0) +# define max(x, y) BR2(maxph, _mask, x, y, undef(), ~0) +# define min(x, y) BR2(minph, _mask, x, y, undef(), ~0) +# define scale(x, y) BR2(scalefph, _mask, x, y, undef(), ~0) +# define recip(x) B(rcpph, _mask, x, undef(), ~0) +# define rsqrt(x) B(rsqrtph, _mask, x, undef(), ~0) +# define shrink1(x) BR2(vcvtps2phx, _mask, (vsf_t)(x), (vhf_half_t){}, ~0) +# define shrink2(x) BR2(vcvtpd2ph, _mask, (vdf_t)(x), (vhf_quarter_t){}, ~0) +# define sqrt(x) BR2(sqrtph, _mask, x, undef(), ~0) +# define trunc(x) BR2(rndscaleph, _mask, x, 0b1011, undef(), ~0) +# define widen1(x) ((vec_t)BR2(vcvtph2psx, _mask, x, (vsf_t)undef(), ~0)) +# define widen2(x) ((vec_t)BR2(vcvtph2pd, _mask, x, (vdf_t)undef(), ~0)) # endif #elif FLOAT_SIZE == 4 && defined(__SSE__) # if VEC_SIZE == 32 && defined(__AVX__) @@ -920,6 +998,16 @@ static inline vec_t movlhps(vec_t x, vec_t y) { # define dup_lo(x) B(movddup, _mask, x, undef(), ~0) # endif #endif +#if FLOAT_SIZE == 2 && ELEM_COUNT > 1 +# define dup_hi(x) ((vec_t)B(pshufhw, _mask, \ + B(pshuflw, _mask, (vhi_t)(x), 0b11110101, \ + (vhi_t)undef(), ~0), \ + 0b11110101, (vhi_t)undef(), ~0)) +# define dup_lo(x) ((vec_t)B(pshufhw, _mask, \ + B(pshuflw, _mask, (vhi_t)(x), 0b10100000, \ + (vhi_t)undef(), ~0), \ + 0b10100000, (vhi_t)undef(), ~0)) +#endif #if VEC_SIZE == 16 && defined(__SSSE3__) && !defined(__AVX512VL__) # if INT_SIZE == 1 # define abs(x) ((vec_t)__builtin_ia32_pabsb128((vqi_t)(x))) diff --git a/tools/tests/x86_emulator/simd.h b/tools/tests/x86_emulator/simd.h index 936952ab52..74a2169d7b 100644 --- a/tools/tests/x86_emulator/simd.h +++ b/tools/tests/x86_emulator/simd.h @@ -53,6 +53,9 @@ float # elif FLOAT_SIZE == 8 # define MODE DF # define ELEM_SFX "d" +# elif FLOAT_SIZE == 2 +# define MODE HF +# define ELEM_SFX "h" # endif #endif #ifndef VEC_SIZE @@ -67,7 +70,10 @@ typedef unsigned int __attribute__((mode(QI), vector_size(VEC_SIZE))) byte_vec_t /* Various builtins want plain char / int / long long vector types ... */ typedef char __attribute__((vector_size(VEC_SIZE))) vqi_t; typedef short __attribute__((vector_size(VEC_SIZE))) vhi_t; +#if VEC_SIZE >= 4 typedef int __attribute__((vector_size(VEC_SIZE))) vsi_t; +typedef float __attribute__((vector_size(VEC_SIZE))) vsf_t; +#endif #if VEC_SIZE >= 8 typedef long long __attribute__((vector_size(VEC_SIZE))) vdi_t; typedef double __attribute__((vector_size(VEC_SIZE))) vdf_t; @@ -96,6 +102,9 @@ typedef char __attribute__((vector_size(HALF_SIZE))) vqi_half_t; typedef short __attribute__((vector_size(HALF_SIZE))) vhi_half_t; typedef int __attribute__((vector_size(HALF_SIZE))) vsi_half_t; typedef long long __attribute__((vector_size(HALF_SIZE))) vdi_half_t; +#ifdef __AVX512FP16__ +typedef _Float16 __attribute__((vector_size(HALF_SIZE))) vhf_half_t; +#endif typedef float __attribute__((vector_size(HALF_SIZE))) vsf_half_t; # endif @@ -110,6 +119,9 @@ typedef char __attribute__((vector_size(QUARTER_SIZE))) vqi_quarter_t; typedef short __attribute__((vector_size(QUARTER_SIZE))) vhi_quarter_t; typedef int __attribute__((vector_size(QUARTER_SIZE))) vsi_quarter_t; typedef long long __attribute__((vector_size(QUARTER_SIZE))) vdi_quarter_t; +#ifdef __AVX512FP16__ +typedef _Float16 __attribute__((vector_size(QUARTER_SIZE))) vhf_quarter_t; +#endif # endif # if ELEM_COUNT >= 8 @@ -163,6 +175,7 @@ DECL_OCTET(half); #elif VEC_SIZE == 64 # define B(n, s, a...) __builtin_ia32_ ## n ## 512 ## s(a) # define BR(n, s, a...) __builtin_ia32_ ## n ## 512 ## s(a, 4) +# define BR2(n, s, a...) __builtin_ia32_ ## n ## 512 ## s ## _round(a, 4) #endif #ifndef B_ # define B_ B @@ -171,6 +184,9 @@ DECL_OCTET(half); # define BR B # define BR_ B_ #endif +#ifndef BR2 +# define BR2 BR +#endif #ifndef BR_ # define BR_ BR #endif diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index bbb0d67a3b..0757bd48b8 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -43,6 +43,7 @@ asm ( ".pushsection .test, \"ax\", @progbits; .popsection" ); #include "avx512er.h" #include "avx512vbmi.h" #include "avx512vbmi2-vpclmulqdq.h" +#include "avx512fp16.h" #define verbose false /* Switch to true for far more logging. */ @@ -249,6 +250,16 @@ static bool simd_check_avx512bw_gf_vl(void) return cpu_has_gfni && cpu_has_avx512vl; } +static bool simd_check_avx512fp16(void) +{ + return cpu_has_avx512_fp16; +} + +static bool simd_check_avx512fp16_vl(void) +{ + return cpu_has_avx512_fp16 && cpu_has_avx512vl; +} + static void simd_set_regs(struct cpu_user_regs *regs) { if ( cpu_has_mmx ) @@ -513,6 +524,10 @@ static const struct { AVX512VL(_VBMI+VL u16x8, avx512vbmi, 16u2), AVX512VL(_VBMI+VL s16x16, avx512vbmi, 32i2), AVX512VL(_VBMI+VL u16x16, avx512vbmi, 32u2), + SIMD(AVX512_FP16 f16 scal,avx512fp16, f2), + SIMD(AVX512_FP16 f16x32, avx512fp16, 64f2), + AVX512VL(_FP16+VL f16x8, avx512fp16, 16f2), + AVX512VL(_FP16+VL f16x16,avx512fp16, 32f2), SIMD(SHA, sse4_sha, 16), SIMD(AVX+SHA, avx_sha, 16), AVX512VL(VL+SHA, avx512f_sha, 16), diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 4edf9aba7f..ea779c2987 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -267,7 +267,7 @@ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*A SERIALIZE insn */ XEN_CPUFEATURE(TSXLDTRK, 9*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ -XEN_CPUFEATURE(AVX512_FP16, 9*32+23) /* AVX512 FP16 instructions */ +XEN_CPUFEATURE(AVX512_FP16, 9*32+23) /*A AVX512 FP16 instructions */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ XEN_CPUFEATURE(L1D_FLUSH, 9*32+28) /*S MSR_FLUSH_CMD and L1D flush. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 08 02:33:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Jun 2023 02:33:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.545076.851294 (Exim 4.92) (envelope-from ) id 1q75Sb-0001yB-0S; Thu, 08 Jun 2023 02:33:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 545076.851294; Thu, 08 Jun 2023 02:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75Sa-0001y3-Tt; Thu, 08 Jun 2023 02:33:12 +0000 Received: by outflank-mailman (input) for mailman id 545076; Thu, 08 Jun 2023 02:33:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75SZ-0001xt-Jf for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75SZ-0005Tb-Ie for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q75SZ-00084e-HX for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=QrqLZNkYMP03lh1gk7hjMWzgrVbDK46RwfGn9xNrlEY=; b=JDtRFaDn1J9amZCmoXgH47asn9 cjuLGJKcIm3KKH2Qb/fhaH+qWKUvwYV1wy2ZV63hkdhrWsY8vA4uow2YdiWQEbygNKAXdTydrdBem ElndiMzyj/xWx3voiitp01Wav7ffBlu4f6hF7huZ4IQxpwYtp8gPT0hehDqyw+fS5sl8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Fix incorrect taint constant Message-Id: Date: Thu, 08 Jun 2023 02:33:11 +0000 commit a5917ca28bf77a4770113446427fb22f81444b52 Author: Andrew Cooper AuthorDate: Mon Jun 5 10:48:59 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 5 16:10:28 2023 +0100 xen: Fix incorrect taint constant Insecure is the word being looked for here. Especially given the nature of the sole caller, and the (correct) comment next to it. Also update the taint marker from 'U' to 'I' for consistency; this isn't expected to impact anyone in practice. Fixes: 82c0d3d491cc ("xen: Add an unsecure Taint type") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/arch/arm/cpuerrata.c | 2 +- xen/common/kernel.c | 4 ++-- xen/include/xen/lib.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c index 1abacfe5bb..d0658aedb6 100644 --- a/xen/arch/arm/cpuerrata.c +++ b/xen/arch/arm/cpuerrata.c @@ -695,7 +695,7 @@ void __init enable_errata_workarounds(void) "**** Only trusted guests should be used. ****\n"); /* Taint the machine has being insecure */ - add_taint(TAINT_MACHINE_UNSECURE); + add_taint(TAINT_MACHINE_INSECURE); } #endif } diff --git a/xen/common/kernel.c b/xen/common/kernel.c index f7b1f65f37..b8b845763d 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -343,8 +343,8 @@ unsigned int tainted; * 'C' - Console output is synchronous. * 'E' - An error (e.g. a machine check exceptions) has been injected. * 'H' - HVM forced emulation prefix is permitted. + * 'I' - Platform is insecure (usually due to an errata on the platform). * 'M' - Machine had a machine check experience. - * 'U' - Platform is unsecure (usually due to an errata on the platform). * 'S' - Out of spec CPU (One core has a feature incompatible with others). * * The string is overwritten by the next call to print_taint(). @@ -354,7 +354,7 @@ char *print_tainted(char *str) if ( tainted ) { snprintf(str, TAINT_STRING_MAX_LEN, "Tainted: %c%c%c%c%c%c", - tainted & TAINT_MACHINE_UNSECURE ? 'U' : ' ', + tainted & TAINT_MACHINE_INSECURE ? 'I' : ' ', tainted & TAINT_MACHINE_CHECK ? 'M' : ' ', tainted & TAINT_SYNC_CONSOLE ? 'C' : ' ', tainted & TAINT_ERROR_INJECT ? 'E' : ' ', diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index e914ccade0..75ae7489b9 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -201,7 +201,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c); #define TAINT_MACHINE_CHECK (1u << 1) #define TAINT_ERROR_INJECT (1u << 2) #define TAINT_HVM_FEP (1u << 3) -#define TAINT_MACHINE_UNSECURE (1u << 4) +#define TAINT_MACHINE_INSECURE (1u << 4) #define TAINT_CPU_OUT_OF_SPEC (1u << 5) extern unsigned int tainted; #define TAINT_STRING_MAX_LEN 20 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 08 02:33:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Jun 2023 02:33:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.545077.851297 (Exim 4.92) (envelope-from ) id 1q75Sl-00020s-1o; Thu, 08 Jun 2023 02:33:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 545077.851297; Thu, 08 Jun 2023 02:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75Sk-00020i-VN; Thu, 08 Jun 2023 02:33:22 +0000 Received: by outflank-mailman (input) for mailman id 545077; Thu, 08 Jun 2023 02:33:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75Sj-00020W-Mh for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75Sj-0005Tn-Lo for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q75Sj-000857-Kj for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oxdN0BrwGH1bXkgK7cCv+59v8DNzrkcI4EZdMKZc2UA=; b=viQsESqitcYliibv/7h5RwPs+g /1VntEMThzvRmbcuYx5D273rhizJ/3t79LZFyqtTZyY46CPtALeS2N8bE/XVEIfdPI1od50EmvCwF azfohZ4YPec9IDVYvI08o+o2obcE67guRCKEeOXJXGnIpzgTEpFcTPPTdrj41e8pJYzM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/microcode: Add missing unlock in microcode_update_helper() Message-Id: Date: Thu, 08 Jun 2023 02:33:21 +0000 commit b35b22acb887f682efe8385b3df165220bc84c86 Author: Alejandro Vallejo AuthorDate: Mon Jun 5 16:01:16 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 5 16:11:10 2023 +0100 x86/microcode: Add missing unlock in microcode_update_helper() microcode_update_helper() may return early while holding cpu_add_remove_lock, hence preventing any writers from taking it again. Leave through the `put` label instead so it's properly released. Fixes: 5ed12565aa32 ("microcode: rendezvous CPUs in NMI handler and load ucode") Signed-off-by: Alejandro Vallejo Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/microcode/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index c1033f3bc2..e65af4b82e 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -599,7 +599,8 @@ static long cf_check microcode_update_helper(void *data) printk(XENLOG_WARNING "CPU%u is expected to lead ucode loading (but got CPU%u)\n", nmi_cpu, cpumask_first(&cpu_online_map)); - return -EPERM; + ret = -EPERM; + goto put; } patch = parse_blob(buffer->buffer, buffer->len); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 08 02:33:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Jun 2023 02:33:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.545078.851301 (Exim 4.92) (envelope-from ) id 1q75Sv-00024b-4g; Thu, 08 Jun 2023 02:33:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 545078.851301; Thu, 08 Jun 2023 02:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75Sv-00024U-1x; Thu, 08 Jun 2023 02:33:33 +0000 Received: by outflank-mailman (input) for mailman id 545078; Thu, 08 Jun 2023 02:33:31 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75St-00023f-QH for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:31 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75St-0005U0-PR for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:31 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q75St-00085Z-Ny for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=D4jAkeXnZoDD0OEUCDG40ZaHTpbidDU9QZMHyMdFDQE=; b=hloaODGXQaMmYE85yrIcc+plLY Ku3RxwmrEBtK/cTn+d3DMb8tM0QBQWDmtfAe/kFKokHKkuHEAlY75InonjyzJH4Rpk9AuUK4B054i nu8N+Qe/lRV8C6bFBvVnImXSCi0n3eFvnupXoh/4XqRP0hQ2Cui50f40zJ6qYWCHCZ/s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/misra: add diff-report.py tool Message-Id: Date: Thu, 08 Jun 2023 02:33:31 +0000 commit 43840b53f6dbe220159a14d7beb9884947a76211 Author: Luca Fancellu AuthorDate: Thu May 25 09:33:59 2023 +0100 Commit: Stefano Stabellini CommitDate: Tue Jun 6 18:41:13 2023 -0700 xen/misra: add diff-report.py tool Add a new tool, diff-report.py that can be used to make diff between reports generated by xen-analysis.py tool. Currently this tool supports the Xen cppcheck text report format in its operations. The tool prints every finding that is in the report passed with -r (check report) which is not in the report passed with -b (baseline). Signed-off-by: Luca Fancellu Acked-by: Stefano Stabellini Tested-by: Stefano Stabellini --- xen/scripts/diff-report.py | 80 +++++++++++++++++ xen/scripts/xen_analysis/diff_tool/__init__.py | 0 .../xen_analysis/diff_tool/cppcheck_report.py | 44 +++++++++ xen/scripts/xen_analysis/diff_tool/debug.py | 40 +++++++++ xen/scripts/xen_analysis/diff_tool/report.py | 100 +++++++++++++++++++++ 5 files changed, 264 insertions(+) diff --git a/xen/scripts/diff-report.py b/xen/scripts/diff-report.py new file mode 100755 index 0000000000..f97cb2355c --- /dev/null +++ b/xen/scripts/diff-report.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python3 + +from __future__ import print_function +import os +import sys +from argparse import ArgumentParser +from xen_analysis.diff_tool.cppcheck_report import CppcheckReport +from xen_analysis.diff_tool.debug import Debug +from xen_analysis.diff_tool.report import ReportError + + +def log_info(text, end='\n'): + # type: (str, str) -> None + global args + global file_out + + if (args.verbose): + print(text, end=end, file=file_out) + + +def main(argv): + # type: (list) -> None + global args + global file_out + + parser = ArgumentParser(prog="diff-report.py") + parser.add_argument("-b", "--baseline", required=True, type=str, + help="Path to the baseline report.") + parser.add_argument("--debug", action='store_true', + help="Produce intermediate reports during operations.") + parser.add_argument("-o", "--out", default="stdout", type=str, + help="Where to print the tool output. Default is " + "stdout") + parser.add_argument("-r", "--report", required=True, type=str, + help="Path to the 'check report', the one checked " + "against the baseline.") + parser.add_argument("-v", "--verbose", action='store_true', + help="Print more informations during the run.") + + args = parser.parse_args() + + if args.out == "stdout": + file_out = sys.stdout + else: + try: + file_out = open(args.out, "wt") + except OSError as e: + print("ERROR: Issue opening file {}: {}".format(args.out, e)) + sys.exit(1) + + debug = Debug(args) + + try: + baseline_path = os.path.realpath(args.baseline) + log_info("Loading baseline report {}".format(baseline_path), "") + baseline = CppcheckReport(baseline_path) + baseline.parse() + debug.debug_print_parsed_report(baseline) + log_info(" [OK]") + new_rep_path = os.path.realpath(args.report) + log_info("Loading check report {}".format(new_rep_path), "") + new_rep = CppcheckReport(new_rep_path) + new_rep.parse() + debug.debug_print_parsed_report(new_rep) + log_info(" [OK]") + except ReportError as e: + print("ERROR: {}".format(e)) + sys.exit(1) + + output = new_rep - baseline + print(output, end="", file=file_out) + + if len(output) > 0: + sys.exit(1) + + sys.exit(0) + + +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/xen/scripts/xen_analysis/diff_tool/__init__.py b/xen/scripts/xen_analysis/diff_tool/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/xen/scripts/xen_analysis/diff_tool/cppcheck_report.py b/xen/scripts/xen_analysis/diff_tool/cppcheck_report.py new file mode 100644 index 0000000000..e7e80a9dde --- /dev/null +++ b/xen/scripts/xen_analysis/diff_tool/cppcheck_report.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 + +import re +from .report import Report, ReportError + + +class CppcheckReport(Report): + def __init__(self, report_path): + # type: (str) -> None + super(CppcheckReport, self).__init__(report_path) + # This matches a string like: + # path/to/file.c(,): + # and captures file name path and line number + # the last capture group is used for text substitution in __str__ + self.__report_entry_regex = re.compile(r'^(.*)\((\d+)(,\d+\):.*)$') + + def parse(self): + # type: () -> None + report_path = self.get_report_path() + try: + with open(report_path, "rt") as infile: + report_lines = infile.readlines() + except OSError as e: + raise ReportError("Issue with reading file {}: {}" + .format(report_path, e)) + for line in report_lines: + entry = self.__report_entry_regex.match(line) + if entry and entry.group(1) and entry.group(2): + file_path = entry.group(1) + line_number = int(entry.group(2)) + self.add_entry(file_path, line_number, line) + else: + raise ReportError("Malformed report entry in file {}:\n{}" + .format(report_path, line)) + + def __str__(self): + # type: () -> str + ret = "" + for entry in self.to_list(): + ret += re.sub(self.__report_entry_regex, + r'{}({}\3'.format(entry.file_path, + entry.line_number), + entry.text) + return ret diff --git a/xen/scripts/xen_analysis/diff_tool/debug.py b/xen/scripts/xen_analysis/diff_tool/debug.py new file mode 100644 index 0000000000..65cca24641 --- /dev/null +++ b/xen/scripts/xen_analysis/diff_tool/debug.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 + +from __future__ import print_function +import os +from .report import Report + + +class Debug: + def __init__(self, args): + self.args = args + + def __get_debug_out_filename(self, path, type): + # type: (str, str) -> str + # Take basename + file_name = os.path.basename(path) + # Split in name and extension + file_name = os.path.splitext(file_name) + if self.args.out != "stdout": + out_folder = os.path.dirname(self.args.out) + else: + out_folder = "./" + dbg_report_path = out_folder + file_name[0] + type + file_name[1] + + return dbg_report_path + + def __debug_print_report(self, report, type): + # type: (Report, str) -> None + report_name = self.__get_debug_out_filename(report.get_report_path(), + type) + try: + with open(report_name, "wt") as outfile: + print(report, end="", file=outfile) + except OSError as e: + print("ERROR: Issue opening file {}: {}".format(report_name, e)) + + def debug_print_parsed_report(self, report): + # type: (Report) -> None + if not self.args.debug: + return + self.__debug_print_report(report, ".parsed") diff --git a/xen/scripts/xen_analysis/diff_tool/report.py b/xen/scripts/xen_analysis/diff_tool/report.py new file mode 100644 index 0000000000..4a303d61b3 --- /dev/null +++ b/xen/scripts/xen_analysis/diff_tool/report.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python3 + +import os + + +class ReportError(Exception): + pass + + +class Report(object): + class ReportEntry: + def __init__(self, file_path, line_number, entry_text, line_id): + # type: (str, int, list, int) -> None + if not isinstance(line_number, int) or \ + not isinstance(line_id, int): + raise ReportError("ReportEntry constructor wrong type args") + self.file_path = file_path + self.line_number = line_number + self.text = entry_text + self.line_id = line_id + + def __init__(self, report_path): + # type: (str) -> None + self.__entries = {} + self.__path = report_path + self.__last_line_order = 0 + + def parse(self): + # type: () -> None + raise ReportError("Please create a specialised class from 'Report'.") + + def get_report_path(self): + # type: () -> str + return self.__path + + def get_report_entries(self): + # type: () -> dict + return self.__entries + + def add_entry(self, entry_path, entry_line_number, entry_text): + # type: (str, int, str) -> None + entry = Report.ReportEntry(entry_path, entry_line_number, entry_text, + self.__last_line_order) + if entry_path in self.__entries.keys(): + self.__entries[entry_path].append(entry) + else: + self.__entries[entry_path] = [entry] + self.__last_line_order += 1 + + def to_list(self): + # type: () -> list + report_list = [] + for _, entries in self.__entries.items(): + for entry in entries: + report_list.append(entry) + + report_list.sort(key=lambda x: x.line_id) + return report_list + + def __str__(self): + # type: () -> str + ret = "" + for entry in self.to_list(): + ret += entry.file_path + ":" + entry.line_number + ":" + entry.text + + return ret + + def __len__(self): + # type: () -> int + return len(self.to_list()) + + def __sub__(self, report_b): + # type: (Report) -> Report + if self.__class__ != report_b.__class__: + raise ReportError("Diff of different type of report!") + + filename, file_extension = os.path.splitext(self.__path) + diff_report = self.__class__(filename + ".diff" + file_extension) + # Put in the diff report only records of this report that are not + # present in the report_b. + for file_path, entries in self.__entries.items(): + rep_b_entries = report_b.get_report_entries() + if file_path in rep_b_entries.keys(): + # File path exists in report_b, so check what entries of that + # file path doesn't exist in report_b and add them to the diff + rep_b_entries_num = [ + x.line_number for x in rep_b_entries[file_path] + ] + for entry in entries: + if entry.line_number not in rep_b_entries_num: + diff_report.add_entry(file_path, entry.line_number, + entry.text) + else: + # File path doesn't exist in report_b, so add every entry + # of that file path to the diff + for entry in entries: + diff_report.add_entry(file_path, entry.line_number, + entry.text) + + return diff_report -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 08 02:33:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Jun 2023 02:33:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.545079.851306 (Exim 4.92) (envelope-from ) id 1q75T5-00027u-6V; Thu, 08 Jun 2023 02:33:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 545079.851306; Thu, 08 Jun 2023 02:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75T5-00027n-3Z; Thu, 08 Jun 2023 02:33:43 +0000 Received: by outflank-mailman (input) for mailman id 545079; Thu, 08 Jun 2023 02:33:41 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75T3-00027Y-Tb for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:41 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75T3-0005U7-Si for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:41 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q75T3-000862-Rh for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:41 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cMwYo96Q6cDntF0Lyzdz4RNu+jzNjkGWj5owqWWoQQ0=; b=r1shCdFU9Dy6zNSe9Urwz1ANLq U2dq4Lt/1H81A9Fy87TeI9dJZzQeAbOF3H31ecJ1kTc9zcfkcpnETVVWTJHl/kX+ofAzriNttxuZg +ca5GJaC+YsclLgJSJOth0wEpqLR3wejKEilOAPimfJj2RxXXnu/9wQTChLS4odOwJFE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/misra: diff-report.py: add report patching feature Message-Id: Date: Thu, 08 Jun 2023 02:33:41 +0000 commit 1d7c45f895b6b1fc42086ac645765279fd52bc31 Author: Luca Fancellu AuthorDate: Thu May 25 09:34:00 2023 +0100 Commit: Stefano Stabellini CommitDate: Tue Jun 6 18:41:13 2023 -0700 xen/misra: diff-report.py: add report patching feature Add a feature to the diff-report.py script that improves the comparison between two analysis report, one from a baseline codebase and the other from the changes applied to the baseline. The comparison between reports of different codebase is an issue because entries in the baseline could have been moved in position due to addition or deletion of unrelated lines or can disappear because of deletion of the interested line, making the comparison between two revisions of the code harder. Having a baseline report, a report of the codebase with the changes called "new report" and a git diff format file that describes the changes happened to the code from the baseline, this feature can understand which entries from the baseline report are deleted or shifted in position due to changes to unrelated lines and can modify them as they will appear in the "new report". Having the "patched baseline" and the "new report", now it's simple to make the diff between them and print only the entry that are new. Signed-off-by: Luca Fancellu Acked-by: Stefano Stabellini Tested-by: Stefano Stabellini --- xen/scripts/diff-report.py | 54 ++++- xen/scripts/xen_analysis/diff_tool/debug.py | 21 ++ xen/scripts/xen_analysis/diff_tool/report.py | 87 ++++++++ .../diff_tool/unified_format_parser.py | 232 +++++++++++++++++++++ 4 files changed, 392 insertions(+), 2 deletions(-) diff --git a/xen/scripts/diff-report.py b/xen/scripts/diff-report.py index f97cb2355c..636f98f5ee 100755 --- a/xen/scripts/diff-report.py +++ b/xen/scripts/diff-report.py @@ -7,6 +7,10 @@ from argparse import ArgumentParser from xen_analysis.diff_tool.cppcheck_report import CppcheckReport from xen_analysis.diff_tool.debug import Debug from xen_analysis.diff_tool.report import ReportError +from xen_analysis.diff_tool.unified_format_parser import \ + (UnifiedFormatParser, UnifiedFormatParseError) +from xen_analysis.settings import repo_dir +from xen_analysis.utils import invoke_command def log_info(text, end='\n'): @@ -36,9 +40,32 @@ def main(argv): "against the baseline.") parser.add_argument("-v", "--verbose", action='store_true', help="Print more informations during the run.") + parser.add_argument("--patch", type=str, + help="The patch file containing the changes to the " + "code, from the baseline analysis result to the " + "'check report' analysis result.\n" + "Do not use with --baseline-rev/--report-rev") + parser.add_argument("--baseline-rev", type=str, + help="Revision or SHA of the codebase analysed to " + "create the baseline report.\n" + "Use together with --report-rev") + parser.add_argument("--report-rev", type=str, + help="Revision or SHA of the codebase analysed to " + "create the 'check report'.\n" + "Use together with --baseline-rev") args = parser.parse_args() + if args.patch and (args.baseline_rev or args.report_rev): + print("ERROR: '--patch' argument can't be used with '--baseline-rev'" + " or '--report-rev'.") + sys.exit(1) + + if bool(args.baseline_rev) != bool(args.report_rev): + print("ERROR: '--baseline-rev' must be used together with " + "'--report-rev'.") + sys.exit(1) + if args.out == "stdout": file_out = sys.stdout else: @@ -63,11 +90,34 @@ def main(argv): new_rep.parse() debug.debug_print_parsed_report(new_rep) log_info(" [OK]") - except ReportError as e: + diff_source = None + if args.patch: + diff_source = os.path.realpath(args.patch) + elif args.baseline_rev: + git_diff = invoke_command( + "git --git-dir={}/.git diff -C -C {}..{}" + .format(repo_dir, args.baseline_rev, args.report_rev), + True, "Error occured invoking:\n{}\n\n{}" + ) + diff_source = git_diff.splitlines(keepends=True) + if diff_source: + log_info("Parsing changes...", "") + diffs = UnifiedFormatParser(diff_source) + debug.debug_print_parsed_diff(diffs) + log_info(" [OK]") + except (ReportError, UnifiedFormatParseError) as e: print("ERROR: {}".format(e)) sys.exit(1) - output = new_rep - baseline + if args.patch or args.baseline_rev: + log_info("Patching baseline...", "") + baseline_patched = baseline.patch(diffs) + debug.debug_print_patched_report(baseline_patched) + log_info(" [OK]") + output = new_rep - baseline_patched + else: + output = new_rep - baseline + print(output, end="", file=file_out) if len(output) > 0: diff --git a/xen/scripts/xen_analysis/diff_tool/debug.py b/xen/scripts/xen_analysis/diff_tool/debug.py index 65cca24641..fcf1d861b5 100644 --- a/xen/scripts/xen_analysis/diff_tool/debug.py +++ b/xen/scripts/xen_analysis/diff_tool/debug.py @@ -3,6 +3,7 @@ from __future__ import print_function import os from .report import Report +from .unified_format_parser import UnifiedFormatParser class Debug: @@ -38,3 +39,23 @@ class Debug: if not self.args.debug: return self.__debug_print_report(report, ".parsed") + + def debug_print_patched_report(self, report): + # type: (Report) -> None + if not self.args.debug: + return + # The patched report contains already .patched in its name + self.__debug_print_report(report, "") + + def debug_print_parsed_diff(self, diff): + # type: (UnifiedFormatParser) -> None + if not self.args.debug: + return + diff_filename = diff.get_diff_path() + out_pathname = self.__get_debug_out_filename(diff_filename, ".parsed") + try: + with open(out_pathname, "wt") as outfile: + for change_obj in diff.get_change_sets().values(): + print(change_obj, end="", file=outfile) + except OSError as e: + print("ERROR: Issue opening file {}: {}".format(out_pathname, e)) diff --git a/xen/scripts/xen_analysis/diff_tool/report.py b/xen/scripts/xen_analysis/diff_tool/report.py index 4a303d61b3..b80eb31114 100644 --- a/xen/scripts/xen_analysis/diff_tool/report.py +++ b/xen/scripts/xen_analysis/diff_tool/report.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import os +from .unified_format_parser import UnifiedFormatParser, ChangeSet class ReportError(Exception): @@ -47,6 +48,92 @@ class Report(object): self.__entries[entry_path] = [entry] self.__last_line_order += 1 + def remove_entries(self, entry_file_path): + # type: (str) -> None + del self.__entries[entry_file_path] + + def remove_entry(self, entry_path, line_id): + # type: (str, int) -> None + if entry_path in self.__entries.keys(): + len_entry_path = len(self.__entries[entry_path]) + if len_entry_path == 1: + del self.__entries[entry_path] + else: + if line_id in self.__entries[entry_path]: + self.__entries[entry_path].remove(line_id) + + def patch(self, diff_obj): + # type: (UnifiedFormatParser) -> Report + filename, file_extension = os.path.splitext(self.__path) + patched_report = self.__class__(filename + ".patched" + file_extension) + remove_files = [] + rename_files = [] + remove_entry = [] + ChangeMode = ChangeSet.ChangeMode + + # Copy entries from this report to the report we are going to patch + for entries in self.__entries.values(): + for entry in entries: + patched_report.add_entry(entry.file_path, entry.line_number, + entry.text) + + # Patch the output report + patched_rep_entries = patched_report.get_report_entries() + for file_diff, change_obj in diff_obj.get_change_sets().items(): + if change_obj.is_change_mode(ChangeMode.COPY): + # Copy the original entry pointed by change_obj.orig_file into + # a new key in the patched report named change_obj.dst_file, + # that here is file_diff variable content, because this + # change_obj is pushed into the change_sets with the + # change_obj.dst_file key + if change_obj.orig_file in self.__entries.keys(): + for entry in self.__entries[change_obj.orig_file]: + patched_report.add_entry(file_diff, + entry.line_number, + entry.text) + + if file_diff in patched_rep_entries.keys(): + if change_obj.is_change_mode(ChangeMode.DELETE): + # No need to check changes here, just remember to delete + # the file from the report + remove_files.append(file_diff) + continue + elif change_obj.is_change_mode(ChangeMode.RENAME): + # Remember to rename the file entry on this report + rename_files.append(change_obj) + + for line_num, change_type in change_obj.get_change_set(): + len_rep = len(patched_rep_entries[file_diff]) + for i in range(len_rep): + rep_item = patched_rep_entries[file_diff][i] + if change_type == ChangeSet.ChangeType.REMOVE: + if rep_item.line_number == line_num: + # This line is removed with this changes, + # append to the list of entries to be removed + remove_entry.append(rep_item) + elif rep_item.line_number > line_num: + rep_item.line_number -= 1 + elif change_type == ChangeSet.ChangeType.ADD: + if rep_item.line_number >= line_num: + rep_item.line_number += 1 + # Remove deleted entries from the list + if len(remove_entry) > 0: + for entry in remove_entry: + patched_report.remove_entry(entry.file_path, + entry.line_id) + del remove_entry[:] + + if len(remove_files) > 0: + for file_name in remove_files: + patched_report.remove_entries(file_name) + + if len(rename_files) > 0: + for change_obj in rename_files: + patched_rep_entries[change_obj.dst_file] = \ + patched_rep_entries.pop(change_obj.orig_file) + + return patched_report + def to_list(self): # type: () -> list report_list = [] diff --git a/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py b/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py new file mode 100644 index 0000000000..8b3fbc318d --- /dev/null +++ b/xen/scripts/xen_analysis/diff_tool/unified_format_parser.py @@ -0,0 +1,232 @@ +#!/usr/bin/env python3 + +import re +import sys + +try: + from enum import Enum +except Exception: + if sys.version_info[0] == 2: + print("Please install enum34 package when using python 2.") + else: + print("Please use python version 3.5 or above.") + sys.exit(1) + +try: + from typing import Tuple +except Exception: + if sys.version_info[0] == 2: + print("Please install typing package when using python 2.") + else: + print("Please use python version 3.5 or above.") + sys.exit(1) + + +class UnifiedFormatParseError(Exception): + pass + + +class ParserState(Enum): + FIND_DIFF_HEADER = 0 + REGISTER_CHANGES = 1 + FIND_HUNK_OR_DIFF_HEADER = 2 + + +class ChangeSet(object): + class ChangeType(Enum): + REMOVE = 0 + ADD = 1 + + class ChangeMode(Enum): + NONE = 0 + CHANGE = 1 + RENAME = 2 + DELETE = 3 + COPY = 4 + + def __init__(self, a_file, b_file): + # type: (str, str) -> None + self.orig_file = a_file + self.dst_file = b_file + self.change_mode = ChangeSet.ChangeMode.NONE + self.__changes = [] + + def __str__(self): + # type: () -> str + str_out = "{}: {} -> {}:\n{}\n".format( + str(self.change_mode), self.orig_file, self.dst_file, + str(self.__changes) + ) + return str_out + + def set_change_mode(self, change_mode): + # type: (ChangeMode) -> None + self.change_mode = change_mode + + def is_change_mode(self, change_mode): + # type: (ChangeMode) -> bool + return self.change_mode == change_mode + + def add_change(self, line_number, change_type): + # type: (int, ChangeType) -> None + self.__changes.append((line_number, change_type)) + + def get_change_set(self): + # type: () -> dict + return self.__changes + + +class UnifiedFormatParser(object): + def __init__(self, args): + # type: (str | list) -> None + if isinstance(args, str): + self.__diff_file = args + try: + with open(self.__diff_file, "rt") as infile: + self.__diff_lines = infile.readlines() + except OSError as e: + raise UnifiedFormatParseError( + "Issue with reading file {}: {}" + .format(self.__diff_file, e) + ) + elif isinstance(args, list): + self.__diff_file = "git-diff-local.txt" + self.__diff_lines = args + else: + raise UnifiedFormatParseError( + "UnifiedFormatParser constructor called with wrong arguments") + + self.__git_diff_header = re.compile(r'^diff --git a/(.*) b/(.*)$') + self.__git_hunk_header = \ + re.compile(r'^@@ -\d+,(\d+) \+(\d+),(\d+) @@.*$') + self.__diff_set = {} + self.__parse() + + def get_diff_path(self): + # type: () -> str + return self.__diff_file + + def add_change_set(self, change_set): + # type: (ChangeSet) -> None + if not change_set.is_change_mode(ChangeSet.ChangeMode.NONE): + if change_set.is_change_mode(ChangeSet.ChangeMode.COPY): + # Add copy change mode items using the dst_file key, because + # there might be other changes for the orig_file in this diff + self.__diff_set[change_set.dst_file] = change_set + else: + self.__diff_set[change_set.orig_file] = change_set + + def __parse(self): + # type: () -> None + def parse_diff_header(line): + # type: (str) -> ChangeSet | None + change_item = None + diff_head = self.__git_diff_header.match(line) + if diff_head and diff_head.group(1) and diff_head.group(2): + change_item = ChangeSet(diff_head.group(1), diff_head.group(2)) + + return change_item + + def parse_hunk_header(line): + # type: (str) -> Tuple[int, int, int] + file_linenum = -1 + hunk_a_linemax = -1 + hunk_b_linemax = -1 + hunk_head = self.__git_hunk_header.match(line) + if hunk_head and hunk_head.group(1) and hunk_head.group(2) \ + and hunk_head.group(3): + file_linenum = int(hunk_head.group(2)) + hunk_a_linemax = int(hunk_head.group(1)) + hunk_b_linemax = int(hunk_head.group(3)) + + return (file_linenum, hunk_a_linemax, hunk_b_linemax) + + file_linenum = 0 + hunk_a_linemax = 0 + hunk_b_linemax = 0 + diff_elem = None + parse_state = ParserState.FIND_DIFF_HEADER + ChangeMode = ChangeSet.ChangeMode + ChangeType = ChangeSet.ChangeType + + for line in self.__diff_lines: + if parse_state == ParserState.FIND_DIFF_HEADER: + diff_elem = parse_diff_header(line) + if diff_elem: + # Found the diff header, go to the next stage + parse_state = ParserState.FIND_HUNK_OR_DIFF_HEADER + elif parse_state == ParserState.FIND_HUNK_OR_DIFF_HEADER: + # Here only these change modalities will be registered: + # deleted file mode + # rename from + # rename to + # copy from + # copy to + # + # These will be ignored: + # old mode + # new mode + # new file mode + # + # Also these info will be ignored + # similarity index + # dissimilarity index + # index .. + if line.startswith("deleted file"): + # If the file is deleted, register it but don't go through + # the changes that will be only a set of lines removed + diff_elem.set_change_mode(ChangeMode.DELETE) + parse_state = ParserState.FIND_DIFF_HEADER + elif line.startswith("new file"): + # If the file is new, skip it, as it doesn't give any + # useful information on the report translation + parse_state = ParserState.FIND_DIFF_HEADER + elif line.startswith("rename to"): + # Renaming operation can be a pure renaming or a rename + # and a set of change, so keep looking for the hunk + # header + diff_elem.set_change_mode(ChangeMode.RENAME) + elif line.startswith("copy to"): + # This is a copy operation, mark it + diff_elem.set_change_mode(ChangeMode.COPY) + else: + # Look for the hunk header + (file_linenum, hunk_a_linemax, hunk_b_linemax) = \ + parse_hunk_header(line) + if file_linenum >= 0: + if diff_elem.is_change_mode(ChangeMode.NONE): + # The file has only changes + diff_elem.set_change_mode(ChangeMode.CHANGE) + parse_state = ParserState.REGISTER_CHANGES + else: + # ... or there could be a diff header + new_diff_elem = parse_diff_header(line) + if new_diff_elem: + # Found a diff header, register the last change + # item + self.add_change_set(diff_elem) + diff_elem = new_diff_elem + elif parse_state == ParserState.REGISTER_CHANGES: + if (hunk_b_linemax > 0) and line.startswith("+"): + diff_elem.add_change(file_linenum, ChangeType.ADD) + hunk_b_linemax -= 1 + elif (hunk_a_linemax > 0) and line.startswith("-"): + diff_elem.add_change(file_linenum, ChangeType.REMOVE) + hunk_a_linemax -= 1 + file_linenum -= 1 + elif ((hunk_a_linemax + hunk_b_linemax) > 0) and \ + line.startswith(" "): + hunk_a_linemax -= 1 if (hunk_a_linemax > 0) else 0 + hunk_b_linemax -= 1 if (hunk_b_linemax > 0) else 0 + + if (hunk_a_linemax + hunk_b_linemax) <= 0: + parse_state = ParserState.FIND_HUNK_OR_DIFF_HEADER + + file_linenum += 1 + + if diff_elem is not None: + self.add_change_set(diff_elem) + + def get_change_sets(self): + # type: () -> dict + return self.__diff_set -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 08 02:33:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Jun 2023 02:33:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.545080.851310 (Exim 4.92) (envelope-from ) id 1q75TF-0002BS-9J; Thu, 08 Jun 2023 02:33:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 545080.851310; Thu, 08 Jun 2023 02:33:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75TF-0002BL-6X; Thu, 08 Jun 2023 02:33:53 +0000 Received: by outflank-mailman (input) for mailman id 545080; Thu, 08 Jun 2023 02:33:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75TE-0002BC-0H for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q75TD-0005UO-Vf for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:51 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q75TD-00086W-Us for xen-changelog@lists.xenproject.org; Thu, 08 Jun 2023 02:33:51 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u67jP+kAxeUEC3o1ElwkYbQGetgjdtUDP3V4Z1A37nM=; b=vY6PTu++ivfKJ4od0hVNopzwun E1XO1kb22WSi1TfpKv8RJhi5QsmI2gs3V6ps0vqSESCV1RDZTrjbNH7NjL8gc4Jql6RfG0VEP6XCB 1L17+mJRtj6RcJOV6OoGDJnwBVcNfvd2tR9Ex+QY4vMgOEY2AJIxb6r0WQ3vOFwh78LU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] maintainers: Add Xen MISRA Analysis Tools section Message-Id: Date: Thu, 08 Jun 2023 02:33:51 +0000 commit 64a647f8d817c6989edc000613b5afae19f03f99 Author: Luca Fancellu AuthorDate: Thu May 25 09:34:01 2023 +0100 Commit: Stefano Stabellini CommitDate: Tue Jun 6 18:41:14 2023 -0700 maintainers: Add Xen MISRA Analysis Tools section Add a section for the Xen MISRA Analysis Tools. Signed-off-by: Luca Fancellu Acked-by: Stefano Stabellini --- MAINTAINERS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7961c4bf07..7a07949e1d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -666,6 +666,16 @@ F: tools/xentrace/ F: xen/common/trace.c F: xen/include/xen/trace.h +XEN MISRA ANALYSIS TOOLS +M: Luca Fancellu +S: Supported +F: xen/scripts/xen_analysis/ +F: xen/scripts/xen-analysis.py +F: xen/scripts/diff-report.py +F: xen/tools/cppcheck-plat/ +F: xen/tools/convert_misra_doc.py +F: xen/tools/cppcheck-cc.sh + XSM/FLASK M: Daniel P. Smith S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:00:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:00:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546414.853248 (Exim 4.92) (envelope-from ) id 1q7tW0-00056Q-8j; Sat, 10 Jun 2023 08:00:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546414.853248; Sat, 10 Jun 2023 08:00:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tW0-000560-35; Sat, 10 Jun 2023 08:00:04 +0000 Received: by outflank-mailman (input) for mailman id 546414; Sat, 10 Jun 2023 08:00:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tVy-0004pR-Pm for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tVy-00052u-Hg for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tVy-0001we-FV for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=nVjsRYDcnkTH/OQoqWCoI1vAz9qL9Ucl8deCFttC6Sg=; b=r5n3Vj3U3bFh49S2jOInaAVNVq StreXqcUZ+Tb6XOdwz+cBDvxfwiB9kpitF2C5Dr/By+dVmxNCn9q0BYlfLfAAQK00kAuPiiaXBFNm isJ/EECP77sVi36/6F8aGRDVmLlHuEXijhXNQWAxOLxGqz2paCHqbcujRaUiKFUb8UqM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: enable SVE extension for Xen Message-Id: Date: Sat, 10 Jun 2023 08:00:02 +0000 commit ddcbaa42d8515d8e372d10f9a8014b4c5b7cc536 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:02 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/arm: enable SVE extension for Xen Enable Xen to handle the SVE extension, add code in cpufeature module to handle ZCR SVE register, disable trapping SVE feature on system boot only when SVE resources are accessed. While there, correct coding style for the comment on coprocessor trapping. Now cptr_el2 is part of the domain context and it will be restored on context switch, this is a preparation for saving the SVE context which will be part of VFP operations, so restore it before the call to save VFP registers. To save an additional isb barrier, restore cptr_el2 before an existing isb barrier and move the call for saving VFP context after that barrier. To keep a (mostly) specularity of ctxt_switch_to() and ctxt_switch_from(), move vfp_save_state() up in the function. Change the KConfig entry to make ARM64_SVE symbol selectable, by default it will be not selected. Create sve module and sve_asm.S that contains assembly routines for the SVE feature, this code is inspired from linux and it uses instruction encoding to be compatible with compilers that does not support SVE, imported instructions are documented in README.LinuxPrimitives. Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/Kconfig | 10 ++++-- xen/arch/arm/README.LinuxPrimitives | 9 +++++ xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/cpufeature.c | 7 ++-- xen/arch/arm/arm64/sve-asm.S | 48 ++++++++++++++++++++++++++ xen/arch/arm/arm64/sve.c | 59 ++++++++++++++++++++++++++++++++ xen/arch/arm/cpufeature.c | 6 +++- xen/arch/arm/domain.c | 20 +++++++---- xen/arch/arm/include/asm/arm64/sve.h | 27 +++++++++++++++ xen/arch/arm/include/asm/arm64/sysregs.h | 1 + xen/arch/arm/include/asm/cpufeature.h | 14 ++++++++ xen/arch/arm/include/asm/domain.h | 1 + xen/arch/arm/include/asm/processor.h | 2 ++ xen/arch/arm/setup.c | 5 +-- xen/arch/arm/traps.c | 27 +++++++++------ 15 files changed, 210 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 239d3aed3c..41f45d8d12 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -112,11 +112,15 @@ config ARM64_PTR_AUTH This feature is not supported in Xen. config ARM64_SVE - def_bool n + bool "Enable Scalar Vector Extension support (UNSUPPORTED)" if UNSUPPORTED depends on ARM_64 help - Scalar Vector Extension support. - This feature is not supported in Xen. + Scalar Vector Extension (SVE/SVE2) support for guests. + + Please be aware that currently, enabling this feature will add latency on + VM context switch between SVE enabled guests, between not-enabled SVE + guests and SVE enabled guests and viceversa, compared to the time + required to switch between not-enabled SVE guests. config ARM64_MTE def_bool n diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 1d53e6a898..76c8df29e4 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -62,6 +62,15 @@ done 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 +--------------------------------------------------------------------- + +SVE assembly macro: last sync @ v6.3.0 (last commit: 457391b03803) + +linux/arch/arm64/include/asm/fpsimdmacros.h xen/arch/arm/include/asm/arm64/sve-asm.S + +The following macros were taken from Linux: + _check_general_reg, _check_num, _sve_rdvl + ===================================================================== arm32 ===================================================================== diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index 28481393e9..54ad55c75c 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-y += mm.o obj-y += smc.o obj-y += smpboot.o +obj-$(CONFIG_ARM64_SVE) += sve.o sve-asm.o obj-y += traps.o obj-y += vfp.o obj-y += vsysreg.o diff --git a/xen/arch/arm/arm64/cpufeature.c b/xen/arch/arm/arm64/cpufeature.c index d9039d37b2..b4656ff4d8 100644 --- a/xen/arch/arm/arm64/cpufeature.c +++ b/xen/arch/arm/arm64/cpufeature.c @@ -455,15 +455,11 @@ static const struct arm64_ftr_bits ftr_id_dfr1[] = { ARM64_FTR_END, }; -#if 0 -/* TODO: use this to sanitize SVE once we support it */ - static const struct arm64_ftr_bits ftr_zcr[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_SIZE, 0), /* LEN */ ARM64_FTR_END, }; -#endif /* * Common ftr bits for a 32bit register with all hidden, strict @@ -603,6 +599,9 @@ void update_system_features(const struct cpuinfo_arm *new) SANITIZE_ID_REG(zfr64, 0, aa64zfr0); + if ( cpu_has_sve ) + SANITIZE_REG(zcr64, 0, zcr); + /* * Comment from Linux: * Userspace may perform DC ZVA instructions. Mismatched block sizes diff --git a/xen/arch/arm/arm64/sve-asm.S b/xen/arch/arm/arm64/sve-asm.S new file mode 100644 index 0000000000..4d15493447 --- /dev/null +++ b/xen/arch/arm/arm64/sve-asm.S @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Arm SVE assembly routines + * + * Copyright (C) 2022 ARM Ltd. + * + * Some macros and instruction encoding in this file are taken from linux 6.1.1, + * file arch/arm64/include/asm/fpsimdmacros.h, some of them are a modified + * version. + */ + +/* Sanity-check macros to help avoid encoding garbage instructions */ + +.macro _check_general_reg nr + .if (\nr) < 0 || (\nr) > 30 + .error "Bad register number \nr." + .endif +.endm + +.macro _check_num n, min, max + .if (\n) < (\min) || (\n) > (\max) + .error "Number \n out of range [\min,\max]" + .endif +.endm + +/* SVE instruction encodings for non-SVE-capable assemblers */ +/* (pre binutils 2.28, all kernel capable clang versions support SVE) */ + +/* RDVL X\nx, #\imm */ +.macro _sve_rdvl nx, imm + _check_general_reg \nx + _check_num (\imm), -0x20, 0x1f + .inst 0x04bf5000 \ + | (\nx) \ + | (((\imm) & 0x3f) << 5) +.endm + +/* Gets the current vector register size in bytes */ +GLOBAL(sve_get_hw_vl) + _sve_rdvl 0, 1 + ret + +/* + * Local variables: + * mode: ASM + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/arm64/sve.c b/xen/arch/arm/arm64/sve.c new file mode 100644 index 0000000000..e05ccc38a8 --- /dev/null +++ b/xen/arch/arm/arm64/sve.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Arm SVE feature code + * + * Copyright (C) 2022 ARM Ltd. + */ + +#include +#include +#include +#include +#include + +extern unsigned int sve_get_hw_vl(void); + +/* Takes a vector length in bits and returns the ZCR_ELx encoding */ +static inline register_t vl_to_zcr(unsigned int vl) +{ + ASSERT(vl > 0); + return ((vl / SVE_VL_MULTIPLE_VAL) - 1U) & ZCR_ELx_LEN_MASK; +} + +register_t compute_max_zcr(void) +{ + register_t cptr_bits = get_default_cptr_flags(); + register_t zcr = vl_to_zcr(SVE_VL_MAX_BITS); + unsigned int hw_vl; + + /* Remove trap for SVE resources */ + WRITE_SYSREG(cptr_bits & ~HCPTR_CP(8), CPTR_EL2); + isb(); + + /* + * Set the maximum SVE vector length, doing that we will know the VL + * supported by the platform, calling sve_get_hw_vl() + */ + WRITE_SYSREG(zcr, ZCR_EL2); + + /* + * Read the maximum VL, which could be lower than what we imposed before, + * hw_vl contains VL in bytes, multiply it by 8 to use vl_to_zcr() later + */ + hw_vl = sve_get_hw_vl() * 8U; + + /* Restore CPTR_EL2 */ + WRITE_SYSREG(cptr_bits, CPTR_EL2); + isb(); + + return vl_to_zcr(hw_vl); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index c4ec38bb25..b53e1a9776 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -9,6 +9,7 @@ #include #include #include +#include #include DECLARE_BITMAP(cpu_hwcaps, ARM_NCAPS); @@ -143,6 +144,9 @@ void identify_cpu(struct cpuinfo_arm *c) c->zfr64.bits[0] = READ_SYSREG(ID_AA64ZFR0_EL1); + if ( cpu_has_sve ) + c->zcr64.bits[0] = compute_max_zcr(); + c->dczid.bits[0] = READ_SYSREG(DCZID_EL0); c->ctr.bits[0] = READ_SYSREG(CTR_EL0); @@ -199,7 +203,7 @@ static int __init create_guest_cpuinfo(void) guest_cpuinfo.pfr64.mpam = 0; guest_cpuinfo.pfr64.mpam_frac = 0; - /* Hide SVE as Xen does not support it */ + /* Hide SVE by default */ guest_cpuinfo.pfr64.sve = 0; guest_cpuinfo.zfr64.bits[0] = 0; diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index d8ef6501ff..d5ab15db46 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -95,6 +95,9 @@ static void ctxt_switch_from(struct vcpu *p) /* CP 15 */ p->arch.csselr = READ_SYSREG(CSSELR_EL1); + /* VFP */ + vfp_save_state(p); + /* Control Registers */ p->arch.cpacr = READ_SYSREG(CPACR_EL1); @@ -155,9 +158,6 @@ static void ctxt_switch_from(struct vcpu *p) /* XXX MPU */ - /* VFP */ - vfp_save_state(p); - /* VGIC */ gic_save_state(p); @@ -181,9 +181,6 @@ static void ctxt_switch_to(struct vcpu *n) /* VGIC */ gic_restore_state(n); - /* VFP */ - vfp_restore_state(n); - /* XXX MPU */ /* Fault Status */ @@ -256,8 +253,17 @@ static void ctxt_switch_to(struct vcpu *n) WRITE_CP32(n->arch.joscr, JOSCR); WRITE_CP32(n->arch.jmcr, JMCR); #endif + + /* + * CPTR_EL2 needs to be written before calling vfp_restore_state, a + * synchronization instruction is expected after the write (isb) + */ + WRITE_SYSREG(n->arch.cptr_el2, CPTR_EL2); isb(); + /* VFP - call vfp_restore_state after writing on CPTR_EL2 + isb */ + vfp_restore_state(n); + /* CP 15 */ WRITE_SYSREG(n->arch.csselr, CSSELR_EL1); @@ -548,6 +554,8 @@ int arch_vcpu_create(struct vcpu *v) v->arch.vmpidr = MPIDR_SMP | vcpuid_to_vaffinity(v->vcpu_id); + v->arch.cptr_el2 = get_default_cptr_flags(); + v->arch.hcr_el2 = get_default_hcr_flags(); v->arch.mdcr_el2 = HDCR_TDRA | HDCR_TDOSA | HDCR_TDA; diff --git a/xen/arch/arm/include/asm/arm64/sve.h b/xen/arch/arm/include/asm/arm64/sve.h new file mode 100644 index 0000000000..c0466243c7 --- /dev/null +++ b/xen/arch/arm/include/asm/arm64/sve.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Arm SVE feature code + * + * Copyright (C) 2022 ARM Ltd. + */ + +#ifndef _ARM_ARM64_SVE_H +#define _ARM_ARM64_SVE_H + +#define SVE_VL_MAX_BITS 2048U + +/* Vector length must be multiple of 128 */ +#define SVE_VL_MULTIPLE_VAL 128U + +register_t compute_max_zcr(void); + +#endif /* _ARM_ARM64_SVE_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/include/asm/arm64/sysregs.h b/xen/arch/arm/include/asm/arm64/sysregs.h index 4638999514..4cabb9eb4d 100644 --- a/xen/arch/arm/include/asm/arm64/sysregs.h +++ b/xen/arch/arm/include/asm/arm64/sysregs.h @@ -24,6 +24,7 @@ #define ICH_EISR_EL2 S3_4_C12_C11_3 #define ICH_ELSR_EL2 S3_4_C12_C11_5 #define ICH_VMCR_EL2 S3_4_C12_C11_7 +#define ZCR_EL2 S3_4_C1_C2_0 #define __LR0_EL2(x) S3_4_C12_C12_ ## x #define __LR8_EL2(x) S3_4_C12_C13_ ## x diff --git a/xen/arch/arm/include/asm/cpufeature.h b/xen/arch/arm/include/asm/cpufeature.h index c62cf6293f..03fe684b4d 100644 --- a/xen/arch/arm/include/asm/cpufeature.h +++ b/xen/arch/arm/include/asm/cpufeature.h @@ -32,6 +32,12 @@ #define cpu_has_thumbee (boot_cpu_feature32(thumbee) == 1) #define cpu_has_aarch32 (cpu_has_arm || cpu_has_thumb) +#ifdef CONFIG_ARM64_SVE +#define cpu_has_sve (boot_cpu_feature64(sve) == 1) +#else +#define cpu_has_sve 0 +#endif + #ifdef CONFIG_ARM_32 #define cpu_has_gicv3 (boot_cpu_feature32(gic) >= 1) #define cpu_has_gentimer (boot_cpu_feature32(gentimer) == 1) @@ -323,6 +329,14 @@ struct cpuinfo_arm { }; } isa64; + union { + register_t bits[1]; + struct { + unsigned long len:4; + unsigned long __res0:60; + }; + } zcr64; + struct { register_t bits[1]; } zfr64; diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index 2a51f0ca68..e776ee704b 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -190,6 +190,7 @@ struct arch_vcpu register_t tpidrro_el0; /* HYP configuration */ + register_t cptr_el2; register_t hcr_el2; register_t mdcr_el2; diff --git a/xen/arch/arm/include/asm/processor.h b/xen/arch/arm/include/asm/processor.h index 54f2530877..bc68333412 100644 --- a/xen/arch/arm/include/asm/processor.h +++ b/xen/arch/arm/include/asm/processor.h @@ -582,6 +582,8 @@ void do_trap_guest_serror(struct cpu_user_regs *regs); register_t get_default_hcr_flags(void); +register_t get_default_cptr_flags(void); + /* * Synchronize SError unless the feature is selected. * This is relying on the SErrors are currently unmasked. diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 74b40e527f..bbf72b69aa 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -135,10 +135,11 @@ static void __init processor_id(void) cpu_has_el2_32 ? "64+32" : cpu_has_el2_64 ? "64" : "No", cpu_has_el1_32 ? "64+32" : cpu_has_el1_64 ? "64" : "No", cpu_has_el0_32 ? "64+32" : cpu_has_el0_64 ? "64" : "No"); - printk(" Extensions:%s%s%s\n", + printk(" Extensions:%s%s%s%s\n", cpu_has_fp ? " FloatingPoint" : "", cpu_has_simd ? " AdvancedSIMD" : "", - cpu_has_gicv3 ? " GICv3-SysReg" : ""); + cpu_has_gicv3 ? " GICv3-SysReg" : "", + cpu_has_sve ? " SVE" : ""); /* Warn user if we find unknown floating-point features */ if ( cpu_has_fp && (boot_cpu_feature64(fp) >= 2) ) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index d40c331a4e..3393e10b52 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -93,6 +93,21 @@ register_t get_default_hcr_flags(void) HCR_TID3|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); } +register_t get_default_cptr_flags(void) +{ + /* + * Trap all coprocessor registers (0-13) except cp10 and + * cp11 for VFP. + * + * /!\ All coprocessors except cp10 and cp11 cannot be used in Xen. + * + * On ARM64 the TCPx bits which we set here (0..9,12,13) are all + * RES1, i.e. they would trap whether we did this write or not. + */ + return ((HCPTR_CP_MASK & ~(HCPTR_CP(10) | HCPTR_CP(11))) | + HCPTR_TTA | HCPTR_TAM); +} + static enum { SERRORS_DIVERSE, SERRORS_PANIC, @@ -135,17 +150,7 @@ void init_traps(void) /* Trap CP15 c15 used for implementation defined registers */ WRITE_SYSREG(HSTR_T(15), HSTR_EL2); - /* Trap all coprocessor registers (0-13) except cp10 and - * cp11 for VFP. - * - * /!\ All coprocessors except cp10 and cp11 cannot be used in Xen. - * - * On ARM64 the TCPx bits which we set here (0..9,12,13) are all - * RES1, i.e. they would trap whether we did this write or not. - */ - WRITE_SYSREG((HCPTR_CP_MASK & ~(HCPTR_CP(10) | HCPTR_CP(11))) | - HCPTR_TTA | HCPTR_TAM, - CPTR_EL2); + WRITE_SYSREG(get_default_cptr_flags(), CPTR_EL2); /* * Configure HCR_EL2 with the bare minimum to run Xen until a guest -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:00:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:00:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546421.853250 (Exim 4.92) (envelope-from ) id 1q7tW9-0005Yn-JH; Sat, 10 Jun 2023 08:00:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546421.853250; Sat, 10 Jun 2023 08:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tW9-0005Yf-G4; Sat, 10 Jun 2023 08:00:13 +0000 Received: by outflank-mailman (input) for mailman id 546421; Sat, 10 Jun 2023 08:00:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tW8-0005YV-Ly for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tW8-0005Da-L9 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tW8-0001xs-KB for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ypNH68PtC3rMNmbi3atz79fYB4ERO1/bt7VUo2JYZuI=; b=uEMuXQblybxeXecU6BNoloRTqg 454vcTC3inurLjhFtEOyQ3r46Ac1jA8QJbj8aVNUs4mr2GFq9bXkx9XjK5Sj1/FHgTR9GnufVG3rj axI5h6BAWTr/LDMrh4fTSNgwgt+0s2vYRozDq2wJamOyyzT2ngQvtCIq6+hKr2OcLIfI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add SVE vector length field to the domain Message-Id: Date: Sat, 10 Jun 2023 08:00:12 +0000 commit 8043e80de93a9377454b6186390a3e931cc4b273 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:03 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/arm: add SVE vector length field to the domain Add sve_vl field to arch_domain and xen_arch_domainconfig struct, to allow the domain to have an information about the SVE feature and the number of SVE register bits that are allowed for this domain. sve_vl field is the vector length in bits divided by 128, this allows to use less space in the structures. The field is used also to allow or forbid a domain to use SVE, because a value equal to zero means the guest is not allowed to use the feature. Check that the requested vector length is lower or equal to the platform supported vector length, otherwise fail on domain creation. Check that only 64 bit domains have SVE enabled, otherwise fail. Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/arm64/domctl.c | 4 ++++ xen/arch/arm/arm64/sve.c | 12 ++++++++++++ xen/arch/arm/domain.c | 29 +++++++++++++++++++++++++++++ xen/arch/arm/domain_build.c | 7 +++++++ xen/arch/arm/include/asm/arm64/sve.h | 31 +++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/domain.h | 5 +++++ xen/include/public/arch-arm.h | 2 ++ 7 files changed, 90 insertions(+) diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c index 0de89b42c4..14fc622e99 100644 --- a/xen/arch/arm/arm64/domctl.c +++ b/xen/arch/arm/arm64/domctl.c @@ -10,6 +10,7 @@ #include #include #include +#include #include static long switch_mode(struct domain *d, enum domain_type type) @@ -43,6 +44,9 @@ long subarch_do_domctl(struct xen_domctl *domctl, struct domain *d, case 32: if ( !cpu_has_el1_32 ) return -EINVAL; + /* SVE is not supported for 32 bit domain */ + if ( is_sve_domain(d) ) + return -EINVAL; return switch_mode(d, DOMAIN_32BIT); case 64: return switch_mode(d, DOMAIN_64BIT); diff --git a/xen/arch/arm/arm64/sve.c b/xen/arch/arm/arm64/sve.c index e05ccc38a8..a9144e48ef 100644 --- a/xen/arch/arm/arm64/sve.c +++ b/xen/arch/arm/arm64/sve.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -49,6 +50,17 @@ register_t compute_max_zcr(void) return vl_to_zcr(hw_vl); } +/* Get the system sanitized value for VL in bits */ +unsigned int get_sys_vl_len(void) +{ + if ( !cpu_has_sve ) + return 0; + + /* ZCR_ELx len field is ((len + 1) * 128) = vector bits length */ + return ((system_cpuinfo.zcr64.bits[0] & ZCR_ELx_LEN_MASK) + 1U) * + SVE_VL_MULTIPLE_VAL; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index d5ab15db46..6c22551b0e 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -555,6 +556,8 @@ int arch_vcpu_create(struct vcpu *v) v->arch.vmpidr = MPIDR_SMP | vcpuid_to_vaffinity(v->vcpu_id); v->arch.cptr_el2 = get_default_cptr_flags(); + if ( is_sve_domain(v->domain) ) + v->arch.cptr_el2 &= ~HCPTR_CP(8); v->arch.hcr_el2 = get_default_hcr_flags(); @@ -599,6 +602,7 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) unsigned int max_vcpus; unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap); unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu); + unsigned int sve_vl_bits = sve_decode_vl(config->arch.sve_vl); if ( (config->flags & ~flags_optional) != flags_required ) { @@ -607,6 +611,26 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config) return -EINVAL; } + /* Check feature flags */ + if ( sve_vl_bits > 0 ) + { + unsigned int zcr_max_bits = get_sys_vl_len(); + + if ( !zcr_max_bits ) + { + dprintk(XENLOG_INFO, "SVE is unsupported on this machine.\n"); + return -EINVAL; + } + + if ( sve_vl_bits > zcr_max_bits ) + { + dprintk(XENLOG_INFO, + "Requested SVE vector length (%u) > supported length (%u)\n", + sve_vl_bits, zcr_max_bits); + return -EINVAL; + } + } + /* The P2M table must always be shared between the CPU and the IOMMU */ if ( config->iommu_opts & XEN_DOMCTL_IOMMU_no_sharept ) { @@ -749,6 +773,11 @@ int arch_domain_create(struct domain *d, if ( (rc = domain_vpci_init(d)) != 0 ) goto fail; +#ifdef CONFIG_ARM64_SVE + /* Copy the encoded vector length sve_vl from the domain configuration */ + d->arch.sve_vl = config->arch.sve_vl; +#endif + return 0; fail: diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3f4558ade6..c46f19208d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -3691,6 +3692,12 @@ static int __init construct_domain(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } + if ( is_sve_domain(d) && (kinfo->type == DOMAIN_32BIT) ) + { + printk("SVE is not available for 32-bit domain\n"); + return -EINVAL; + } + if ( is_64bit_domain(d) ) vcpu_switch_to_aarch64_mode(v); diff --git a/xen/arch/arm/include/asm/arm64/sve.h b/xen/arch/arm/include/asm/arm64/sve.h index c0466243c7..4b63412727 100644 --- a/xen/arch/arm/include/asm/arm64/sve.h +++ b/xen/arch/arm/include/asm/arm64/sve.h @@ -8,13 +8,44 @@ #ifndef _ARM_ARM64_SVE_H #define _ARM_ARM64_SVE_H +#include + #define SVE_VL_MAX_BITS 2048U /* Vector length must be multiple of 128 */ #define SVE_VL_MULTIPLE_VAL 128U +static inline unsigned int sve_decode_vl(unsigned int sve_vl) +{ + /* SVE vector length is stored as VL/128 in xen_arch_domainconfig */ + return sve_vl * SVE_VL_MULTIPLE_VAL; +} + register_t compute_max_zcr(void); +#ifdef CONFIG_ARM64_SVE + +static inline bool is_sve_domain(const struct domain *d) +{ + return d->arch.sve_vl > 0; +} + +unsigned int get_sys_vl_len(void); + +#else /* !CONFIG_ARM64_SVE */ + +static inline bool is_sve_domain(const struct domain *d) +{ + return false; +} + +static inline unsigned int get_sys_vl_len(void) +{ + return 0; +} + +#endif /* CONFIG_ARM64_SVE */ + #endif /* _ARM_ARM64_SVE_H */ /* diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index e776ee704b..331da0f3bc 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -67,6 +67,11 @@ struct arch_domain enum domain_type type; #endif +#ifdef CONFIG_ARM64_SVE + /* max SVE encoded vector length */ + uint8_t sve_vl; +#endif + /* Virtual MMU */ struct p2m_domain p2m; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 1528ced509..38311f5595 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -300,6 +300,8 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); struct xen_arch_domainconfig { /* IN/OUT */ uint8_t gic_version; + /* IN - Contains SVE vector length divided by 128 */ + uint8_t sve_vl; /* IN */ uint16_t tee_type; /* IN */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:00:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:00:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546422.853253 (Exim 4.92) (envelope-from ) id 1q7tWJ-0005eD-LC; Sat, 10 Jun 2023 08:00:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546422.853253; Sat, 10 Jun 2023 08:00:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWJ-0005e4-Hk; Sat, 10 Jun 2023 08:00:23 +0000 Received: by outflank-mailman (input) for mailman id 546422; Sat, 10 Jun 2023 08:00:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWI-0005dw-PR for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWI-0005Dm-OW for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tWI-0001zE-NM for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=xnBEVlbC9uMQKOvPu2vergv/xmICFbzBvZQ8iFfyxxQ=; b=41qPIiWRBM9y+9Y/wh82eBm1Gl yAO5qGTepQUVvtkqx27HHID0cs8wlZ+og+9LEfcWe3JyGLttkbK0IzRJJi9Wq8F7r6gz9T+/kprmC U1Y2Zp7kRBuX/M7H5BjtB7xk8o3moiBuhXj/Pt4XWyM7vhF8/h3WYAnm+2a+3llQyXBY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Expose SVE feature to the guest Message-Id: Date: Sat, 10 Jun 2023 08:00:22 +0000 commit c5ff38cdd833fcf2cbb8fb49e362eac05888b3d4 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:04 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/arm: Expose SVE feature to the guest When a guest is allowed to use SVE, expose the SVE features through the identification registers. Signed-off-by: Luca Fancellu Acked-by: Julien Grall Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm64/vsysreg.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 758750983c..fe31f7b382 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -18,6 +18,8 @@ #include +#include +#include #include #include #include @@ -295,7 +297,28 @@ void do_sysreg(struct cpu_user_regs *regs, GENERATE_TID3_INFO(MVFR0_EL1, mvfr, 0) GENERATE_TID3_INFO(MVFR1_EL1, mvfr, 1) GENERATE_TID3_INFO(MVFR2_EL1, mvfr, 2) - GENERATE_TID3_INFO(ID_AA64PFR0_EL1, pfr64, 0) + + case HSR_SYSREG_ID_AA64PFR0_EL1: + { + register_t guest_reg_value = guest_cpuinfo.pfr64.bits[0]; + + if ( is_sve_domain(v->domain) ) + { + /* 4 is the SVE field width in id_aa64pfr0_el1 */ + uint64_t mask = GENMASK(ID_AA64PFR0_SVE_SHIFT + 4 - 1, + ID_AA64PFR0_SVE_SHIFT); + /* sysval is the sve field on the system */ + uint64_t sysval = cpuid_feature_extract_unsigned_field_width( + system_cpuinfo.pfr64.bits[0], + ID_AA64PFR0_SVE_SHIFT, 4); + guest_reg_value &= ~mask; + guest_reg_value |= (sysval << ID_AA64PFR0_SVE_SHIFT) & mask; + } + + return handle_ro_read_val(regs, regidx, hsr.sysreg.read, hsr, 1, + guest_reg_value); + } + GENERATE_TID3_INFO(ID_AA64PFR1_EL1, pfr64, 1) GENERATE_TID3_INFO(ID_AA64DFR0_EL1, dbg64, 0) GENERATE_TID3_INFO(ID_AA64DFR1_EL1, dbg64, 1) @@ -306,7 +329,21 @@ void do_sysreg(struct cpu_user_regs *regs, GENERATE_TID3_INFO(ID_AA64MMFR2_EL1, mm64, 2) GENERATE_TID3_INFO(ID_AA64AFR0_EL1, aux64, 0) GENERATE_TID3_INFO(ID_AA64AFR1_EL1, aux64, 1) - GENERATE_TID3_INFO(ID_AA64ZFR0_EL1, zfr64, 0) + + case HSR_SYSREG_ID_AA64ZFR0_EL1: + { + /* + * When the guest has the SVE feature enabled, the whole id_aa64zfr0_el1 + * needs to be exposed. + */ + register_t guest_reg_value = guest_cpuinfo.zfr64.bits[0]; + + if ( is_sve_domain(v->domain) ) + guest_reg_value = system_cpuinfo.zfr64.bits[0]; + + return handle_ro_read_val(regs, regidx, hsr.sysreg.read, hsr, 1, + guest_reg_value); + } /* * Those cases are catching all Reserved registers trapped by TID3 which -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:00:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:00:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546423.853257 (Exim 4.92) (envelope-from ) id 1q7tWT-0005mu-OG; Sat, 10 Jun 2023 08:00:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546423.853257; Sat, 10 Jun 2023 08:00:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWT-0005mn-LK; Sat, 10 Jun 2023 08:00:33 +0000 Received: by outflank-mailman (input) for mailman id 546423; Sat, 10 Jun 2023 08:00:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWS-0005me-ST for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWS-0005Dt-Rd for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tWS-000207-Qk for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UrFJnZ2o5GB6rL3BkvWYA8W3N0SlFjauxEFdgkWg2VM=; b=2skrvtLQ3GZv6X1AYYgAeDXIzv LqET8UhPnEn/Pw40VeZAZ3R1MyOHeeFW86wiWC6DI3VD773qkATmfkZ/7hSzWPDNXMrfeDFmJlbfF e25EYgjsing5umzijBuwWiNvymyxHB7Qn4Uut5S3KQC1DLMPykvMllDrkGzK/s5xZxqI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add SVE exception class handling Message-Id: Date: Sat, 10 Jun 2023 08:00:32 +0000 commit 3c6e7262410fe95f96aae32765531de41a6f392f Author: Luca Fancellu AuthorDate: Wed May 31 08:24:05 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/arm: add SVE exception class handling SVE has a new exception class with code 0x19, introduce the new code and handle the exception. Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/processor.h | 1 + xen/arch/arm/traps.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/xen/arch/arm/include/asm/processor.h b/xen/arch/arm/include/asm/processor.h index bc68333412..7e42ff8811 100644 --- a/xen/arch/arm/include/asm/processor.h +++ b/xen/arch/arm/include/asm/processor.h @@ -426,6 +426,7 @@ #define HSR_EC_HVC64 0x16 #define HSR_EC_SMC64 0x17 #define HSR_EC_SYSREG 0x18 +#define HSR_EC_SVE 0x19 #endif #define HSR_EC_INSTR_ABORT_LOWER_EL 0x20 #define HSR_EC_INSTR_ABORT_CURR_EL 0x21 diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 3393e10b52..f6437f6aa9 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2172,6 +2172,11 @@ void do_trap_guest_sync(struct cpu_user_regs *regs) perfc_incr(trap_sysreg); do_sysreg(regs, hsr); break; + case HSR_EC_SVE: + GUEST_BUG_ON(regs_mode_is_32bit(regs)); + gprintk(XENLOG_WARNING, "Domain tried to use SVE while not allowed\n"); + inject_undef_exception(regs, hsr); + break; #endif case HSR_EC_INSTR_ABORT_LOWER_EL: @@ -2201,6 +2206,10 @@ void do_trap_hyp_sync(struct cpu_user_regs *regs) case HSR_EC_BRK: do_trap_brk(regs, hsr); break; + case HSR_EC_SVE: + /* An SVE exception is a bug somewhere in hypervisor code */ + do_unexpected_trap("SVE trap at EL2", regs); + break; #endif case HSR_EC_DATA_ABORT_CURR_EL: case HSR_EC_INSTR_ABORT_CURR_EL: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:00:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:00:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546424.853262 (Exim 4.92) (envelope-from ) id 1q7tWd-0005pw-Q3; Sat, 10 Jun 2023 08:00:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546424.853262; Sat, 10 Jun 2023 08:00:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWd-0005pl-NI; Sat, 10 Jun 2023 08:00:43 +0000 Received: by outflank-mailman (input) for mailman id 546424; Sat, 10 Jun 2023 08:00:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWc-0005pf-Vn for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWc-0005EG-V0 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tWc-00020u-Ts for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=KY+33ZcmWAn+b2hz8V9mtm0/xpFYTfIz8LlVnf7u40Q=; b=HHoMWeiz/yAqpXoxBYg1i0tKsQ 8osoBVATPTVqX0gdny9gHNh+OGMzqY6YgKUk+wXb6wcLG2Bx1LIYxYqWwwIcIZFHlS6M/nF8Qgj/7 1tCoRL+TBs+C91GaOd0UOZUFSqd96762/pzX1ug3w1XjHIv5lizA5NcLG7LBDQNDvgN8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] arm/sve: save/restore SVE context switch Message-Id: Date: Sat, 10 Jun 2023 08:00:42 +0000 commit ac5855d5c7ea123be3fb32b17b9cd4ad483b4205 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:06 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 arm/sve: save/restore SVE context switch Save/restore context switch for SVE, allocate memory to contain the Z0-31 registers whose length is maximum 2048 bits each and FFR who can be maximum 256 bits, the allocated memory depends on how many bits is the vector length for the domain and how many bits are supported by the platform. Save P0-15 whose length is maximum 256 bits each, in this case the memory used is from the fpregs field in struct vfp_state, because V0-31 are part of Z0-31 and this space would have been unused for SVE domain otherwise. Create zcr_el{1,2} fields in arch_vcpu, initialise zcr_el2 on vcpu creation given the requested vector length and restore it on context switch, save/restore ZCR_EL1 value as well. List import macros from Linux in README.LinuxPrimitives. Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/README.LinuxPrimitives | 4 +- xen/arch/arm/arm64/sve-asm.S | 147 +++++++++++++++++++++++++++++++ xen/arch/arm/arm64/sve.c | 91 +++++++++++++++++++ xen/arch/arm/arm64/vfp.c | 79 ++++++++++------- xen/arch/arm/domain.c | 6 ++ xen/arch/arm/include/asm/arm64/sve.h | 4 + xen/arch/arm/include/asm/arm64/sysregs.h | 3 + xen/arch/arm/include/asm/arm64/vfp.h | 16 ++++ xen/arch/arm/include/asm/domain.h | 5 ++ 9 files changed, 320 insertions(+), 35 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 76c8df29e4..301c0271bb 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -69,7 +69,9 @@ SVE assembly macro: last sync @ v6.3.0 (last commit: 457391b03803) linux/arch/arm64/include/asm/fpsimdmacros.h xen/arch/arm/include/asm/arm64/sve-asm.S The following macros were taken from Linux: - _check_general_reg, _check_num, _sve_rdvl + _check_general_reg, _check_num, _sve_rdvl, __for, _for, _sve_check_zreg, + _sve_check_preg, _sve_str_v, _sve_ldr_v, _sve_str_p, _sve_ldr_p, _sve_rdffr, + _sve_wrffr ===================================================================== arm32 diff --git a/xen/arch/arm/arm64/sve-asm.S b/xen/arch/arm/arm64/sve-asm.S index 4d15493447..59dbefbbb2 100644 --- a/xen/arch/arm/arm64/sve-asm.S +++ b/xen/arch/arm/arm64/sve-asm.S @@ -17,6 +17,18 @@ .endif .endm +.macro _sve_check_zreg znr + .if (\znr) < 0 || (\znr) > 31 + .error "Bad Scalable Vector Extension vector register number \znr." + .endif +.endm + +.macro _sve_check_preg pnr + .if (\pnr) < 0 || (\pnr) > 15 + .error "Bad Scalable Vector Extension predicate register number \pnr." + .endif +.endm + .macro _check_num n, min, max .if (\n) < (\min) || (\n) > (\max) .error "Number \n out of range [\min,\max]" @@ -26,6 +38,54 @@ /* SVE instruction encodings for non-SVE-capable assemblers */ /* (pre binutils 2.28, all kernel capable clang versions support SVE) */ +/* STR (vector): STR Z\nz, [X\nxbase, #\offset, MUL VL] */ +.macro _sve_str_v nz, nxbase, offset=0 + _sve_check_zreg \nz + _check_general_reg \nxbase + _check_num (\offset), -0x100, 0xff + .inst 0xe5804000 \ + | (\nz) \ + | ((\nxbase) << 5) \ + | (((\offset) & 7) << 10) \ + | (((\offset) & 0x1f8) << 13) +.endm + +/* LDR (vector): LDR Z\nz, [X\nxbase, #\offset, MUL VL] */ +.macro _sve_ldr_v nz, nxbase, offset=0 + _sve_check_zreg \nz + _check_general_reg \nxbase + _check_num (\offset), -0x100, 0xff + .inst 0x85804000 \ + | (\nz) \ + | ((\nxbase) << 5) \ + | (((\offset) & 7) << 10) \ + | (((\offset) & 0x1f8) << 13) +.endm + +/* STR (predicate): STR P\np, [X\nxbase, #\offset, MUL VL] */ +.macro _sve_str_p np, nxbase, offset=0 + _sve_check_preg \np + _check_general_reg \nxbase + _check_num (\offset), -0x100, 0xff + .inst 0xe5800000 \ + | (\np) \ + | ((\nxbase) << 5) \ + | (((\offset) & 7) << 10) \ + | (((\offset) & 0x1f8) << 13) +.endm + +/* LDR (predicate): LDR P\np, [X\nxbase, #\offset, MUL VL] */ +.macro _sve_ldr_p np, nxbase, offset=0 + _sve_check_preg \np + _check_general_reg \nxbase + _check_num (\offset), -0x100, 0xff + .inst 0x85800000 \ + | (\np) \ + | ((\nxbase) << 5) \ + | (((\offset) & 7) << 10) \ + | (((\offset) & 0x1f8) << 13) +.endm + /* RDVL X\nx, #\imm */ .macro _sve_rdvl nx, imm _check_general_reg \nx @@ -35,11 +95,98 @@ | (((\imm) & 0x3f) << 5) .endm +/* RDFFR (unpredicated): RDFFR P\np.B */ +.macro _sve_rdffr np + _sve_check_preg \np + .inst 0x2519f000 \ + | (\np) +.endm + +/* WRFFR P\np.B */ +.macro _sve_wrffr np + _sve_check_preg \np + .inst 0x25289000 \ + | ((\np) << 5) +.endm + +.macro __for from:req, to:req + .if (\from) == (\to) + _for__body %\from + .else + __for %\from, %((\from) + ((\to) - (\from)) / 2) + __for %((\from) + ((\to) - (\from)) / 2 + 1), %\to + .endif +.endm + +.macro _for var:req, from:req, to:req, insn:vararg + .macro _for__body \var:req + .noaltmacro + \insn + .altmacro + .endm + + .altmacro + __for \from, \to + .noaltmacro + + .purgem _for__body +.endm + +/* + * sve_save and sve_load are different from the Linux version because the + * buffers to save the context are different from Xen and for example Linux + * is using this macro to save/restore also fpsr and fpcr while we do it in C + */ + +.macro sve_save nxzffrctx, nxpctx, save_ffr + _for n, 0, 31, _sve_str_v \n, \nxzffrctx, \n - 32 + _for n, 0, 15, _sve_str_p \n, \nxpctx, \n + cbz \save_ffr, 1f + _sve_rdffr 0 + _sve_str_p 0, \nxzffrctx + _sve_ldr_p 0, \nxpctx + b 2f +1: + str xzr, [x\nxzffrctx] // Zero out FFR +2: +.endm + +.macro sve_load nxzffrctx, nxpctx, restore_ffr + _for n, 0, 31, _sve_ldr_v \n, \nxzffrctx, \n - 32 + cbz \restore_ffr, 1f + _sve_ldr_p 0, \nxzffrctx + _sve_wrffr 0 +1: + _for n, 0, 15, _sve_ldr_p \n, \nxpctx, \n +.endm + /* Gets the current vector register size in bytes */ GLOBAL(sve_get_hw_vl) _sve_rdvl 0, 1 ret +/* + * Save the SVE context + * + * x0 - pointer to buffer for Z0-31 + FFR + * x1 - pointer to buffer for P0-15 + * x2 - Save FFR if non-zero + */ +GLOBAL(sve_save_ctx) + sve_save 0, 1, x2 + ret + +/* + * Load the SVE context + * + * x0 - pointer to buffer for Z0-31 + FFR + * x1 - pointer to buffer for P0-15 + * x2 - Restore FFR if non-zero + */ +GLOBAL(sve_load_ctx) + sve_load 0, 1, x2 + ret + /* * Local variables: * mode: ASM diff --git a/xen/arch/arm/arm64/sve.c b/xen/arch/arm/arm64/sve.c index a9144e48ef..56d8f27ea2 100644 --- a/xen/arch/arm/arm64/sve.c +++ b/xen/arch/arm/arm64/sve.c @@ -5,6 +5,7 @@ * Copyright (C) 2022 ARM Ltd. */ +#include #include #include #include @@ -14,6 +15,25 @@ extern unsigned int sve_get_hw_vl(void); +/* + * Save the SVE context + * + * sve_ctx - pointer to buffer for Z0-31 + FFR + * pregs - pointer to buffer for P0-15 + * save_ffr - Save FFR if non-zero + */ +extern void sve_save_ctx(uint64_t *sve_ctx, uint64_t *pregs, int save_ffr); + +/* + * Load the SVE context + * + * sve_ctx - pointer to buffer for Z0-31 + FFR + * pregs - pointer to buffer for P0-15 + * restore_ffr - Restore FFR if non-zero + */ +extern void sve_load_ctx(uint64_t const *sve_ctx, uint64_t const *pregs, + int restore_ffr); + /* Takes a vector length in bits and returns the ZCR_ELx encoding */ static inline register_t vl_to_zcr(unsigned int vl) { @@ -21,6 +41,21 @@ static inline register_t vl_to_zcr(unsigned int vl) return ((vl / SVE_VL_MULTIPLE_VAL) - 1U) & ZCR_ELx_LEN_MASK; } +static inline unsigned int sve_zreg_ctx_size(unsigned int vl) +{ + /* + * Z0-31 registers size in bytes is computed from VL that is in bits, so VL + * in bytes is VL/8. + */ + return (vl / 8U) * 32U; +} + +static inline unsigned int sve_ffrreg_ctx_size(unsigned int vl) +{ + /* FFR register size is VL/8, which is in bytes (VL/8)/8 */ + return (vl / 64U); +} + register_t compute_max_zcr(void) { register_t cptr_bits = get_default_cptr_flags(); @@ -61,6 +96,62 @@ unsigned int get_sys_vl_len(void) SVE_VL_MULTIPLE_VAL; } +int sve_context_init(struct vcpu *v) +{ + unsigned int sve_vl_bits = sve_decode_vl(v->domain->arch.sve_vl); + uint64_t *ctx = _xzalloc(sve_zreg_ctx_size(sve_vl_bits) + + sve_ffrreg_ctx_size(sve_vl_bits), + L1_CACHE_BYTES); + + if ( !ctx ) + return -ENOMEM; + + /* + * Points to the end of Z0-Z31 memory, just before FFR memory, to be kept in + * sync with sve_context_free(). + */ + v->arch.vfp.sve_zreg_ctx_end = ctx + + (sve_zreg_ctx_size(sve_vl_bits) / sizeof(uint64_t)); + + v->arch.zcr_el2 = vl_to_zcr(sve_vl_bits); + + return 0; +} + +void sve_context_free(struct vcpu *v) +{ + unsigned int sve_vl_bits; + + if ( v->arch.vfp.sve_zreg_ctx_end ) + return; + + sve_vl_bits = sve_decode_vl(v->domain->arch.sve_vl); + + /* + * Currenly points to the end of Z0-Z31 memory which is not the start of + * the buffer. To be kept in sync with the sve_context_init(). + */ + v->arch.vfp.sve_zreg_ctx_end -= + (sve_zreg_ctx_size(sve_vl_bits) / sizeof(uint64_t)); + + XFREE(v->arch.vfp.sve_zreg_ctx_end); +} + +void sve_save_state(struct vcpu *v) +{ + v->arch.zcr_el1 = READ_SYSREG(ZCR_EL1); + + sve_save_ctx(v->arch.vfp.sve_zreg_ctx_end, v->arch.vfp.fpregs, 1); +} + +void sve_restore_state(struct vcpu *v) +{ + WRITE_SYSREG(v->arch.zcr_el1, ZCR_EL1); + WRITE_SYSREG(v->arch.zcr_el2, ZCR_EL2); + + sve_load_ctx(v->arch.vfp.sve_zreg_ctx_end, v->arch.vfp.fpregs, 1); +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c index 47885e76ba..2d0d7c2e6d 100644 --- a/xen/arch/arm/arm64/vfp.c +++ b/xen/arch/arm/arm64/vfp.c @@ -2,29 +2,35 @@ #include #include #include +#include void vfp_save_state(struct vcpu *v) { if ( !cpu_has_fp ) return; - asm volatile("stp q0, q1, [%1, #16 * 0]\n\t" - "stp q2, q3, [%1, #16 * 2]\n\t" - "stp q4, q5, [%1, #16 * 4]\n\t" - "stp q6, q7, [%1, #16 * 6]\n\t" - "stp q8, q9, [%1, #16 * 8]\n\t" - "stp q10, q11, [%1, #16 * 10]\n\t" - "stp q12, q13, [%1, #16 * 12]\n\t" - "stp q14, q15, [%1, #16 * 14]\n\t" - "stp q16, q17, [%1, #16 * 16]\n\t" - "stp q18, q19, [%1, #16 * 18]\n\t" - "stp q20, q21, [%1, #16 * 20]\n\t" - "stp q22, q23, [%1, #16 * 22]\n\t" - "stp q24, q25, [%1, #16 * 24]\n\t" - "stp q26, q27, [%1, #16 * 26]\n\t" - "stp q28, q29, [%1, #16 * 28]\n\t" - "stp q30, q31, [%1, #16 * 30]\n\t" - : "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs)); + if ( is_sve_domain(v->domain) ) + sve_save_state(v); + else + { + asm volatile("stp q0, q1, [%1, #16 * 0]\n\t" + "stp q2, q3, [%1, #16 * 2]\n\t" + "stp q4, q5, [%1, #16 * 4]\n\t" + "stp q6, q7, [%1, #16 * 6]\n\t" + "stp q8, q9, [%1, #16 * 8]\n\t" + "stp q10, q11, [%1, #16 * 10]\n\t" + "stp q12, q13, [%1, #16 * 12]\n\t" + "stp q14, q15, [%1, #16 * 14]\n\t" + "stp q16, q17, [%1, #16 * 16]\n\t" + "stp q18, q19, [%1, #16 * 18]\n\t" + "stp q20, q21, [%1, #16 * 20]\n\t" + "stp q22, q23, [%1, #16 * 22]\n\t" + "stp q24, q25, [%1, #16 * 24]\n\t" + "stp q26, q27, [%1, #16 * 26]\n\t" + "stp q28, q29, [%1, #16 * 28]\n\t" + "stp q30, q31, [%1, #16 * 30]\n\t" + : "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs)); + } v->arch.vfp.fpsr = READ_SYSREG(FPSR); v->arch.vfp.fpcr = READ_SYSREG(FPCR); @@ -37,23 +43,28 @@ void vfp_restore_state(struct vcpu *v) if ( !cpu_has_fp ) return; - asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t" - "ldp q2, q3, [%1, #16 * 2]\n\t" - "ldp q4, q5, [%1, #16 * 4]\n\t" - "ldp q6, q7, [%1, #16 * 6]\n\t" - "ldp q8, q9, [%1, #16 * 8]\n\t" - "ldp q10, q11, [%1, #16 * 10]\n\t" - "ldp q12, q13, [%1, #16 * 12]\n\t" - "ldp q14, q15, [%1, #16 * 14]\n\t" - "ldp q16, q17, [%1, #16 * 16]\n\t" - "ldp q18, q19, [%1, #16 * 18]\n\t" - "ldp q20, q21, [%1, #16 * 20]\n\t" - "ldp q22, q23, [%1, #16 * 22]\n\t" - "ldp q24, q25, [%1, #16 * 24]\n\t" - "ldp q26, q27, [%1, #16 * 26]\n\t" - "ldp q28, q29, [%1, #16 * 28]\n\t" - "ldp q30, q31, [%1, #16 * 30]\n\t" - : : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs)); + if ( is_sve_domain(v->domain) ) + sve_restore_state(v); + else + { + asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t" + "ldp q2, q3, [%1, #16 * 2]\n\t" + "ldp q4, q5, [%1, #16 * 4]\n\t" + "ldp q6, q7, [%1, #16 * 6]\n\t" + "ldp q8, q9, [%1, #16 * 8]\n\t" + "ldp q10, q11, [%1, #16 * 10]\n\t" + "ldp q12, q13, [%1, #16 * 12]\n\t" + "ldp q14, q15, [%1, #16 * 14]\n\t" + "ldp q16, q17, [%1, #16 * 16]\n\t" + "ldp q18, q19, [%1, #16 * 18]\n\t" + "ldp q20, q21, [%1, #16 * 20]\n\t" + "ldp q22, q23, [%1, #16 * 22]\n\t" + "ldp q24, q25, [%1, #16 * 24]\n\t" + "ldp q26, q27, [%1, #16 * 26]\n\t" + "ldp q28, q29, [%1, #16 * 28]\n\t" + "ldp q30, q31, [%1, #16 * 30]\n\t" + : : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs)); + } WRITE_SYSREG(v->arch.vfp.fpsr, FPSR); WRITE_SYSREG(v->arch.vfp.fpcr, FPCR); diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 6c22551b0e..add9929b79 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -557,7 +557,11 @@ int arch_vcpu_create(struct vcpu *v) v->arch.cptr_el2 = get_default_cptr_flags(); if ( is_sve_domain(v->domain) ) + { + if ( (rc = sve_context_init(v)) != 0 ) + goto fail; v->arch.cptr_el2 &= ~HCPTR_CP(8); + } v->arch.hcr_el2 = get_default_hcr_flags(); @@ -587,6 +591,8 @@ fail: void arch_vcpu_destroy(struct vcpu *v) { + if ( is_sve_domain(v->domain) ) + sve_context_free(v); vcpu_timer_destroy(v); vcpu_vgic_free(v); free_xenheap_pages(v->arch.stack, STACK_ORDER); diff --git a/xen/arch/arm/include/asm/arm64/sve.h b/xen/arch/arm/include/asm/arm64/sve.h index 4b63412727..65b46685d2 100644 --- a/xen/arch/arm/include/asm/arm64/sve.h +++ b/xen/arch/arm/include/asm/arm64/sve.h @@ -22,6 +22,10 @@ static inline unsigned int sve_decode_vl(unsigned int sve_vl) } register_t compute_max_zcr(void); +int sve_context_init(struct vcpu *v); +void sve_context_free(struct vcpu *v); +void sve_save_state(struct vcpu *v); +void sve_restore_state(struct vcpu *v); #ifdef CONFIG_ARM64_SVE diff --git a/xen/arch/arm/include/asm/arm64/sysregs.h b/xen/arch/arm/include/asm/arm64/sysregs.h index 4cabb9eb4d..3fdeb9d8cd 100644 --- a/xen/arch/arm/include/asm/arm64/sysregs.h +++ b/xen/arch/arm/include/asm/arm64/sysregs.h @@ -88,6 +88,9 @@ #ifndef ID_AA64ISAR2_EL1 #define ID_AA64ISAR2_EL1 S3_0_C0_C6_2 #endif +#ifndef ZCR_EL1 +#define ZCR_EL1 S3_0_C1_C2_0 +#endif /* ID registers (imported from arm64/include/asm/sysreg.h in Linux) */ diff --git a/xen/arch/arm/include/asm/arm64/vfp.h b/xen/arch/arm/include/asm/arm64/vfp.h index e6e8c363bc..4b399ccbfb 100644 --- a/xen/arch/arm/include/asm/arm64/vfp.h +++ b/xen/arch/arm/include/asm/arm64/vfp.h @@ -6,7 +6,23 @@ struct vfp_state { + /* + * When SVE is enabled for the guest, fpregs memory will be used to + * save/restore P0-P15 registers, otherwise it will be used for the V0-V31 + * registers. + */ uint64_t fpregs[64] __vfp_aligned; + +#ifdef CONFIG_ARM64_SVE + /* + * When SVE is enabled for the guest, sve_zreg_ctx_end points to memory + * where Z0-Z31 registers and FFR can be saved/restored, it points at the + * end of the Z0-Z31 space and at the beginning of the FFR space, it's done + * like that to ease the save/restore assembly operations. + */ + uint64_t *sve_zreg_ctx_end; +#endif + register_t fpcr; register_t fpexc32_el2; register_t fpsr; diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index 331da0f3bc..99e798ffff 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -195,6 +195,11 @@ struct arch_vcpu register_t tpidrro_el0; /* HYP configuration */ +#ifdef CONFIG_ARM64_SVE + register_t zcr_el1; + register_t zcr_el2; +#endif + register_t cptr_el2; register_t hcr_el2; register_t mdcr_el2; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:00:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:00:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546425.853266 (Exim 4.92) (envelope-from ) id 1q7tWn-0005sF-S3; Sat, 10 Jun 2023 08:00:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546425.853266; Sat, 10 Jun 2023 08:00:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWn-0005s8-P4; Sat, 10 Jun 2023 08:00:53 +0000 Received: by outflank-mailman (input) for mailman id 546425; Sat, 10 Jun 2023 08:00:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWn-0005ry-2k for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWn-0005EP-21 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tWn-00021r-18 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:00:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Nl+enutwdbKmQDaU5ICpIb6uUEsOkVe+cmMo9XbeoTg=; b=KG9/CNpCfYt+Kf3z2E/TGUHfri WvSMIFUJAXrLOkza1C4khZfqgeQkSmXC/582puaSSLXkuuMPelwb7ZFYEmvZCDdxitl7LBKiaCiyI XttHFRZD7JsWvEMuBak214hndxdHPCH3arP5m8pHoIHJcJZMU7AZkiuerwDpJNUKtCDI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/common: add dom0 xen command line argument for Arm Message-Id: Date: Sat, 10 Jun 2023 08:00:53 +0000 commit f2095a51ac53d2da97f724d49ec3aedbb290080e Author: Luca Fancellu AuthorDate: Wed May 31 08:24:07 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/common: add dom0 xen command line argument for Arm Currently x86 defines a Xen command line argument dom0= where there can be specified dom0 controlling sub-options, to use it also on Arm, move the code that loops through the list of arguments from x86 to the common code and from there, call architecture specific functions to handle the comma separated sub-options. No functional changes are intended. Signed-off-by: Luca Fancellu Reviewed-by: Jan Beulich Reviewed-by: Bertrand Marquis --- xen/arch/arm/domain_build.c | 5 +++++ xen/arch/x86/dom0_build.c | 48 +++++++++++++++++---------------------------- xen/common/domain.c | 23 ++++++++++++++++++++++ xen/include/xen/domain.h | 1 + 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c46f19208d..e2f0639914 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -60,6 +60,11 @@ static int __init parse_dom0_mem(const char *s) } custom_param("dom0_mem", parse_dom0_mem); +int __init parse_arch_dom0_param(const char *s, const char *e) +{ + return -EINVAL; +} + /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 79234f18ff..9f5300a3ef 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -266,42 +266,30 @@ bool __initdata opt_dom0_pvh = !IS_ENABLED(CONFIG_PV); bool __initdata opt_dom0_verbose = IS_ENABLED(CONFIG_VERBOSE_DEBUG); bool __initdata opt_dom0_msr_relaxed; -static int __init cf_check parse_dom0_param(const char *s) +int __init parse_arch_dom0_param(const char *s, const char *e) { - const char *ss; - int rc = 0; + int val; - do { - int val; - - ss = strchr(s, ','); - if ( !ss ) - ss = strchr(s, '\0'); - - if ( IS_ENABLED(CONFIG_PV) && !cmdline_strcmp(s, "pv") ) - opt_dom0_pvh = false; - else if ( IS_ENABLED(CONFIG_HVM) && !cmdline_strcmp(s, "pvh") ) - opt_dom0_pvh = true; + if ( IS_ENABLED(CONFIG_PV) && !cmdline_strcmp(s, "pv") ) + opt_dom0_pvh = false; + else if ( IS_ENABLED(CONFIG_HVM) && !cmdline_strcmp(s, "pvh") ) + opt_dom0_pvh = true; #ifdef CONFIG_SHADOW_PAGING - else if ( (val = parse_boolean("shadow", s, ss)) >= 0 ) - opt_dom0_shadow = val; + else if ( (val = parse_boolean("shadow", s, e)) >= 0 ) + opt_dom0_shadow = val; #endif - else if ( (val = parse_boolean("verbose", s, ss)) >= 0 ) - opt_dom0_verbose = val; - else if ( IS_ENABLED(CONFIG_PV) && - (val = parse_boolean("cpuid-faulting", s, ss)) >= 0 ) - opt_dom0_cpuid_faulting = val; - else if ( (val = parse_boolean("msr-relaxed", s, ss)) >= 0 ) - opt_dom0_msr_relaxed = val; - else - rc = -EINVAL; - - s = ss + 1; - } while ( *ss ); + else if ( (val = parse_boolean("verbose", s, e)) >= 0 ) + opt_dom0_verbose = val; + else if ( IS_ENABLED(CONFIG_PV) && + (val = parse_boolean("cpuid-faulting", s, e)) >= 0 ) + opt_dom0_cpuid_faulting = val; + else if ( (val = parse_boolean("msr-relaxed", s, e)) >= 0 ) + opt_dom0_msr_relaxed = val; + else + return -EINVAL; - return rc; + return 0; } -custom_param("dom0", parse_dom0_param); static char __initdata opt_dom0_ioports_disable[200] = ""; string_param("dom0_ioports_disable", opt_dom0_ioports_disable); diff --git a/xen/common/domain.c b/xen/common/domain.c index 6a440590fe..caaa402637 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -364,6 +364,29 @@ static int __init cf_check parse_extra_guest_irqs(const char *s) } custom_param("extra_guest_irqs", parse_extra_guest_irqs); +static int __init cf_check parse_dom0_param(const char *s) +{ + const char *ss; + int rc = 0; + + do { + int ret; + + ss = strchr(s, ','); + if ( !ss ) + ss = strchr(s, '\0'); + + ret = parse_arch_dom0_param(s, ss); + if ( ret && !rc ) + rc = ret; + + s = ss + 1; + } while ( *ss ); + + return rc; +} +custom_param("dom0", parse_dom0_param); + /* * Release resources held by a domain. There may or may not be live * references to the domain, and it may or may not be fully constructed. diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 26f9c4f6dd..1df8f933d0 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -16,6 +16,7 @@ typedef union { struct vcpu *vcpu_create(struct domain *d, unsigned int vcpu_id); unsigned int dom0_max_vcpus(void); +int parse_arch_dom0_param(const char *s, const char *e); struct vcpu *alloc_dom0_vcpu0(struct domain *dom0); int vcpu_reset(struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:01:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:01:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546426.853270 (Exim 4.92) (envelope-from ) id 1q7tWx-0005vd-WB; Sat, 10 Jun 2023 08:01:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546426.853270; Sat, 10 Jun 2023 08:01:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWx-0005vW-Sf; Sat, 10 Jun 2023 08:01:03 +0000 Received: by outflank-mailman (input) for mailman id 546426; Sat, 10 Jun 2023 08:01:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWx-0005vM-6J for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tWx-0005Ej-5Y for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tWx-000234-4d for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Lpnd/lgkLVNJKu22wSrFeMZ5aaQ48TdSqx0D+YifB4w=; b=mfTtBkfAF6m9yPPKxVBwN9nNkK u9oDKQkeHSpcMANrFlGylCrIyrr9Dyii/A9GtZv0ZLTSOgK8Y+bjpC7h/jMVPF436bfUDot5jqNAg szFtUwoJUxq5Y9vSGy/tbNzewjLx3FQ/CZz/O+sdl4PjlG2isQEgGhlZ8SfbRgYduhS4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: enable Dom0 to use SVE feature Message-Id: Date: Sat, 10 Jun 2023 08:01:03 +0000 commit fd53bc7af0eaa9d37ca3ec8b517190cc3e3df9ed Author: Luca Fancellu AuthorDate: Wed May 31 08:24:08 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen: enable Dom0 to use SVE feature Add a command line parameter to allow Dom0 the use of SVE resources, the command line parameter sve=, sub argument of dom0=, controls the feature on this domain and sets the maximum SVE vector length for Dom0. Add a new function, parse_signed_integer(), to parse an integer command line argument. Signed-off-by: Luca Fancellu Reviewed-by: Jan Beulich # !arm Reviewed-by: Bertrand Marquis --- docs/misc/xen-command-line.pandoc | 20 ++++++++++++++++++-- xen/arch/arm/arm64/sve.c | 20 ++++++++++++++++++++ xen/arch/arm/domain_build.c | 26 ++++++++++++++++++++++++++ xen/arch/arm/include/asm/arm64/sve.h | 10 ++++++++++ xen/common/kernel.c | 28 ++++++++++++++++++++++++++++ xen/include/xen/lib.h | 10 ++++++++++ 6 files changed, 112 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index e0b89b7d33..4060ebdc5d 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -777,9 +777,9 @@ Specify the bit width of the DMA heap. ### dom0 = List of [ pv | pvh, shadow=, verbose=, - cpuid-faulting=, msr-relaxed= ] + cpuid-faulting=, msr-relaxed= ] (x86) - Applicability: x86 + = List of [ sve= ] (Arm64) Controls for how dom0 is constructed on x86 systems. @@ -838,6 +838,22 @@ Controls for how dom0 is constructed on x86 systems. If using this option is necessary to fix an issue, please report a bug. +Enables features on dom0 on Arm systems. + +* The `sve` integer parameter enables Arm SVE usage for Dom0 and sets the + maximum SVE vector length, the option is applicable only to Arm64 Dom0 + kernels. + A value equal to 0 disables the feature, this is the default value. + Values below 0 means the feature uses the maximum SVE vector length + supported by hardware, if SVE is supported. + Values above 0 explicitly set the maximum SVE vector length for Dom0, + allowed values are from 128 to maximum 2048, being multiple of 128. + Please note that when the user explicitly specifies the value, if that value + is above the hardware supported maximum SVE vector length, the domain + creation will fail and the system will stop, the same will occur if the + option is provided with a positive non zero value, but the platform doesn't + support SVE. + ### dom0-cpuid = List of comma separated booleans diff --git a/xen/arch/arm/arm64/sve.c b/xen/arch/arm/arm64/sve.c index 56d8f27ea2..23a9d0ba66 100644 --- a/xen/arch/arm/arm64/sve.c +++ b/xen/arch/arm/arm64/sve.c @@ -13,6 +13,9 @@ #include #include +/* opt_dom0_sve: allow Dom0 to use SVE and set maximum vector length. */ +int __initdata opt_dom0_sve; + extern unsigned int sve_get_hw_vl(void); /* @@ -152,6 +155,23 @@ void sve_restore_state(struct vcpu *v) sve_load_ctx(v->arch.vfp.sve_zreg_ctx_end, v->arch.vfp.fpregs, 1); } +bool __init sve_domctl_vl_param(int val, unsigned int *out) +{ + /* + * Negative SVE parameter value means to use the maximum supported + * vector length, otherwise if a positive value is provided, check if the + * vector length is a multiple of 128 + */ + if ( val < 0 ) + *out = get_sys_vl_len(); + else if ( (val % SVE_VL_MULTIPLE_VAL) == 0 ) + *out = val; + else + return false; + + return true; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e2f0639914..14b42120a9 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -62,6 +62,22 @@ custom_param("dom0_mem", parse_dom0_mem); int __init parse_arch_dom0_param(const char *s, const char *e) { + long long val; + + if ( !parse_signed_integer("sve", s, e, &val) ) + { +#ifdef CONFIG_ARM64_SVE + if ( (val >= INT_MIN) && (val <= INT_MAX) ) + opt_dom0_sve = val; + else + printk(XENLOG_INFO "'sve=%lld' value out of range!\n", val); + + return 0; +#else + panic("'sve' property found, but CONFIG_ARM64_SVE not selected"); +#endif + } + return -EINVAL; } @@ -4134,6 +4150,16 @@ void __init create_dom0(void) if ( iommu_enabled ) dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; + if ( opt_dom0_sve ) + { + unsigned int vl; + + if ( sve_domctl_vl_param(opt_dom0_sve, &vl) ) + dom0_cfg.arch.sve_vl = sve_encode_vl(vl); + else + panic("SVE vector length error\n"); + } + dom0 = domain_create(0, &dom0_cfg, CDF_privileged | CDF_directmap); if ( IS_ERR(dom0) ) panic("Error creating domain 0 (rc = %ld)\n", PTR_ERR(dom0)); diff --git a/xen/arch/arm/include/asm/arm64/sve.h b/xen/arch/arm/include/asm/arm64/sve.h index 65b46685d2..a71d6a295d 100644 --- a/xen/arch/arm/include/asm/arm64/sve.h +++ b/xen/arch/arm/include/asm/arm64/sve.h @@ -21,14 +21,22 @@ static inline unsigned int sve_decode_vl(unsigned int sve_vl) return sve_vl * SVE_VL_MULTIPLE_VAL; } +static inline unsigned int sve_encode_vl(unsigned int sve_vl_bits) +{ + return sve_vl_bits / SVE_VL_MULTIPLE_VAL; +} + register_t compute_max_zcr(void); int sve_context_init(struct vcpu *v); void sve_context_free(struct vcpu *v); void sve_save_state(struct vcpu *v); void sve_restore_state(struct vcpu *v); +bool sve_domctl_vl_param(int val, unsigned int *out); #ifdef CONFIG_ARM64_SVE +extern int opt_dom0_sve; + static inline bool is_sve_domain(const struct domain *d) { return d->arch.sve_vl > 0; @@ -38,6 +46,8 @@ unsigned int get_sys_vl_len(void); #else /* !CONFIG_ARM64_SVE */ +#define opt_dom0_sve 0 + static inline bool is_sve_domain(const struct domain *d) { return false; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index b8b845763d..fd975ae21e 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -314,6 +314,34 @@ int parse_boolean(const char *name, const char *s, const char *e) return -1; } +int __init parse_signed_integer(const char *name, const char *s, const char *e, + long long *val) +{ + size_t slen, nlen; + const char *str; + long long pval; + + slen = e ? ({ ASSERT(e >= s); e - s; }) : strlen(s); + nlen = strlen(name); + + if ( !e ) + e = s + slen; + + /* Check that this is the name we're looking for and a value was provided */ + if ( slen <= nlen || strncmp(s, name, nlen) || s[nlen] != '=' ) + return -1; + + pval = simple_strtoll(&s[nlen + 1], &str, 10); + + /* Number not recognised */ + if ( str != e ) + return -2; + + *val = pval; + + return 0; +} + int cmdline_strcmp(const char *frag, const char *name) { for ( ; ; frag++, name++ ) diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 75ae7489b9..67fc7c1d7e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -94,6 +94,16 @@ int parse_bool(const char *s, const char *e); */ int parse_boolean(const char *name, const char *s, const char *e); +/** + * Given a specific name, parses a string of the form: + * $NAME= + * returning 0 and a value in val, for a recognised integer. + * Returns -1 for name not found, general errors, or -2 if name is found but + * not recognised number. + */ +int parse_signed_integer(const char *name, const char *s, const char *e, + long long *val); + /** * Very similar to strcmp(), but will declare a match if the NUL in 'name' * lines up with comma, colon, semicolon or equals in 'frag'. Designed for -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:01:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:01:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546427.853273 (Exim 4.92) (envelope-from ) id 1q7tX8-0005yE-1c; Sat, 10 Jun 2023 08:01:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546427.853273; Sat, 10 Jun 2023 08:01:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tX7-0005y9-Uy; Sat, 10 Jun 2023 08:01:13 +0000 Received: by outflank-mailman (input) for mailman id 546427; Sat, 10 Jun 2023 08:01:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tX7-0005xz-9Z for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tX7-0005Es-8n for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tX7-00023r-7l for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Cj9O1qCtdd80d4TVyFhiIP4B3wjz9roFQFZ0oLNMZOE=; b=S3EuygJFikLkhySD8faMDlQ16+ 53wwo/4J8hgiiOpRJ1qwyP5+ovkYDqDnmIvID8jh2bXgk1dnz6BMPUGlDq0OijFmYSPDAk8um9SNy sy0FBmZGwtW4TiRKpdWYQz4+EiE4Qkb2eQiI3iDJ8K9ugUvGPD1QAyFC++anqn9GDymU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/physinfo: encode Arm SVE vector length in arch_capabilities Message-Id: Date: Sat, 10 Jun 2023 08:01:13 +0000 commit 9392bf6a3a44978373f2c54a4c69d739f437b3bc Author: Luca Fancellu AuthorDate: Wed May 31 08:24:09 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/physinfo: encode Arm SVE vector length in arch_capabilities When the arm platform supports SVE, advertise the feature in the field arch_capabilities in struct xen_sysctl_physinfo by encoding the SVE vector length in it. Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis --- xen/arch/arm/sysctl.c | 4 ++++ xen/include/public/sysctl.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index b0a78a8b10..e9a0661146 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -11,11 +11,15 @@ #include #include #include +#include #include void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; + + pi->arch_capabilities |= MASK_INSR(sve_encode_vl(get_sys_vl_len()), + XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } long arch_do_sysctl(struct xen_sysctl *sysctl, diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 2b24d6bfd0..9d06e92d0f 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -94,6 +94,10 @@ struct xen_sysctl_tbuf_op { /* Max XEN_SYSCTL_PHYSCAP_* constant. Used for ABI checking. */ #define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_gnttab_v2 +#if defined(__arm__) || defined(__aarch64__) +#define XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK (0x1FU) +#endif + struct xen_sysctl_physinfo { uint32_t threads_per_core; uint32_t cores_per_socket; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:01:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:01:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546428.853278 (Exim 4.92) (envelope-from ) id 1q7tXI-00061Q-3H; Sat, 10 Jun 2023 08:01:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546428.853278; Sat, 10 Jun 2023 08:01:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXI-00061J-0d; Sat, 10 Jun 2023 08:01:24 +0000 Received: by outflank-mailman (input) for mailman id 546428; Sat, 10 Jun 2023 08:01:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXH-00061D-DE for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXH-0005F0-CN for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tXH-00024j-Bd for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TKVZpqeW7pAFjnC9atzdTmpKRV3NbT7evdOlM1KHvTE=; b=SKWy3jiGjleN61tW723VUO0Yb2 OsYtnwuJ9DVWmSzJxQ3AOLHPevLwxnOopyEUWfzO+c4faXbA2aCxZJU9eHJCSeytsm45Wp4hqQZYi vjRN3WaL+2nT4Sve93MtkiEhWDrkJM31uP6Axq98GtLx/WPgf6TLx+wr8c8E1cdyTjzw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: add physinfo arch_capabilities handling for Arm Message-Id: Date: Sat, 10 Jun 2023 08:01:23 +0000 commit 56a7aaa16bfe43945a0031319c60c7f323c46254 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:10 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 tools: add physinfo arch_capabilities handling for Arm On Arm, the SVE vector length is encoded in arch_capabilities field of struct xen_sysctl_physinfo, make use of this field in the tools when building for arm. Create header arm-arch-capabilities.h to handle the arch_capabilities field of physinfo for Arm. Signed-off-by: Luca Fancellu Acked-by: George Dunlap Acked-by: Christian Lindig Reviewed-by: Anthony PERARD --- tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++ tools/include/xen-tools/arm-arch-capabilities.h | 28 +++++++++++++++++ tools/include/xen-tools/common-macros.h | 2 ++ tools/libs/light/libxl.c | 1 + tools/libs/light/libxl_internal.h | 1 - tools/libs/light/libxl_types.idl | 1 + tools/ocaml/libs/xc/xenctrl.ml | 4 +-- tools/ocaml/libs/xc/xenctrl.mli | 4 +-- tools/ocaml/libs/xc/xenctrl_stubs.c | 8 +++-- tools/python/xen/lowlevel/xc/xc.c | 42 ++++++++++++++++++------- tools/xl/xl_info.c | 8 +++++ 13 files changed, 87 insertions(+), 21 deletions(-) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 0a203d2232..35397be2f9 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -3506,6 +3506,7 @@ x.CapVmtrace = bool(xc.cap_vmtrace) x.CapVpmu = bool(xc.cap_vpmu) x.CapGnttabV1 = bool(xc.cap_gnttab_v1) x.CapGnttabV2 = bool(xc.cap_gnttab_v2) +x.ArchCapabilities = uint32(xc.arch_capabilities) return nil} @@ -3540,6 +3541,7 @@ xc.cap_vmtrace = C.bool(x.CapVmtrace) xc.cap_vpmu = C.bool(x.CapVpmu) xc.cap_gnttab_v1 = C.bool(x.CapGnttabV1) xc.cap_gnttab_v2 = C.bool(x.CapGnttabV2) +xc.arch_capabilities = C.uint32_t(x.ArchCapabilities) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index a7c17699f8..3d968a4967 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -1079,6 +1079,7 @@ CapVmtrace bool CapVpmu bool CapGnttabV1 bool CapGnttabV2 bool +ArchCapabilities uint32 } type Connectorinfo struct { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index cfa1a19131..4fa09ff763 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -525,6 +525,12 @@ */ #define LIBXL_HAVE_PHYSINFO_CAP_GNTTAB 1 +/* + * LIBXL_HAVE_PHYSINFO_ARCH_CAPABILITIES indicates that libxl_physinfo has a + * arch_capabilities field. + */ +#define LIBXL_HAVE_PHYSINFO_ARCH_CAPABILITIES 1 + /* * LIBXL_HAVE_MAX_GRANT_VERSION indicates libxl_domain_build_info has a * max_grant_version field for setting the max grant table version per diff --git a/tools/include/xen-tools/arm-arch-capabilities.h b/tools/include/xen-tools/arm-arch-capabilities.h new file mode 100644 index 0000000000..3849e89792 --- /dev/null +++ b/tools/include/xen-tools/arm-arch-capabilities.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: LGPL-2.1-only */ +/* + * Copyright (C) 2023 ARM Ltd. + */ + +#ifndef ARM_ARCH_CAPABILITIES_H +#define ARM_ARCH_CAPABILITIES_H + +#include +#include + +#include + +static inline +unsigned int arch_capabilities_arm_sve(unsigned int arch_capabilities) +{ +#if defined(__aarch64__) + unsigned int sve_vl = MASK_EXTR(arch_capabilities, + XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); + + /* Vector length is divided by 128 before storing it in arch_capabilities */ + return sve_vl * 128U; +#else + return 0; +#endif +} + +#endif /* ARM_ARCH_CAPABILITIES_H */ diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 76b55bf620..d53b881825 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -72,6 +72,8 @@ #define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) #endif +#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) + #ifndef __must_check #define __must_check __attribute__((__warn_unused_result__)) #endif diff --git a/tools/libs/light/libxl.c b/tools/libs/light/libxl.c index a0bf7d186f..175d6dde0b 100644 --- a/tools/libs/light/libxl.c +++ b/tools/libs/light/libxl.c @@ -409,6 +409,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_gnttab_v1); physinfo->cap_gnttab_v2 = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_gnttab_v2); + physinfo->arch_capabilities = xcphysinfo.arch_capabilities; GC_FREE; return 0; diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 5244fde623..8aba3e1389 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -132,7 +132,6 @@ #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d)) -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) #define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) #define LIBXL__LOGGING_ENABLED diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index c10292e0d7..fd31dacf7d 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -1133,6 +1133,7 @@ libxl_physinfo = Struct("physinfo", [ ("cap_vpmu", bool), ("cap_gnttab_v1", bool), ("cap_gnttab_v2", bool), + ("arch_capabilities", uint32), ], dir=DIR_OUT) libxl_connectorinfo = Struct("connectorinfo", [ diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index e4096bf92c..bf23ca50bb 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -128,12 +128,10 @@ type physinfo_cap_flag = | CAP_Gnttab_v1 | CAP_Gnttab_v2 -type arm_physinfo_cap_flag - type x86_physinfo_cap_flag type arch_physinfo_cap_flags = - | ARM of arm_physinfo_cap_flag list + | ARM of int | X86 of x86_physinfo_cap_flag list type physinfo = diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index ef22545374..ed1e28ea30 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -113,12 +113,10 @@ type physinfo_cap_flag = | CAP_Gnttab_v1 | CAP_Gnttab_v2 -type arm_physinfo_cap_flag - type x86_physinfo_cap_flag type arch_physinfo_cap_flags = - | ARM of arm_physinfo_cap_flag list + | ARM of int | X86 of x86_physinfo_cap_flag list type physinfo = { diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f686db3124..a03da31f6f 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -851,13 +851,15 @@ CAMLprim value stub_xc_physinfo(value xch_val) arch_cap_list = Tag_cons; arch_cap_flags_tag = 1; /* tag x86 */ -#else - caml_failwith("Unhandled architecture"); -#endif arch_cap_flags = caml_alloc_small(1, arch_cap_flags_tag); Store_field(arch_cap_flags, 0, arch_cap_list); Store_field(physinfo, 10, arch_cap_flags); +#elif defined(__aarch64__) + Store_field(physinfo, 10, Val_int(c_physinfo.arch_capabilities)); +#else + caml_failwith("Unhandled architecture"); +#endif CAMLreturn(physinfo); } diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 9728b34185..491e88977f 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -22,6 +22,7 @@ #include #include +#include #include /* Needed for Python versions earlier than 2.3. */ @@ -871,6 +872,7 @@ static PyObject *pyxc_physinfo(XcObject *self) const char *virtcap_names[] = { "hvm", "pv" }; const unsigned virtcaps_bits[] = { XEN_SYSCTL_PHYSCAP_hvm, XEN_SYSCTL_PHYSCAP_pv }; + PyObject *objret; if ( xc_physinfo(self->xc_handle, &pinfo) != 0 ) return pyxc_error_to_exception(self->xc_handle); @@ -897,17 +899,35 @@ static PyObject *pyxc_physinfo(XcObject *self) if ( p != virt_caps ) *(p-1) = '\0'; - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", - "nr_nodes", pinfo.nr_nodes, - "threads_per_core", pinfo.threads_per_core, - "cores_per_socket", pinfo.cores_per_socket, - "nr_cpus", pinfo.nr_cpus, - "total_memory", pages_to_kib(pinfo.total_pages), - "free_memory", pages_to_kib(pinfo.free_pages), - "scrub_memory", pages_to_kib(pinfo.scrub_pages), - "cpu_khz", pinfo.cpu_khz, - "hw_caps", cpu_cap, - "virt_caps", virt_caps); + objret = Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", + "nr_nodes", pinfo.nr_nodes, + "threads_per_core", pinfo.threads_per_core, + "cores_per_socket", pinfo.cores_per_socket, + "nr_cpus", pinfo.nr_cpus, + "total_memory", pages_to_kib(pinfo.total_pages), + "free_memory", pages_to_kib(pinfo.free_pages), + "scrub_memory", pages_to_kib(pinfo.scrub_pages), + "cpu_khz", pinfo.cpu_khz, + "hw_caps", cpu_cap, + "virt_caps", virt_caps); + +#if defined(__aarch64__) + if ( objret ) { + unsigned int sve_vl_bits; + PyObject *py_arm_sve_vl; + + sve_vl_bits = arch_capabilities_arm_sve(pinfo.arch_capabilities); + py_arm_sve_vl = PyLong_FromUnsignedLong(sve_vl_bits); + + if ( !py_arm_sve_vl ) + return NULL; + + if( PyDict_SetItemString(objret, "arm_sve_vl", py_arm_sve_vl) ) + return NULL; + } +#endif + + return objret; } static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index 712b7638b0..ddc42f96b9 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "xl.h" #include "xl_utils.h" @@ -224,6 +225,13 @@ static void output_physinfo(void) info.cap_gnttab_v2 ? " gnttab-v2" : "" ); + /* Print arm SVE vector length only on ARM platforms */ +#if defined(__aarch64__) + maybe_printf("arm_sve_vector_length : %u\n", + arch_capabilities_arm_sve(info.arch_capabilities) + ); +#endif + vinfo = libxl_get_version_info(ctx); if (vinfo) { i = (1 << 20) / vinfo->pagesize; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:01:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:01:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546429.853283 (Exim 4.92) (envelope-from ) id 1q7tXT-00064S-6T; Sat, 10 Jun 2023 08:01:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546429.853283; Sat, 10 Jun 2023 08:01:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXT-00064K-2R; Sat, 10 Jun 2023 08:01:35 +0000 Received: by outflank-mailman (input) for mailman id 546429; Sat, 10 Jun 2023 08:01:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXR-000643-H1 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXR-0005FG-G7 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tXR-00025g-F9 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=4d2SqF9vg0CavYz10S5pipk/RxWSrvRkVYrff78etGI=; b=yJP9TarcVUYk+K3vNkqcbIwJDY VbCGqw3jRSx6P5ogMv5pk21n8G/nt6pz4MGYOL4o736aIurdHOVJ6x5E+4aI6AdgusngVKLBnHGVX 0GpVRBAk8q6TEieyNXh69QQzhoEL84dwjyjOL7ZTEWBiG/zVekX4NtRELOyJOZ4S2wbo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/tools: add sve parameter in XL configuration Message-Id: Date: Sat, 10 Jun 2023 08:01:33 +0000 commit b46e8207d0aedad7bb23d14c055d95e625d366b0 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:11 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/tools: add sve parameter in XL configuration Add sve parameter in XL configuration to allow guests to use SVE feature. Signed-off-by: Luca Fancellu Reviewed-by: Anthony PERARD --- docs/man/xl.cfg.5.pod.in | 16 ++++++++++++++++ tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 23 +++++++++++++++++++++++ tools/include/libxl.h | 5 +++++ tools/libs/light/libxl_arm.c | 33 +++++++++++++++++++++++++++++++++ tools/libs/light/libxl_types.idl | 22 ++++++++++++++++++++++ tools/xl/xl_parse.c | 8 ++++++++ 7 files changed, 109 insertions(+) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 24ac927182..1b4e13ab64 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2955,6 +2955,22 @@ Currently, only the "sbsa_uart" model is supported for ARM. =back +=item B + +The `sve` parameter enables Arm Scalable Vector Extension (SVE) usage for the +guest and sets the maximum SVE vector length, the option is applicable only to +AArch64 guests. +A value equal to "disabled" disables the feature, this is the default value. +Allowed values are "disabled", "128", "256", "384", "512", "640", "768", "896", +"1024", "1152", "1280", "1408", "1536", "1664", "1792", "1920", "2048", "hw". +Specifying "hw" means that the maximum vector length supported by the platform +will be used. +Please be aware that if a specific vector length is passed and its value is +above the maximum vector length supported by the platform, an error will be +raised. + +=back + =head3 x86 =over 4 diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 35397be2f9..cd1a16e32e 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1149,6 +1149,7 @@ default: return fmt.Errorf("invalid union key '%v'", x.Type)} x.ArchArm.GicVersion = GicVersion(xc.arch_arm.gic_version) x.ArchArm.Vuart = VuartType(xc.arch_arm.vuart) +x.ArchArm.SveVl = SveType(xc.arch_arm.sve_vl) if err := x.ArchX86.MsrRelaxed.fromC(&xc.arch_x86.msr_relaxed);err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } @@ -1653,6 +1654,7 @@ default: return fmt.Errorf("invalid union key '%v'", x.Type)} xc.arch_arm.gic_version = C.libxl_gic_version(x.ArchArm.GicVersion) xc.arch_arm.vuart = C.libxl_vuart_type(x.ArchArm.Vuart) +xc.arch_arm.sve_vl = C.libxl_sve_type(x.ArchArm.SveVl) if err := x.ArchX86.MsrRelaxed.toC(&xc.arch_x86.msr_relaxed); err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 3d968a4967..b131a7eedc 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -490,6 +490,28 @@ TeeTypeNone TeeType = 0 TeeTypeOptee TeeType = 1 ) +type SveType int +const( +SveTypeHw SveType = -1 +SveTypeDisabled SveType = 0 +SveType128 SveType = 128 +SveType256 SveType = 256 +SveType384 SveType = 384 +SveType512 SveType = 512 +SveType640 SveType = 640 +SveType768 SveType = 768 +SveType896 SveType = 896 +SveType1024 SveType = 1024 +SveType1152 SveType = 1152 +SveType1280 SveType = 1280 +SveType1408 SveType = 1408 +SveType1536 SveType = 1536 +SveType1664 SveType = 1664 +SveType1792 SveType = 1792 +SveType1920 SveType = 1920 +SveType2048 SveType = 2048 +) + type RdmReserve struct { Strategy RdmReserveStrategy Policy RdmReservePolicy @@ -564,6 +586,7 @@ TypeUnion DomainBuildInfoTypeUnion ArchArm struct { GicVersion GicVersion Vuart VuartType +SveVl SveType } ArchX86 struct { MsrRelaxed Defbool diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 4fa09ff763..cac641a7eb 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -283,6 +283,11 @@ */ #define LIBXL_HAVE_BUILDINFO_ARCH_ARM_TEE 1 +/* + * libxl_domain_build_info has the arch_arm.sve_vl field. + */ +#define LIBXL_HAVE_BUILDINFO_ARCH_ARM_SVE_VL 1 + /* * LIBXL_HAVE_SOFT_RESET indicates that libxl supports performing * 'soft reset' for domains and there is 'soft_reset' shutdown reason diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 97c80d7ed0..35f76dfc21 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -3,6 +3,8 @@ #include "libxl_libfdt_compat.h" #include "libxl_arm.h" +#include + #include #include #include @@ -211,6 +213,12 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, return ERROR_FAIL; } + /* Parameter is sanitised in libxl__arch_domain_build_info_setdefault */ + if (d_config->b_info.arch_arm.sve_vl) { + /* Vector length is divided by 128 in struct xen_domctl_createdomain */ + config->arch.sve_vl = d_config->b_info.arch_arm.sve_vl / 128U; + } + return 0; } @@ -1685,6 +1693,31 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc, /* ACPI is disabled by default */ libxl_defbool_setdefault(&b_info->acpi, false); + /* Sanitise SVE parameter */ + if (b_info->arch_arm.sve_vl) { + unsigned int max_sve_vl = + arch_capabilities_arm_sve(physinfo->arch_capabilities); + + if (!max_sve_vl) { + LOG(ERROR, "SVE is unsupported on this machine."); + return ERROR_FAIL; + } + + if (LIBXL_SVE_TYPE_HW == b_info->arch_arm.sve_vl) { + b_info->arch_arm.sve_vl = max_sve_vl; + } else if (b_info->arch_arm.sve_vl > max_sve_vl) { + LOG(ERROR, + "Invalid sve value: %d. Platform supports up to %u bits", + b_info->arch_arm.sve_vl, max_sve_vl); + return ERROR_FAIL; + } else if (b_info->arch_arm.sve_vl % 128) { + LOG(ERROR, + "Invalid sve value: %d. It must be multiple of 128", + b_info->arch_arm.sve_vl); + return ERROR_FAIL; + } + } + if (b_info->type != LIBXL_DOMAIN_TYPE_PV) return 0; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index fd31dacf7d..9e48bb7726 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -523,6 +523,27 @@ libxl_tee_type = Enumeration("tee_type", [ (1, "optee") ], init_val = "LIBXL_TEE_TYPE_NONE") +libxl_sve_type = Enumeration("sve_type", [ + (-1, "hw"), + (0, "disabled"), + (128, "128"), + (256, "256"), + (384, "384"), + (512, "512"), + (640, "640"), + (768, "768"), + (896, "896"), + (1024, "1024"), + (1152, "1152"), + (1280, "1280"), + (1408, "1408"), + (1536, "1536"), + (1664, "1664"), + (1792, "1792"), + (1920, "1920"), + (2048, "2048") + ], init_val = "LIBXL_SVE_TYPE_DISABLED") + libxl_rdm_reserve = Struct("rdm_reserve", [ ("strategy", libxl_rdm_reserve_strategy), ("policy", libxl_rdm_reserve_policy), @@ -690,6 +711,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("arch_arm", Struct(None, [("gic_version", libxl_gic_version), ("vuart", libxl_vuart_type), + ("sve_vl", libxl_sve_type), ])), ("arch_x86", Struct(None, [("msr_relaxed", libxl_defbool), ])), diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 1f6f47daf4..f036e56fc2 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2887,6 +2887,14 @@ skip_usbdev: } } + if (!xlu_cfg_get_string (config, "sve", &buf, 1)) { + e = libxl_sve_type_from_string(buf, &b_info->arch_arm.sve_vl); + if (e) { + fprintf(stderr, "Unknown sve \"%s\" specified\n", buf); + exit(EXIT_FAILURE); + } + } + parse_vkb_list(config, d_config); d_config->virtios = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:01:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:01:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546430.853285 (Exim 4.92) (envelope-from ) id 1q7tXd-00067j-8G; Sat, 10 Jun 2023 08:01:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546430.853285; Sat, 10 Jun 2023 08:01:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXd-00067c-5k; Sat, 10 Jun 2023 08:01:45 +0000 Received: by outflank-mailman (input) for mailman id 546430; Sat, 10 Jun 2023 08:01:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXb-00067O-K7 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXb-0005Fh-JH for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tXb-00026d-IO for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V6xWNx+vQPJWhvPl7LpMK/aKxfepV6WbBExRgGdT8oQ=; b=M3HPa4mMx2DG/wsyva3VhvjOtS 9PtAe+FCNPuhCTDTHYzfhqn4hDmbdweNC5eAFfj3MFhBFVhYm2AIgpv68l+S+Hk4WxlVfJtMQotEy l7RxC6s6fgDMbrxCpxMEVROl63qZXfJZx0rewDuvUW8ANHo2pftaG+J7G5f3q9QAWues=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: add sve property for dom0less domUs Message-Id: Date: Sat, 10 Jun 2023 08:01:43 +0000 commit 870394de44766d6d1972c2e27be2f0a289162b04 Author: Luca Fancellu AuthorDate: Wed May 31 08:24:12 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:21:41 2023 +0100 xen/arm: add sve property for dom0less domUs Add a device tree property in the dom0less domU configuration to enable the guest to use SVE. Update documentation. Signed-off-by: Luca Fancellu Reviewed-by: Bertrand Marquis Reviewed-by: Michal Orzel Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 16 ++++++++++++++++ xen/arch/arm/domain_build.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 3879340b5e..bbd955e9c2 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -193,6 +193,22 @@ with the following properties: Optional. Handle to a xen,cpupool device tree node that identifies the cpupool where the guest will be started at boot. +- sve + + Optional. The `sve` property enables Arm SVE usage for the domain and sets + the maximum SVE vector length, the option is applicable only to Arm64 + guests. + A value equal to 0 disables the feature, this is the default value. + Specifying this property with no value, means that the SVE vector length + will be set equal to the maximum vector length supported by the platform. + Values above 0 explicitly set the maximum SVE vector length for the domain, + allowed values are from 128 to maximum 2048, being multiple of 128. + Please note that when the user explicitly specifies the value, if that value + is above the hardware supported maximum SVE vector length, the domain + creation will fail and the system will stop, the same will occur if the + option is provided with a non zero value, but the platform doesn't support + SVE. + - xen,enhanced A string property. Possible property values are: diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 14b42120a9..579bc8194f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -4029,6 +4029,34 @@ void __init create_domUs(void) d_cfg.max_maptrack_frames = val; } + if ( dt_get_property(node, "sve", &val) ) + { +#ifdef CONFIG_ARM64_SVE + unsigned int sve_vl_bits; + bool ret = false; + + if ( !val ) + { + /* Property found with no value, means max HW VL supported */ + ret = sve_domctl_vl_param(-1, &sve_vl_bits); + } + else + { + if ( dt_property_read_u32(node, "sve", &val) ) + ret = sve_domctl_vl_param(val, &sve_vl_bits); + else + panic("Error reading 'sve' property\n"); + } + + if ( ret ) + d_cfg.arch.sve_vl = sve_encode_vl(sve_vl_bits); + else + panic("SVE vector length error\n"); +#else + panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); +#endif + } + /* * The variable max_init_domid is initialized with zero, so here it's * very important to use the pre-increment operator to call -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:01:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:01:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546431.853290 (Exim 4.92) (envelope-from ) id 1q7tXn-0006AW-AG; Sat, 10 Jun 2023 08:01:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546431.853290; Sat, 10 Jun 2023 08:01:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXn-0006AO-7O; Sat, 10 Jun 2023 08:01:55 +0000 Received: by outflank-mailman (input) for mailman id 546431; Sat, 10 Jun 2023 08:01:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXl-0006AA-NS for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXl-0005Fo-MF for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tXl-00027O-LY for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:01:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=x3pLaT9K0BOiX465QMksrqU1NGWGK6o900iumRjlKC4=; b=1Qe5gxLacKIInVPhtlmUEkelub wwsIgiKziJKWRfIC6SFrA2AZFgQu1Mdpi/ktkb5SR2HO18OibW4gtp1RitjVuQ0wl99qi+C10wDcg kpCJm/wqstgvYn4sKXadJpLEXtbu3Xq4kqXiidxaudiHZtl1tWXG1A0kP4+e0kQL3oys=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/changelog: Add SVE and "dom0" options to the changelog for Arm Message-Id: Date: Sat, 10 Jun 2023 08:01:53 +0000 commit cb8b18d49ad804108ead8667179794b0ead66f2a Author: Luca Fancellu AuthorDate: Wed May 31 08:24:13 2023 +0100 Commit: Julien Grall CommitDate: Wed Jun 7 11:22:51 2023 +0100 xen/changelog: Add SVE and "dom0" options to the changelog for Arm Arm now can use the "dom0=" Xen command line option and the support for guests running SVE instructions is added, put entries in the changelog. Mention the "Tech Preview" status and add an entry in SUPPORT.md Signed-off-by: Luca Fancellu Acked-by: Henry Wang # CHANGELOG Reviewed-by: Bertrand Marquis --- CHANGELOG.md | 4 ++++ SUPPORT.md | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceedaf333a..7d7e0590f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) cap toolstack provided values. - Ignore VCPUOP_set_singleshot_timer's VCPU_SSHOTTMR_future flag. The only known user doesn't use it properly, leading to in-guest breakage. + - The "dom0" option is now supported on Arm and "sve=" sub-option can be used + to enable dom0 guest to use SVE/SVE2 instructions. ### Added - On x86, support for features new in Intel Sapphire Rapids CPUs: @@ -21,6 +23,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) wide impact of a guest misusing atomic instructions. - xl/libxl can customize SMBIOS strings for HVM guests. - Add support for AVX512-FP16 on x86. + - On Arm, Xen supports guests running SVE/SVE2 instructions. (Tech Preview) + ## [4.17.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.17.0) - 2022-12-12 diff --git a/SUPPORT.md b/SUPPORT.md index 6dbed9d5d0..c0aeb1f3f5 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -99,6 +99,12 @@ Extension to the GICv3 interrupt controller to support MSI. Status: Experimental +### ARM Scalable Vector Extension (SVE/SVE2) + +Arm64 domains can use Scalable Vector Extension (SVE/SVE2). + + Status: Tech Preview + ## Guest Type ### x86/PV -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:02:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:02:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546432.853294 (Exim 4.92) (envelope-from ) id 1q7tXx-0006DX-CE; Sat, 10 Jun 2023 08:02:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546432.853294; Sat, 10 Jun 2023 08:02:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXx-0006DN-9F; Sat, 10 Jun 2023 08:02:05 +0000 Received: by outflank-mailman (input) for mailman id 546432; Sat, 10 Jun 2023 08:02:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXv-0006DC-QA for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tXv-0005G9-PQ for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tXv-00028O-OR for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jbMXGqK3DtTy+eHcIPSrSNlhTanAwrxV4n1liNBqQ40=; b=tBpsf1PUCHKbtYSDw4EWTkPGUS T61OmWfdHIHfcPZBMcapa/vM1PfeTW5pw3nY9fhWecc0K+41faFgvsx3oGnC+pydUQC7Xe6TBFo9r 0kHS1F8iwv6yzmXD0A3MgSMLxYG+B/Ox81JNgSMQb1oW2DznPNwmUqqHH63v1KPdoREs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: take transaction internal nodes into account for quota Message-Id: Date: Sat, 10 Jun 2023 08:02:03 +0000 commit 887b576ba90b741d6afcfbefbbb7ba9d71d42797 Author: Juergen Gross AuthorDate: Tue May 30 10:24:11 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: take transaction internal nodes into account for quota The accounting for the number of nodes of a domain in an active transaction is not working correctly, as it is checking the node quota only against the number of nodes outside the transaction. This can result in the transaction finally failing, as node quota is checked at the end of the transaction again. On the other hand even in a transaction deleting many nodes, new nodes might not be creatable, in case the node quota was already reached at the start of the transaction. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index aeb7595ae1..2b85bafeee 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1115,9 +1115,8 @@ int domain_nbentry_fix(unsigned int domid, int num, bool update) int domain_nbentry(struct connection *conn) { - return (domain_is_unprivileged(conn)) - ? conn->domain->nbentry - : 0; + return domain_is_unprivileged(conn) + ? domain_nbentry_add(conn, conn->id, 0, true) : 0; } static bool domain_chk_quota(struct domain *domain, int mem) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:02:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:02:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546433.853298 (Exim 4.92) (envelope-from ) id 1q7tY7-0006GY-Dh; Sat, 10 Jun 2023 08:02:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546433.853298; Sat, 10 Jun 2023 08:02:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tY7-0006GQ-Ap; Sat, 10 Jun 2023 08:02:15 +0000 Received: by outflank-mailman (input) for mailman id 546433; Sat, 10 Jun 2023 08:02:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tY5-0006GC-T1 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tY5-0005GI-SM for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tY5-0002AP-Rb for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=T95hygCkfymBD7ddPntY68UgNI9hs5WJ8AT/wKkbr1I=; b=fSyZ6pYWXnoNYNpvjUpuipeuBr CVqUbEX7bMwmgu5P0jeMaKBHo3Elb7vYKLRVOJJ6IQ3DkJEErYSBMGRNd7LJgLDzOu5ojWwn7ux3/ B60FzwJIwQOLahwhSIMOxQyflWCLzj4gyL9VGH0ex/0URzHw3pGuOk+rnq6C2z9mszRs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: manage per-transaction domain accounting data in an array Message-Id: Date: Sat, 10 Jun 2023 08:02:13 +0000 commit fbec2545457d27a01c7a022c592196356615f4cc Author: Juergen Gross AuthorDate: Tue May 30 10:24:12 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: manage per-transaction domain accounting data in an array In order to prepare keeping accounting data in an array instead of using independent fields, switch the struct changed_domain accounting data to that scheme, for now only using an array with one element. In order to be able to extend this scheme add the needed indexing enum to xenstored_domain.h. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 19 +++++++++++-------- tools/xenstore/xenstored_domain.h | 10 ++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 2b85bafeee..5b154dbe27 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -99,8 +99,8 @@ struct changed_domain /* Identifier of the changed domain. */ unsigned int domid; - /* Amount by which this domain's nbentry field has changed. */ - int nbentry; + /* Accounting data. */ + int acc[ACC_TR_N]; }; static struct hashtable *domhash; @@ -549,7 +549,7 @@ int acc_fix_domains(struct list_head *head, bool chk_quota, bool update) int cnt; list_for_each_entry(cd, head, list) { - cnt = domain_nbentry_fix(cd->domid, cd->nbentry, update); + cnt = domain_nbentry_fix(cd->domid, cd->acc[ACC_NODES], update); if (!update) { if (chk_quota && cnt >= quota_nb_entry_per_domain) return ENOSPC; @@ -594,19 +594,21 @@ static struct changed_domain *acc_get_changed_domain(const void *ctx, return cd; } -static int acc_add_dom_nbentry(const void *ctx, struct list_head *head, int val, - unsigned int domid) +static int acc_add_changed_dom(const void *ctx, struct list_head *head, + enum accitem what, int val, unsigned int domid) { struct changed_domain *cd; + assert(what < ARRAY_SIZE(cd->acc)); + cd = acc_get_changed_domain(ctx, head, domid); if (!cd) return 0; errno = 0; - cd->nbentry += val; + cd->acc[what] += val; - return cd->nbentry; + return cd->acc[what]; } static void domain_conn_reset(struct domain *domain) @@ -1070,7 +1072,8 @@ static int domain_nbentry_add(struct connection *conn, unsigned int domid, if (conn && conn->transaction) { head = transaction_get_changed_domains(conn->transaction); - ret = acc_add_dom_nbentry(conn->transaction, head, add, domid); + ret = acc_add_changed_dom(conn->transaction, head, ACC_NODES, + add, domid); if (errno) { fail_transaction(conn->transaction); return -1; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 279cccb3ad..40803574f6 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -19,6 +19,16 @@ #ifndef _XENSTORED_DOMAIN_H #define _XENSTORED_DOMAIN_H +/* + * All accounting data is stored in a per-domain array. + * Depending on the account item there might be other scopes as well, like e.g. + * a per transaction array. + */ +enum accitem { + ACC_NODES, + ACC_TR_N, /* Number of elements per transaction. */ +}; + void handle_event(void); void check_domains(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:02:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:02:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546434.853304 (Exim 4.92) (envelope-from ) id 1q7tYH-0006JZ-GF; Sat, 10 Jun 2023 08:02:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546434.853304; Sat, 10 Jun 2023 08:02:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYH-0006JR-CR; Sat, 10 Jun 2023 08:02:25 +0000 Received: by outflank-mailman (input) for mailman id 546434; Sat, 10 Jun 2023 08:02:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYG-0006JC-0X for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYF-0005GP-VZ for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tYF-0002Aq-UV for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=noKy/H0Ee5PXLgTO/P8b4KgQun4Ccyo3bORo3ISfph4=; b=S+777/M08Jt8XaufBRRu0QfzR8 jwp0rRaEyhWhRFU0GyicvzNSaxiBrJfbxahMOfCuC7GY+HWcPLrnlHK994Ny1X5ffv5S6B1cIhNNZ NuOFSLMEmzqa3dyNrCNq+v0uzRdgArmaZhbdPNSMPmbG2g1+e6bhh4+eUsCRe1JO1U1A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: introduce accounting data array for per-domain values Message-Id: Date: Sat, 10 Jun 2023 08:02:23 +0000 commit 621949547cb6205d4bb47884b40c3786904e6af0 Author: Juergen Gross AuthorDate: Tue May 30 10:24:13 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: introduce accounting data array for per-domain values Introduce the scheme of an accounting data array for per-domain accounting data and use it initially for the number of nodes owned by a domain. Make the accounting data type to be unsigned int, as no data is allowed to be negative at any time. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 70 +++++++++++++++++++++++---------------- tools/xenstore/xenstored_domain.h | 3 +- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 5b154dbe27..698b2e5e23 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -69,8 +69,8 @@ struct domain /* Has domain been officially introduced? */ bool introduced; - /* number of entry from this domain in the store */ - int nbentry; + /* Accounting data for this domain. */ + unsigned int acc[ACC_N]; /* Amount of memory allocated for this domain. */ int memory; @@ -246,7 +246,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, if (keep_orphans) { set_tdb_key(node->name, &key); - domain->nbentry--; + domain_nbentry_dec(NULL, domain->domid); node->perms.p[0].id = priv_domid; node->acc.memory = 0; domain_nbentry_inc(NULL, priv_domid); @@ -270,7 +270,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, ret = WALK_TREE_SKIP_CHILDREN; } - return domain->nbentry > 0 ? ret : WALK_TREE_SUCCESS_STOP; + return domain->acc[ACC_NODES] ? ret : WALK_TREE_SUCCESS_STOP; } static void domain_tree_remove(struct domain *domain) @@ -278,7 +278,7 @@ static void domain_tree_remove(struct domain *domain) int ret; struct walk_funcs walkfuncs = { .enter = domain_tree_remove_sub }; - if (domain->nbentry > 0) { + if (domain->acc[ACC_NODES]) { ret = walk_node_tree(domain, NULL, "/", &walkfuncs, domain); if (ret == WALK_TREE_ERROR_STOP) syslog(LOG_ERR, @@ -436,7 +436,7 @@ int domain_get_quota(const void *ctx, struct connection *conn, resp = talloc_asprintf_append(resp, "%-16s: %8d\n", #t, e); \ if (!resp) return ENOMEM - ent(nodes, d->nbentry); + ent(nodes, d->acc[ACC_NODES]); ent(watches, d->nbwatch); ent(transactions, ta); ent(outstanding, d->nboutstanding); @@ -1046,8 +1046,27 @@ int domain_adjust_node_perms(struct node *node) return 0; } -static int domain_nbentry_add(struct connection *conn, unsigned int domid, - int add, bool no_dom_alloc) +static int domain_acc_add_valid(struct domain *d, enum accitem what, int add) +{ + assert(what < ARRAY_SIZE(d->acc)); + + if ((add < 0 && -add > d->acc[what]) || + (add > 0 && (INT_MAX - d->acc[what]) < add)) { + /* + * In a transaction when a node is being added/removed AND the + * same node has been added/removed outside the transaction in + * parallel, the resulting value will be wrong. This is no + * problem, as the transaction will fail due to the resulting + * conflict. + */ + return (add < 0) ? 0 : INT_MAX; + } + + return d->acc[what] + add; +} + +static int domain_acc_add(struct connection *conn, unsigned int domid, + enum accitem what, int add, bool no_dom_alloc) { struct domain *d; struct list_head *head; @@ -1070,56 +1089,49 @@ static int domain_nbentry_add(struct connection *conn, unsigned int domid, } } - if (conn && conn->transaction) { + if (conn && conn->transaction && what < ACC_TR_N) { head = transaction_get_changed_domains(conn->transaction); - ret = acc_add_changed_dom(conn->transaction, head, ACC_NODES, + ret = acc_add_changed_dom(conn->transaction, head, what, add, domid); if (errno) { fail_transaction(conn->transaction); return -1; } - /* - * In a transaction when a node is being added/removed AND the - * same node has been added/removed outside the transaction in - * parallel, the resulting number of nodes will be wrong. This - * is no problem, as the transaction will fail due to the - * resulting conflict. - * In the node remove case the resulting number can be even - * negative, which should be avoided. - */ - return max(d->nbentry + ret, 0); + return domain_acc_add_valid(d, what, ret); } - d->nbentry += add; + d->acc[what] = domain_acc_add_valid(d, what, add); - return d->nbentry; + return d->acc[what]; } int domain_nbentry_inc(struct connection *conn, unsigned int domid) { - return (domain_nbentry_add(conn, domid, 1, false) < 0) ? errno : 0; + return (domain_acc_add(conn, domid, ACC_NODES, 1, false) < 0) + ? errno : 0; } int domain_nbentry_dec(struct connection *conn, unsigned int domid) { - return (domain_nbentry_add(conn, domid, -1, true) < 0) ? errno : 0; + return (domain_acc_add(conn, domid, ACC_NODES, -1, true) < 0) + ? errno : 0; } int domain_nbentry_fix(unsigned int domid, int num, bool update) { int ret; - ret = domain_nbentry_add(NULL, domid, update ? num : 0, update); + ret = domain_acc_add(NULL, domid, ACC_NODES, update ? num : 0, update); if (ret < 0 || update) return ret; return domid_is_unprivileged(domid) ? ret + num : 0; } -int domain_nbentry(struct connection *conn) +unsigned int domain_nbentry(struct connection *conn) { return domain_is_unprivileged(conn) - ? domain_nbentry_add(conn, conn->id, 0, true) : 0; + ? domain_acc_add(conn, conn->id, ACC_NODES, 0, true) : 0; } static bool domain_chk_quota(struct domain *domain, int mem) @@ -1596,7 +1608,7 @@ static int domain_check_acc_init_sub(const void *k, void *v, void *arg) * If everything is correct incrementing the value for each node will * result in dom->nodes being 0 at the end. */ - dom->nodes = -d->nbentry; + dom->nodes = -d->acc[ACC_NODES]; if (!hashtable_insert(domains, &dom->domid, dom)) { talloc_free(dom); @@ -1651,7 +1663,7 @@ static int domain_check_acc_cb(const void *k, void *v, void *arg) if (!d) return 0; - d->nbentry += dom->nodes; + d->acc[ACC_NODES] += dom->nodes; return 0; } diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 40803574f6..9d05eb01da 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -27,6 +27,7 @@ enum accitem { ACC_NODES, ACC_TR_N, /* Number of elements per transaction. */ + ACC_N = ACC_TR_N, /* Number of elements per domain. */ }; void handle_event(void); @@ -77,7 +78,7 @@ int domain_alloc_permrefs(struct node_perms *perms); int domain_nbentry_inc(struct connection *conn, unsigned int domid); int domain_nbentry_dec(struct connection *conn, unsigned int domid); int domain_nbentry_fix(unsigned int domid, int num, bool update); -int domain_nbentry(struct connection *conn); +unsigned int domain_nbentry(struct connection *conn); int domain_memory_add(unsigned int domid, int mem, bool no_quota_check); /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:02:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:02:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546435.853306 (Exim 4.92) (envelope-from ) id 1q7tYR-0006M3-Gw; Sat, 10 Jun 2023 08:02:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546435.853306; Sat, 10 Jun 2023 08:02:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYR-0006Lv-E4; Sat, 10 Jun 2023 08:02:35 +0000 Received: by outflank-mailman (input) for mailman id 546435; Sat, 10 Jun 2023 08:02:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYQ-0006Ll-37 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYQ-0005GY-2J for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tYQ-0002BL-1d for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lfk5IJdxL5n59yRXiccIOhUP9CF1xQTUUq7DPedJUME=; b=IsdbZInLX6W448vSjN1zJhDElB 5U9AqhLnNkEDcHjSEYfJCmgWFKv62nYZPitoF3mRaDAA3siSaIGPPBJ6+6khBr5f1fchk+OovhZXW 7fdhZ/Vv60jQoCtAmf+AGTZnSw4hCDE1lqdWN9dHMWp4mPZ7LZ6ShaIvSl3qlmTX+m54=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add framework to commit accounting data on success only Message-Id: Date: Sat, 10 Jun 2023 08:02:34 +0000 commit 192e2f6a11e0718bb6564c45c95347862ac3216f Author: Juergen Gross AuthorDate: Tue May 30 10:24:14 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: add framework to commit accounting data on success only Instead of modifying accounting data and undo those modifications in case of an error during further processing, add a framework for collecting the needed changes and commit them only when the whole operation has succeeded. This scheme can reuse large parts of the per transaction accounting. The changed_domain handling can be reused, but the array size of the accounting data should be possible to be different for both use cases. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 7 +++++ tools/xenstore/xenstored_core.h | 3 +++ tools/xenstore/xenstored_domain.c | 54 ++++++++++++++++++++++++++++++++++++++- tools/xenstore/xenstored_domain.h | 6 ++++- 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 3ca68681e3..8392bdec9b 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1023,6 +1023,9 @@ static void send_error(struct connection *conn, int error) break; } } + + acc_drop(conn); + send_reply(conn, XS_ERROR, xsd_errors[i].errstring, strlen(xsd_errors[i].errstring) + 1); } @@ -1034,6 +1037,9 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type, assert(type != XS_WATCH_EVENT); + /* Commit accounting now, as later errors won't undo any changes. */ + acc_commit(conn); + if ( len > XENSTORE_PAYLOAD_MAX ) { send_error(conn, E2BIG); return; @@ -2195,6 +2201,7 @@ struct connection *new_connection(const struct interface_funcs *funcs) new->is_stalled = false; new->transaction_started = 0; INIT_LIST_HEAD(&new->out_list); + INIT_LIST_HEAD(&new->acc_list); INIT_LIST_HEAD(&new->ref_list); INIT_LIST_HEAD(&new->watches); INIT_LIST_HEAD(&new->transaction_list); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index c59b06551f..1f811f38cb 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -139,6 +139,9 @@ struct connection struct list_head out_list; uint64_t timeout_msec; + /* Not yet committed accounting data (valid if in != NULL). */ + struct list_head acc_list; + /* Referenced requests no longer pending. */ struct list_head ref_list; diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 698b2e5e23..923a3082d7 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -100,7 +100,7 @@ struct changed_domain unsigned int domid; /* Accounting data. */ - int acc[ACC_TR_N]; + int acc[ACC_CHD_N]; }; static struct hashtable *domhash; @@ -1069,6 +1069,7 @@ static int domain_acc_add(struct connection *conn, unsigned int domid, enum accitem what, int add, bool no_dom_alloc) { struct domain *d; + struct changed_domain *cd; struct list_head *head; int ret; @@ -1089,6 +1090,22 @@ static int domain_acc_add(struct connection *conn, unsigned int domid, } } + /* Temporary accounting data until final commit? */ + if (conn && conn->in && what < ACC_REQ_N) { + /* Consider transaction local data. */ + ret = 0; + if (conn->transaction && what < ACC_TR_N) { + head = transaction_get_changed_domains( + conn->transaction); + cd = acc_find_changed_domain(head, domid); + if (cd) + ret = cd->acc[what]; + } + ret += acc_add_changed_dom(conn->in, &conn->acc_list, what, + add, domid); + return errno ? -1 : domain_acc_add_valid(d, what, ret); + } + if (conn && conn->transaction && what < ACC_TR_N) { head = transaction_get_changed_domains(conn->transaction); ret = acc_add_changed_dom(conn->transaction, head, what, @@ -1105,6 +1122,41 @@ static int domain_acc_add(struct connection *conn, unsigned int domid, return d->acc[what]; } +void acc_drop(struct connection *conn) +{ + struct changed_domain *cd; + + while ((cd = list_top(&conn->acc_list, struct changed_domain, list))) { + list_del(&cd->list); + talloc_free(cd); + } +} + +void acc_commit(struct connection *conn) +{ + struct changed_domain *cd; + enum accitem what; + struct buffered_data *in = conn->in; + + /* + * Make sure domain_acc_add() below can't add additional data to + * to be committed accounting records. + */ + conn->in = NULL; + + while ((cd = list_top(&conn->acc_list, struct changed_domain, list))) { + list_del(&cd->list); + for (what = 0; what < ACC_REQ_N; what++) + if (cd->acc[what]) + domain_acc_add(conn, cd->domid, what, + cd->acc[what], true); + + talloc_free(cd); + } + + conn->in = in; +} + int domain_nbentry_inc(struct connection *conn, unsigned int domid) { return (domain_acc_add(conn, domid, ACC_NODES, 1, false) < 0) diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 9d05eb01da..e40657216b 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -25,8 +25,10 @@ * a per transaction array. */ enum accitem { - ACC_NODES, + ACC_REQ_N, /* Number of elements per request. */ + ACC_NODES = ACC_REQ_N, ACC_TR_N, /* Number of elements per transaction. */ + ACC_CHD_N = ACC_TR_N, /* max(ACC_REQ_N, ACC_TR_N), for changed dom. */ ACC_N = ACC_TR_N, /* Number of elements per domain. */ }; @@ -113,6 +115,8 @@ int domain_get_quota(const void *ctx, struct connection *conn, * If "update" is true, "chk_quota" is ignored. */ int acc_fix_domains(struct list_head *head, bool chk_quota, bool update); +void acc_drop(struct connection *conn); +void acc_commit(struct connection *conn); /* Write rate limiting */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:02:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:02:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546436.853310 (Exim 4.92) (envelope-from ) id 1q7tYb-0006PJ-KG; Sat, 10 Jun 2023 08:02:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546436.853310; Sat, 10 Jun 2023 08:02:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYb-0006PB-HM; Sat, 10 Jun 2023 08:02:45 +0000 Received: by outflank-mailman (input) for mailman id 546436; Sat, 10 Jun 2023 08:02:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYa-0006Oz-6N for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYa-0005Gx-5c for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tYa-0002Bm-4m for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Yo8TEN3JbDP9pXoSSKRM/WYThQKQrEBGEJBIYvDbyNY=; b=Z/AZ/TCHYBuHBEp4PS9PDbPCJt VU2hrXsbHij80ylLVQT4Bz6wQvrDE6uc+07lCDZ8IqB6dU25Q3dA18Vyu6JQDPkRZAFtfbimlhK+u LTnZXdrvwPN5Yxz8CJUIBU9/zyWOOX8tX4shyM5Zd1x5VrxbFhv+stlFjxSXt4bvyO9c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: use accounting buffering for node accounting Message-Id: Date: Sat, 10 Jun 2023 08:02:44 +0000 commit a4ffaa082458778306d16bf77c8cd099509ecab0 Author: Juergen Gross AuthorDate: Tue May 30 10:24:15 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: use accounting buffering for node accounting Add the node accounting to the accounting information buffering in order to avoid having to undo it in case of failure. This requires to call domain_nbentry_dec() before any changes to the data base, as it can return an error now. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 37 ++++++++++++++----------------------- tools/xenstore/xenstored_domain.h | 4 ++-- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 8392bdec9b..0a9c88ca67 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1454,7 +1454,6 @@ static void destroy_node_rm(struct connection *conn, struct node *node) static int destroy_node(struct connection *conn, struct node *node) { destroy_node_rm(conn, node); - domain_nbentry_dec(conn, get_node_owner(node)); /* * It is not possible to easily revert the changes in a transaction. @@ -1645,9 +1644,12 @@ static int delnode_sub(const void *ctx, struct connection *conn, if (ret > 0) return WALK_TREE_SUCCESS_STOP; + if (domain_nbentry_dec(conn, get_node_owner(node))) + return WALK_TREE_ERROR_STOP; + /* In case of error stop the walk. */ if (!ret && do_tdb_delete(conn, &key, &node->acc)) - return WALK_TREE_SUCCESS_STOP; + return WALK_TREE_ERROR_STOP; /* * Fire the watches now, when we can still see the node permissions. @@ -1657,8 +1659,6 @@ static int delnode_sub(const void *ctx, struct connection *conn, watch_exact = strcmp(root, node->name); fire_watches(conn, ctx, node->name, node, watch_exact, NULL); - domain_nbentry_dec(conn, get_node_owner(node)); - return WALK_TREE_RM_CHILDENTRY; } @@ -1679,6 +1679,12 @@ int rm_node(struct connection *conn, const void *ctx, const char *name) ret = walk_node_tree(ctx, conn, name, &walkfuncs, (void *)name); if (ret < 0) { if (ret == WALK_TREE_ERROR_STOP) { + /* + * This can't be triggered by an unprivileged guest, + * so calling corrupt() is fine here. + * In fact it is needed in order to fix a potential + * accounting inconsistency. + */ corrupt(conn, "error when deleting sub-nodes of %s\n", name); errno = EIO; @@ -1797,29 +1803,14 @@ static int do_set_perms(const void *ctx, struct connection *conn, return EPERM; old_perms = node->perms; - domain_nbentry_dec(conn, get_node_owner(node)); + if (domain_nbentry_dec(conn, get_node_owner(node))) + return ENOMEM; node->perms = perms; - if (domain_nbentry_inc(conn, get_node_owner(node))) { - node->perms = old_perms; - /* - * This should never fail because we had a reference on the - * domain before and Xenstored is single-threaded. - */ - domain_nbentry_inc(conn, get_node_owner(node)); + if (domain_nbentry_inc(conn, get_node_owner(node))) return ENOMEM; - } - if (write_node(conn, node, false)) { - int saved_errno = errno; - - domain_nbentry_dec(conn, get_node_owner(node)); - node->perms = old_perms; - /* No failure possible as above. */ - domain_nbentry_inc(conn, get_node_owner(node)); - - errno = saved_errno; + if (write_node(conn, node, false)) return errno; - } fire_watches(conn, ctx, name, node, false, &old_perms); send_ack(conn, XS_SET_PERMS); diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index e40657216b..466549709f 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -25,9 +25,9 @@ * a per transaction array. */ enum accitem { + ACC_NODES, ACC_REQ_N, /* Number of elements per request. */ - ACC_NODES = ACC_REQ_N, - ACC_TR_N, /* Number of elements per transaction. */ + ACC_TR_N = ACC_REQ_N, /* Number of elements per transaction. */ ACC_CHD_N = ACC_TR_N, /* max(ACC_REQ_N, ACC_TR_N), for changed dom. */ ACC_N = ACC_TR_N, /* Number of elements per domain. */ }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:02:55 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:02:55 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546437.853313 (Exim 4.92) (envelope-from ) id 1q7tYl-0006Ri-Lr; Sat, 10 Jun 2023 08:02:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546437.853313; Sat, 10 Jun 2023 08:02:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYl-0006Rb-JD; Sat, 10 Jun 2023 08:02:55 +0000 Received: by outflank-mailman (input) for mailman id 546437; Sat, 10 Jun 2023 08:02:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYk-0006RP-9f for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYk-0005Hq-8s for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tYk-0002CF-8A for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:02:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=R3g3IzGWnJI6ckVWvTwWOhCTl0Mlmok5vWokOpsj5Mo=; b=aOzKDYAEH09WcfNAVQsW93vFTC m+eG9QrVpqr6EUR9Ul0mpVM8J7ZG4LhwMPvJ7IhvnEN7i3eC44IOX2I2nFVW2cWa92wgubpcS9a36 1zwi610YO52kW85R4BxLnZKQrOJ3YMVq4VKodH+LEbu1UuImU0EGz2uLLgQ9dZrObfrA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add current connection to domain_memory_add() parameters Message-Id: Date: Sat, 10 Jun 2023 08:02:54 +0000 commit d0740236fd2b3511082c64b5af81027b23ae500a Author: Juergen Gross AuthorDate: Tue May 30 10:24:16 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: add current connection to domain_memory_add() parameters In order to enable switching memory accounting to the generic array based accounting, add the current connection to the parameters of domain_memory_add(). This requires to add the connection to some other functions, too. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 28 ++++++++++++++++------------ tools/xenstore/xenstored_domain.c | 3 ++- tools/xenstore/xenstored_domain.h | 14 +++++++++----- tools/xenstore/xenstored_watch.c | 11 ++++++----- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 0a9c88ca67..006ad9224c 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -246,7 +246,8 @@ static void free_buffered_data(struct buffered_data *out, } } - domain_memory_add_nochk(conn->id, -out->hdr.msg.len - sizeof(out->hdr)); + domain_memory_add_nochk(conn, conn->id, + -out->hdr.msg.len - sizeof(out->hdr)); if (out->hdr.msg.type == XS_WATCH_EVENT) { req = out->pend.req; @@ -631,24 +632,25 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, * nodes to new owners. */ if (old_acc.memory) - domain_memory_add_nochk(old_domid, + domain_memory_add_nochk(conn, old_domid, -old_acc.memory - key->dsize); - ret = domain_memory_add(new_domid, data->dsize + key->dsize, - no_quota_check); + ret = domain_memory_add(conn, new_domid, + data->dsize + key->dsize, no_quota_check); if (ret) { /* Error path, so no quota check. */ if (old_acc.memory) - domain_memory_add_nochk(old_domid, + domain_memory_add_nochk(conn, old_domid, old_acc.memory + key->dsize); return ret; } /* TDB should set errno, but doesn't even set ecode AFAICT. */ if (tdb_store(tdb_ctx, *key, *data, TDB_REPLACE) != 0) { - domain_memory_add_nochk(new_domid, -data->dsize - key->dsize); + domain_memory_add_nochk(conn, new_domid, + -data->dsize - key->dsize); /* Error path, so no quota check. */ if (old_acc.memory) - domain_memory_add_nochk(old_domid, + domain_memory_add_nochk(conn, old_domid, old_acc.memory + key->dsize); errno = EIO; return errno; @@ -683,7 +685,7 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *key, if (acc->memory) { domid = get_acc_domid(conn, key, acc->domid); - domain_memory_add_nochk(domid, -acc->memory - key->dsize); + domain_memory_add_nochk(conn, domid, -acc->memory - key->dsize); } return 0; @@ -1055,11 +1057,13 @@ void send_reply(struct connection *conn, enum xsd_sockmsg_type type, if (len <= DEFAULT_BUFFER_SIZE) { bdata->buffer = bdata->default_buffer; /* Don't check quota, path might be used for returning error. */ - domain_memory_add_nochk(conn->id, len + sizeof(bdata->hdr)); + domain_memory_add_nochk(conn, conn->id, + len + sizeof(bdata->hdr)); } else { bdata->buffer = talloc_array(bdata, char, len); if (!bdata->buffer || - domain_memory_add_chk(conn->id, len + sizeof(bdata->hdr))) { + domain_memory_add_chk(conn, conn->id, + len + sizeof(bdata->hdr))) { send_error(conn, ENOMEM); return; } @@ -1124,7 +1128,7 @@ void send_event(struct buffered_data *req, struct connection *conn, } } - if (domain_memory_add_chk(conn->id, len + sizeof(bdata->hdr))) { + if (domain_memory_add_chk(conn, conn->id, len + sizeof(bdata->hdr))) { talloc_free(bdata); return; } @@ -3332,7 +3336,7 @@ static void add_buffered_data(struct buffered_data *bdata, * be smaller. So ignore it. The limit will be applied for any resource * after the state has been fully restored. */ - domain_memory_add_nochk(conn->id, len + sizeof(bdata->hdr)); + domain_memory_add_nochk(conn, conn->id, len + sizeof(bdata->hdr)); } void read_state_buffered_data(const void *ctx, struct connection *conn, diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 923a3082d7..bc1ac48d50 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1235,7 +1235,8 @@ static bool domain_chk_quota(struct domain *domain, int mem) return false; } -int domain_memory_add(unsigned int domid, int mem, bool no_quota_check) +int domain_memory_add(struct connection *conn, unsigned int domid, int mem, + bool no_quota_check) { struct domain *domain; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 466549709f..b94548fd7d 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -81,25 +81,29 @@ int domain_nbentry_inc(struct connection *conn, unsigned int domid); int domain_nbentry_dec(struct connection *conn, unsigned int domid); int domain_nbentry_fix(unsigned int domid, int num, bool update); unsigned int domain_nbentry(struct connection *conn); -int domain_memory_add(unsigned int domid, int mem, bool no_quota_check); +int domain_memory_add(struct connection *conn, unsigned int domid, int mem, + bool no_quota_check); /* * domain_memory_add_chk(): to be used when memory quota should be checked. * Not to be used when specifying a negative mem value, as lowering the used * memory should always be allowed. */ -static inline int domain_memory_add_chk(unsigned int domid, int mem) +static inline int domain_memory_add_chk(struct connection *conn, + unsigned int domid, int mem) { - return domain_memory_add(domid, mem, false); + return domain_memory_add(conn, domid, mem, false); } + /* * domain_memory_add_nochk(): to be used when memory quota should not be * checked, e.g. when lowering memory usage, or in an error case for undoing * a previous memory adjustment. */ -static inline void domain_memory_add_nochk(unsigned int domid, int mem) +static inline void domain_memory_add_nochk(struct connection *conn, + unsigned int domid, int mem) { - domain_memory_add(domid, mem, true); + domain_memory_add(conn, domid, mem, true); } void domain_watch_inc(struct connection *conn); void domain_watch_dec(struct connection *conn); diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 8ad0229df6..e30cd89be3 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -199,7 +199,7 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token, watch->token = talloc_strdup(watch, token); if (!watch->node || !watch->token) goto nomem; - if (domain_memory_add(conn->id, strlen(path) + strlen(token), + if (domain_memory_add(conn, conn->id, strlen(path) + strlen(token), no_quota_check)) goto nomem; @@ -274,8 +274,9 @@ int do_unwatch(const void *ctx, struct connection *conn, list_for_each_entry(watch, &conn->watches, list) { if (streq(watch->node, node) && streq(watch->token, vec[1])) { list_del(&watch->list); - domain_memory_add_nochk(conn->id, -strlen(watch->node) - - strlen(watch->token)); + domain_memory_add_nochk(conn, conn->id, + -strlen(watch->node) - + strlen(watch->token)); talloc_free(watch); domain_watch_dec(conn); send_ack(conn, XS_UNWATCH); @@ -291,8 +292,8 @@ void conn_delete_all_watches(struct connection *conn) while ((watch = list_top(&conn->watches, struct watch, list))) { list_del(&watch->list); - domain_memory_add_nochk(conn->id, -strlen(watch->node) - - strlen(watch->token)); + domain_memory_add_nochk(conn, conn->id, -strlen(watch->node) - + strlen(watch->token)); talloc_free(watch); domain_watch_dec(conn); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:03:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:03:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546438.853318 (Exim 4.92) (envelope-from ) id 1q7tYv-0006Uo-O5; Sat, 10 Jun 2023 08:03:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546438.853318; Sat, 10 Jun 2023 08:03:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYv-0006Uf-Kr; Sat, 10 Jun 2023 08:03:05 +0000 Received: by outflank-mailman (input) for mailman id 546438; Sat, 10 Jun 2023 08:03:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYu-0006UN-Cp for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tYu-0005J2-C0 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tYu-0002Cp-BE for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sfHbjjSKYQ2sTnrtd36CpbaxVW+bFmD2vESJ8+yovUw=; b=HbznUfpawOzgeDEzLMJ56UetHR gkxhrDyVBJynUNTn/WvSP9KRBVAqfjADEVj0IbL/y7QsMhB8mv0hIgyyjMiGbnDPalKu1lrl4lJYb pXpks6wmDFEujghIy9Qe+3spOe19qp62mMiJBwB4MXoDA7tyuZQ0ecpLKcRY0/Evbr2Q=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: use accounting data array for per-domain values Message-Id: Date: Sat, 10 Jun 2023 08:03:04 +0000 commit e180d3200a15ad1d9b54a1cf5a6ac690d9f943b0 Author: Juergen Gross AuthorDate: Tue May 30 10:24:17 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: use accounting data array for per-domain values Add the accounting of per-domain usage of Xenstore memory, watches, and outstanding requests to the array based mechanism. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 4 +- tools/xenstore/xenstored_domain.c | 109 ++++++++++++++------------------------ tools/xenstore/xenstored_domain.h | 8 +-- 3 files changed, 48 insertions(+), 73 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 006ad9224c..43b8772cb3 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -255,7 +255,7 @@ static void free_buffered_data(struct buffered_data *out, req->pend.ref.event_cnt--; if (!req->pend.ref.event_cnt && !req->on_out_list) { if (req->on_ref_list) { - domain_outstanding_domid_dec( + domain_outstanding_dec(conn, req->pend.ref.domid); list_del(&req->list); } @@ -271,7 +271,7 @@ static void free_buffered_data(struct buffered_data *out, out->on_ref_list = true; return; } else - domain_outstanding_dec(conn); + domain_outstanding_dec(conn, conn->id); talloc_free(out); } diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index bc1ac48d50..5b897df0ba 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -72,19 +72,12 @@ struct domain /* Accounting data for this domain. */ unsigned int acc[ACC_N]; - /* Amount of memory allocated for this domain. */ - int memory; + /* Memory quota data for this domain. */ bool soft_quota_reported; bool hard_quota_reported; time_t mem_last_msg; #define MEM_WARN_MINTIME_SEC 10 - /* number of watch for this domain */ - int nbwatch; - - /* Number of outstanding requests. */ - int nboutstanding; - /* write rate limit */ wrl_creditt wrl_credit; /* [ -wrl_config_writecost, +_dburst ] */ struct wrl_timestampt wrl_timestamp; @@ -200,14 +193,15 @@ static bool domain_can_write(struct connection *conn) static bool domain_can_read(struct connection *conn) { - struct xenstore_domain_interface *intf = conn->domain->interface; + struct domain *domain = conn->domain; + struct xenstore_domain_interface *intf = domain->interface; if (domain_is_unprivileged(conn)) { - if (conn->domain->wrl_credit < 0) + if (domain->wrl_credit < 0) return false; - if (conn->domain->nboutstanding >= quota_req_outstanding) + if (domain->acc[ACC_OUTST] >= quota_req_outstanding) return false; - if (conn->domain->memory >= quota_memory_per_domain_hard && + if (domain->acc[ACC_MEM] >= quota_memory_per_domain_hard && quota_memory_per_domain_hard) return false; } @@ -437,10 +431,10 @@ int domain_get_quota(const void *ctx, struct connection *conn, if (!resp) return ENOMEM ent(nodes, d->acc[ACC_NODES]); - ent(watches, d->nbwatch); + ent(watches, d->acc[ACC_WATCH]); ent(transactions, ta); - ent(outstanding, d->nboutstanding); - ent(memory, d->memory); + ent(outstanding, d->acc[ACC_OUTST]); + ent(memory, d->acc[ACC_MEM]); #undef ent @@ -1186,14 +1180,16 @@ unsigned int domain_nbentry(struct connection *conn) ? domain_acc_add(conn, conn->id, ACC_NODES, 0, true) : 0; } -static bool domain_chk_quota(struct domain *domain, int mem) +static bool domain_chk_quota(struct connection *conn, unsigned int mem) { time_t now; + struct domain *domain; - if (!domain || !domid_is_unprivileged(domain->domid) || - (domain->conn && domain->conn->is_ignored)) + if (!conn || !domid_is_unprivileged(conn->id) || + conn->is_ignored) return false; + domain = conn->domain; now = time(NULL); if (mem >= quota_memory_per_domain_hard && @@ -1238,80 +1234,57 @@ static bool domain_chk_quota(struct domain *domain, int mem) int domain_memory_add(struct connection *conn, unsigned int domid, int mem, bool no_quota_check) { - struct domain *domain; + int ret; - domain = find_domain_struct(domid); - if (domain) { - /* - * domain_chk_quota() will print warning and also store whether - * the soft/hard quota has been hit. So check no_quota_check - * *after*. - */ - if (domain_chk_quota(domain, domain->memory + mem) && - !no_quota_check) - return ENOMEM; - domain->memory += mem; - } else { - /* - * The domain the memory is to be accounted for should always - * exist, as accounting is done either for a domain related to - * the current connection, or for the domain owning a node - * (which is always existing, as the owner of the node is - * tested to exist and deleted or replaced by domid 0 if not). - * So not finding the related domain MUST be an error in the - * data base. - */ - errno = ENOENT; - corrupt(NULL, "Accounting called for non-existing domain %u\n", - domid); - return ENOENT; - } + ret = domain_acc_add(conn, domid, ACC_MEM, 0, true); + if (ret < 0) + return -ret; + + /* + * domain_chk_quota() will print warning and also store whether the + * soft/hard quota has been hit. So check no_quota_check *after*. + */ + if (domain_chk_quota(conn, ret + mem) && !no_quota_check) + return ENOMEM; + + /* + * The domain the memory is to be accounted for should always exist, + * as accounting is done either for a domain related to the current + * connection, or for the domain owning a node (which is always + * existing, as the owner of the node is tested to exist and deleted + * or replaced by domid 0 if not). + * So not finding the related domain MUST be an error in the data base. + */ + domain_acc_add(conn, domid, ACC_MEM, mem, true); return 0; } void domain_watch_inc(struct connection *conn) { - if (!conn || !conn->domain) - return; - conn->domain->nbwatch++; + domain_acc_add(conn, conn->id, ACC_WATCH, 1, true); } void domain_watch_dec(struct connection *conn) { - if (!conn || !conn->domain) - return; - if (conn->domain->nbwatch) - conn->domain->nbwatch--; + domain_acc_add(conn, conn->id, ACC_WATCH, -1, true); } int domain_watch(struct connection *conn) { return (domain_is_unprivileged(conn)) - ? conn->domain->nbwatch + ? domain_acc_add(conn, conn->id, ACC_WATCH, 0, true) : 0; } void domain_outstanding_inc(struct connection *conn) { - if (!conn || !conn->domain) - return; - conn->domain->nboutstanding++; + domain_acc_add(conn, conn->id, ACC_OUTST, 1, true); } -void domain_outstanding_dec(struct connection *conn) +void domain_outstanding_dec(struct connection *conn, unsigned int domid) { - if (!conn || !conn->domain) - return; - conn->domain->nboutstanding--; -} - -void domain_outstanding_domid_dec(unsigned int domid) -{ - struct domain *d = find_domain_by_domid(domid); - - if (d) - d->nboutstanding--; + domain_acc_add(conn, domid, ACC_OUTST, -1, true); } static wrl_creditt wrl_config_writecost = WRL_FACTOR; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index b94548fd7d..086133407b 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -29,7 +29,10 @@ enum accitem { ACC_REQ_N, /* Number of elements per request. */ ACC_TR_N = ACC_REQ_N, /* Number of elements per transaction. */ ACC_CHD_N = ACC_TR_N, /* max(ACC_REQ_N, ACC_TR_N), for changed dom. */ - ACC_N = ACC_TR_N, /* Number of elements per domain. */ + ACC_WATCH = ACC_TR_N, + ACC_OUTST, + ACC_MEM, + ACC_N, /* Number of elements per domain. */ }; void handle_event(void); @@ -109,8 +112,7 @@ void domain_watch_inc(struct connection *conn); void domain_watch_dec(struct connection *conn); int domain_watch(struct connection *conn); void domain_outstanding_inc(struct connection *conn); -void domain_outstanding_dec(struct connection *conn); -void domain_outstanding_domid_dec(unsigned int domid); +void domain_outstanding_dec(struct connection *conn, unsigned int domid); int domain_get_quota(const void *ctx, struct connection *conn, unsigned int domid); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:03:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:03:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546439.853321 (Exim 4.92) (envelope-from ) id 1q7tZ5-0006Xq-PH; Sat, 10 Jun 2023 08:03:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546439.853321; Sat, 10 Jun 2023 08:03:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZ5-0006Xi-MS; Sat, 10 Jun 2023 08:03:15 +0000 Received: by outflank-mailman (input) for mailman id 546439; Sat, 10 Jun 2023 08:03:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZ4-0006XU-Fw for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZ4-0005JB-F7 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tZ4-0002DG-ER for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XgHPIY5kmtIYHQcdbMb1hqruhd9zc87DTmpt+gjQMDU=; b=q3Bcw1h1oRAaohHzBr58fJJLcf v5oHkxZ/nIZLtrzC2AokphbKWFC3bU7pF3dRE/X8U1BIttG3sLTuoG0M1yzVTtuAN+VIBR8cFtVHr I7IB3L3tdOtP45/i3GOCgLmTCroJipolmQ9lIWm7VFWNP/fdFVMRXgomFttEorYhMxK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add accounting trace support Message-Id: Date: Sat, 10 Jun 2023 08:03:14 +0000 commit a80865725239e885d6598655ea01c6341bcc9aa3 Author: Juergen Gross AuthorDate: Tue May 30 10:24:18 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: add accounting trace support Add a new trace switch "acc" and the related trace calls. The "acc" switch is off per default. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 2 +- tools/xenstore/xenstored_core.h | 1 + tools/xenstore/xenstored_domain.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 43b8772cb3..eb916b0647 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2756,7 +2756,7 @@ static void set_quota(const char *arg, bool soft) /* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ const char *const trace_switches[] = { - "obj", "io", "wrl", + "obj", "io", "wrl", "acc", NULL }; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 1f811f38cb..3e0734a6c6 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -302,6 +302,7 @@ extern unsigned int trace_flags; #define TRACE_OBJ 0x00000001 #define TRACE_IO 0x00000002 #define TRACE_WRL 0x00000004 +#define TRACE_ACC 0x00000008 extern const char *const trace_switches[]; int set_trace_switch(const char *arg); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 5b897df0ba..6523c3a830 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -537,6 +537,12 @@ static struct domain *find_domain_by_domid(unsigned int domid) return (d && d->introduced) ? d : NULL; } +#define trace_acc(...) \ +do { \ + if (trace_flags & TRACE_ACC) \ + trace("acc: " __VA_ARGS__); \ +} while (0) + int acc_fix_domains(struct list_head *head, bool chk_quota, bool update) { struct changed_domain *cd; @@ -600,6 +606,8 @@ static int acc_add_changed_dom(const void *ctx, struct list_head *head, return 0; errno = 0; + trace_acc("local change domid %u: what=%u %d add %d\n", domid, what, + cd->acc[what], val); cd->acc[what] += val; return cd->acc[what]; @@ -1111,6 +1119,8 @@ static int domain_acc_add(struct connection *conn, unsigned int domid, return domain_acc_add_valid(d, what, ret); } + trace_acc("global change domid %u: what=%u %u add %d\n", domid, what, + d->acc[what], add); d->acc[what] = domain_acc_add_valid(d, what, add); return d->acc[what]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:03:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:03:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546440.853325 (Exim 4.92) (envelope-from ) id 1q7tZF-0006b2-Sp; Sat, 10 Jun 2023 08:03:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546440.853325; Sat, 10 Jun 2023 08:03:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZF-0006av-Q8; Sat, 10 Jun 2023 08:03:25 +0000 Received: by outflank-mailman (input) for mailman id 546440; Sat, 10 Jun 2023 08:03:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZE-0006ag-J5 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZE-0005JI-II for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tZE-0002Dl-HR for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=43SrE8yTtByPX6S6/m/WAq2c2Tnlk6VgHJninCxvepg=; b=LHoLyx/y02UXn+74Td9CH12Cit sMNWHYn574TzrLQFanY3LgohjlAVMgvZo21lI5V9o7B25L7x4atmnZD5Ii7XpB4kvoWKy2W05Zulu k3jcczM5ABJar1tRV0u31RhElbPegGfdTg8SxYZySdxf5lKiIvLAq3g+7DrBCimcaSW8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: add TDB access trace support Message-Id: Date: Sat, 10 Jun 2023 08:03:24 +0000 commit ff7509c2b7137a2ae42eb54c12becff04b1f79ad Author: Juergen Gross AuthorDate: Tue May 30 10:24:19 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: add TDB access trace support Add a new trace switch "tdb" and the related trace calls. The "tdb" switch is off per default. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 8 +++++++- tools/xenstore/xenstored_core.h | 7 +++++++ tools/xenstore/xenstored_transaction.c | 7 ++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index eb916b0647..069c03d4b0 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -589,6 +589,8 @@ static void get_acc_data(TDB_DATA *key, struct node_account_data *acc) if (old_data.dptr == NULL) { acc->memory = 0; } else { + trace_tdb("read %s size %zu\n", key->dptr, + old_data.dsize + key->dsize); hdr = (void *)old_data.dptr; acc->memory = old_data.dsize; acc->domid = hdr->perms[0].id; @@ -655,6 +657,7 @@ int do_tdb_write(struct connection *conn, TDB_DATA *key, TDB_DATA *data, errno = EIO; return errno; } + trace_tdb("store %s size %zu\n", key->dptr, data->dsize + key->dsize); if (acc) { /* Don't use new_domid, as it might be a transaction node. */ @@ -682,6 +685,7 @@ int do_tdb_delete(struct connection *conn, TDB_DATA *key, errno = EIO; return errno; } + trace_tdb("delete %s\n", key->dptr); if (acc->memory) { domid = get_acc_domid(conn, key, acc->domid); @@ -731,6 +735,8 @@ struct node *read_node(struct connection *conn, const void *ctx, goto error; } + trace_tdb("read %s size %zu\n", key.dptr, data.dsize + key.dsize); + node->parent = NULL; talloc_steal(node, data.dptr); @@ -2756,7 +2762,7 @@ static void set_quota(const char *arg, bool soft) /* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ const char *const trace_switches[] = { - "obj", "io", "wrl", "acc", + "obj", "io", "wrl", "acc", "tdb", NULL }; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 3e0734a6c6..5a11dc1231 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -303,9 +303,16 @@ extern unsigned int trace_flags; #define TRACE_IO 0x00000002 #define TRACE_WRL 0x00000004 #define TRACE_ACC 0x00000008 +#define TRACE_TDB 0x00000010 extern const char *const trace_switches[]; int set_trace_switch(const char *arg); +#define trace_tdb(...) \ +do { \ + if (trace_flags & TRACE_TDB) \ + trace("tdb: " __VA_ARGS__); \ +} while (0) + extern TDB_CONTEXT *tdb_ctx; extern int dom0_domid; extern int dom0_event; diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 2b15506953..11c8bcec84 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -374,8 +374,11 @@ static int finalize_transaction(struct connection *conn, if (tdb_error(tdb_ctx) != TDB_ERR_NOEXIST) return EIO; gen = NO_GENERATION; - } else + } else { + trace_tdb("read %s size %zu\n", key.dptr, + key.dsize + data.dsize); gen = hdr->generation; + } talloc_free(data.dptr); if (i->generation != gen) return EAGAIN; @@ -399,6 +402,8 @@ static int finalize_transaction(struct connection *conn, set_tdb_key(i->trans_name, &ta_key); data = tdb_fetch(tdb_ctx, ta_key); if (data.dptr) { + trace_tdb("read %s size %zu\n", ta_key.dptr, + ta_key.dsize + data.dsize); hdr = (void *)data.dptr; hdr->generation = ++generation; *is_corrupt |= do_tdb_write(conn, &key, &data, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:03:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:03:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546441.853329 (Exim 4.92) (envelope-from ) id 1q7tZP-0006dx-UG; Sat, 10 Jun 2023 08:03:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546441.853329; Sat, 10 Jun 2023 08:03:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZP-0006dq-Re; Sat, 10 Jun 2023 08:03:35 +0000 Received: by outflank-mailman (input) for mailman id 546441; Sat, 10 Jun 2023 08:03:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZO-0006dX-M9 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZO-0005JS-LQ for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tZO-0002EF-Kg for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zegKnEeH84x0Ei2x6cUT6oLSb0+NQ8fbpP5cNHnKWBI=; b=bMihNEXryiQAqye29MLzsH57Tl fDJRj7rQ5q9y9POMppjPoFNqRkp3cbFnKCMUXJASoOB6cyzM1uQWwI2PLxKQY6kOSRw+zo3obfGJ3 2DXpiePtjszGyCCQuPxuw9ip/7Ed/izTu89zIHmFrjJ/HIdg8RdRymHhSk0VMPgvt58g=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: switch transaction accounting to generic accounting Message-Id: Date: Sat, 10 Jun 2023 08:03:34 +0000 commit 304ed13b9aa992333db25e5a2ffa43d072c5fbdd Author: Juergen Gross AuthorDate: Tue May 30 10:24:20 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: switch transaction accounting to generic accounting As transaction accounting is active for unprivileged domains only, it can easily be added to the generic per-domain accounting. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 3 +-- tools/xenstore/xenstored_core.h | 1 - tools/xenstore/xenstored_domain.c | 21 ++++++++++++++++++--- tools/xenstore/xenstored_domain.h | 4 ++++ tools/xenstore/xenstored_transaction.c | 15 +++++++-------- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 069c03d4b0..3343f939b4 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2093,7 +2093,7 @@ static void consider_message(struct connection *conn) * stalled. This will ignore new requests until Live-Update happened * or it was aborted. */ - if (lu_is_pending() && conn->transaction_started == 0 && + if (lu_is_pending() && list_empty(&conn->transaction_list) && conn->in->hdr.msg.type == XS_TRANSACTION_START) { trace("Delaying transaction start for connection %p req_id %u\n", conn, conn->in->hdr.msg.req_id); @@ -2200,7 +2200,6 @@ struct connection *new_connection(const struct interface_funcs *funcs) new->funcs = funcs; new->is_ignored = false; new->is_stalled = false; - new->transaction_started = 0; INIT_LIST_HEAD(&new->out_list); INIT_LIST_HEAD(&new->acc_list); INIT_LIST_HEAD(&new->ref_list); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 5a11dc1231..3564d85d7d 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -151,7 +151,6 @@ struct connection /* List of in-progress transactions. */ struct list_head transaction_list; uint32_t next_transaction_id; - unsigned int transaction_started; time_t ta_start_time; /* List of delayed requests. */ diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 6523c3a830..05747944e5 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -416,12 +416,10 @@ int domain_get_quota(const void *ctx, struct connection *conn, { struct domain *d = find_domain_struct(domid); char *resp; - int ta; if (!d) return ENOENT; - ta = d->conn ? d->conn->transaction_started : 0; resp = talloc_asprintf(ctx, "Domain %u:\n", domid); if (!resp) return ENOMEM; @@ -432,7 +430,7 @@ int domain_get_quota(const void *ctx, struct connection *conn, ent(nodes, d->acc[ACC_NODES]); ent(watches, d->acc[ACC_WATCH]); - ent(transactions, ta); + ent(transactions, d->acc[ACC_TRANS]); ent(outstanding, d->acc[ACC_OUTST]); ent(memory, d->acc[ACC_MEM]); @@ -1297,6 +1295,23 @@ void domain_outstanding_dec(struct connection *conn, unsigned int domid) domain_acc_add(conn, domid, ACC_OUTST, -1, true); } +void domain_transaction_inc(struct connection *conn) +{ + domain_acc_add(conn, conn->id, ACC_TRANS, 1, true); +} + +void domain_transaction_dec(struct connection *conn) +{ + domain_acc_add(conn, conn->id, ACC_TRANS, -1, true); +} + +unsigned int domain_transaction_get(struct connection *conn) +{ + return (domain_is_unprivileged(conn)) + ? domain_acc_add(conn, conn->id, ACC_TRANS, 0, true) + : 0; +} + static wrl_creditt wrl_config_writecost = WRL_FACTOR; static wrl_creditt wrl_config_rate = WRL_RATE * WRL_FACTOR; static wrl_creditt wrl_config_dburst = WRL_DBURST * WRL_FACTOR; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 086133407b..01b6f1861b 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -32,6 +32,7 @@ enum accitem { ACC_WATCH = ACC_TR_N, ACC_OUTST, ACC_MEM, + ACC_TRANS, ACC_N, /* Number of elements per domain. */ }; @@ -113,6 +114,9 @@ void domain_watch_dec(struct connection *conn); int domain_watch(struct connection *conn); void domain_outstanding_inc(struct connection *conn); void domain_outstanding_dec(struct connection *conn, unsigned int domid); +void domain_transaction_inc(struct connection *conn); +void domain_transaction_dec(struct connection *conn); +unsigned int domain_transaction_get(struct connection *conn); int domain_get_quota(const void *ctx, struct connection *conn, unsigned int domid); diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 11c8bcec84..9cfb0017c8 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -479,8 +479,7 @@ int do_transaction_start(const void *ctx, struct connection *conn, if (conn->transaction) return EBUSY; - if (domain_is_unprivileged(conn) && - conn->transaction_started > quota_max_transaction) + if (domain_transaction_get(conn) > quota_max_transaction) return ENOSPC; /* Attach transaction to ctx for autofree until it's complete */ @@ -501,13 +500,14 @@ int do_transaction_start(const void *ctx, struct connection *conn, exists = transaction_lookup(conn, conn->next_transaction_id++); } while (!IS_ERR(exists)); + if (list_empty(&conn->transaction_list)) + conn->ta_start_time = time(NULL); + /* Now we own it. */ list_add_tail(&trans->list, &conn->transaction_list); talloc_steal(conn, trans); talloc_set_destructor(trans, destroy_transaction); - if (!conn->transaction_started) - conn->ta_start_time = time(NULL); - conn->transaction_started++; + domain_transaction_inc(conn); wrl_ntransactions++; snprintf(id_str, sizeof(id_str), "%u", trans->id); @@ -533,8 +533,8 @@ int do_transaction_end(const void *ctx, struct connection *conn, conn->transaction = NULL; list_del(&trans->list); - conn->transaction_started--; - if (!conn->transaction_started) + domain_transaction_dec(conn); + if (list_empty(&conn->transaction_list)) conn->ta_start_time = 0; chk_quota = trans->node_created && domain_is_unprivileged(conn); @@ -588,7 +588,6 @@ void conn_delete_all_transactions(struct connection *conn) assert(conn->transaction == NULL); - conn->transaction_started = 0; conn->ta_start_time = 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:03:46 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:03:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546442.853334 (Exim 4.92) (envelope-from ) id 1q7tZa-0006ge-0F; Sat, 10 Jun 2023 08:03:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546442.853334; Sat, 10 Jun 2023 08:03:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZZ-0006gX-TK; Sat, 10 Jun 2023 08:03:45 +0000 Received: by outflank-mailman (input) for mailman id 546442; Sat, 10 Jun 2023 08:03:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZY-0006gB-PS for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZY-0005Js-Oi for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tZY-0002Er-Nz for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GFZCeAjg2PFRB7PkFZWrIkg/Zf3H7fOA8RkPBRi+KL4=; b=1ylKuIRAnzWnUz8b1oJA7Bd030 v8vJYXmtmqDC7+zKc36gYRuYyX/ZpWi7Uh0VqtuUyTk9YNef38WrhEeyBGZ/NqUVDmGs/TpUB0DZc a2WhG6npvGK8OnCa/YLJf7L37aLVLpxbZ+zK0vq/ZECAnnKD+L8WTdhZutnJw4C4aUBc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remember global and per domain max accounting values Message-Id: Date: Sat, 10 Jun 2023 08:03:44 +0000 commit 948be0e94d911f979a925b4f2d3b1660e0890653 Author: Juergen Gross AuthorDate: Tue May 30 10:24:21 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: remember global and per domain max accounting values Add saving the maximum values of the different accounting data seen per domain and (for unprivileged domains) globally, and print those values via the xenstore-control quota command. Add a sub-command for resetting the global maximum values seen. This should help for a decision how to set the related quotas. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- docs/misc/xenstore.txt | 5 +- tools/xenstore/xenstored_control.c | 22 +++++++- tools/xenstore/xenstored_domain.c | 100 ++++++++++++++++++++++++++++++------- tools/xenstore/xenstored_domain.h | 2 + 4 files changed, 108 insertions(+), 21 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index d807ef0709..38015835b1 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -426,7 +426,7 @@ CONTROL |[|] print| print to syslog (xenstore runs as daemon) or to console (xenstore runs as stubdom) - quota|[set |] + quota|[set ||max [-r]] without parameters: print the current quota settings with "set ": set the quota to new value (The admin should make sure all the domain usage is @@ -435,6 +435,9 @@ CONTROL |[|] violating the new quota setting isn't increased further) with "": print quota related accounting data for the domain + with "max [-r]": show global per-domain maximum values of all + unprivileged domains, optionally reset the values by adding + "-r" quota-soft|[set ] like the "quota" command, but for soft-quota. help diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 403295788a..620a7da997 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -306,6 +306,22 @@ static int quota_get(const void *ctx, struct connection *conn, return domain_get_quota(ctx, conn, atoi(vec[0])); } +static int quota_max(const void *ctx, struct connection *conn, + char **vec, int num) +{ + if (num > 1) + return EINVAL; + + if (num == 1) { + if (!strcmp(vec[0], "-r")) + domain_reset_global_acc(); + else + return EINVAL; + } + + return domain_max_global_acc(ctx, conn); +} + static int do_control_quota(const void *ctx, struct connection *conn, char **vec, int num) { @@ -315,6 +331,9 @@ static int do_control_quota(const void *ctx, struct connection *conn, if (!strcmp(vec[0], "set")) return quota_set(ctx, conn, vec + 1, num - 1, hard_quotas); + if (!strcmp(vec[0], "max")) + return quota_max(ctx, conn, vec + 1, num - 1); + return quota_get(ctx, conn, vec, num); } @@ -978,7 +997,8 @@ static struct cmd_s cmds[] = { { "memreport", do_control_memreport, "[]" }, #endif { "print", do_control_print, "" }, - { "quota", do_control_quota, "[set |]" }, + { "quota", do_control_quota, + "[set ||max [-r]]" }, { "quota-soft", do_control_quota_s, "[set ]" }, { "help", do_control_help, "" }, }; diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 05747944e5..de723ce0fe 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -43,6 +43,8 @@ static evtchn_port_t virq_port; xenevtchn_handle *xce_handle = NULL; +static unsigned int acc_global_max[ACC_N]; + struct domain { /* The id of this domain */ @@ -70,7 +72,10 @@ struct domain bool introduced; /* Accounting data for this domain. */ - unsigned int acc[ACC_N]; + struct acc { + unsigned int val; + unsigned int max; + } acc[ACC_N]; /* Memory quota data for this domain. */ bool soft_quota_reported; @@ -199,9 +204,9 @@ static bool domain_can_read(struct connection *conn) if (domain_is_unprivileged(conn)) { if (domain->wrl_credit < 0) return false; - if (domain->acc[ACC_OUTST] >= quota_req_outstanding) + if (domain->acc[ACC_OUTST].val >= quota_req_outstanding) return false; - if (domain->acc[ACC_MEM] >= quota_memory_per_domain_hard && + if (domain->acc[ACC_MEM].val >= quota_memory_per_domain_hard && quota_memory_per_domain_hard) return false; } @@ -264,7 +269,7 @@ static int domain_tree_remove_sub(const void *ctx, struct connection *conn, ret = WALK_TREE_SKIP_CHILDREN; } - return domain->acc[ACC_NODES] ? ret : WALK_TREE_SUCCESS_STOP; + return domain->acc[ACC_NODES].val ? ret : WALK_TREE_SUCCESS_STOP; } static void domain_tree_remove(struct domain *domain) @@ -272,7 +277,7 @@ static void domain_tree_remove(struct domain *domain) int ret; struct walk_funcs walkfuncs = { .enter = domain_tree_remove_sub }; - if (domain->acc[ACC_NODES]) { + if (domain->acc[ACC_NODES].val) { ret = walk_node_tree(domain, NULL, "/", &walkfuncs, domain); if (ret == WALK_TREE_ERROR_STOP) syslog(LOG_ERR, @@ -425,14 +430,41 @@ int domain_get_quota(const void *ctx, struct connection *conn, return ENOMEM; #define ent(t, e) \ - resp = talloc_asprintf_append(resp, "%-16s: %8d\n", #t, e); \ + resp = talloc_asprintf_append(resp, "%-16s: %8u (max: %8u\n", #t, \ + d->acc[e].val, d->acc[e].max); \ + if (!resp) return ENOMEM + + ent(nodes, ACC_NODES); + ent(watches, ACC_WATCH); + ent(transactions, ACC_TRANS); + ent(outstanding, ACC_OUTST); + ent(memory, ACC_MEM); + +#undef ent + + send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); + + return 0; +} + +int domain_max_global_acc(const void *ctx, struct connection *conn) +{ + char *resp; + + resp = talloc_asprintf(ctx, "Max. seen accounting values:\n"); + if (!resp) + return ENOMEM; + +#define ent(t, e) \ + resp = talloc_asprintf_append(resp, "%-16s: %8u\n", #t, \ + acc_global_max[e]); \ if (!resp) return ENOMEM - ent(nodes, d->acc[ACC_NODES]); - ent(watches, d->acc[ACC_WATCH]); - ent(transactions, d->acc[ACC_TRANS]); - ent(outstanding, d->acc[ACC_OUTST]); - ent(memory, d->acc[ACC_MEM]); + ent(nodes, ACC_NODES); + ent(watches, ACC_WATCH); + ent(transactions, ACC_TRANS); + ent(outstanding, ACC_OUTST); + ent(memory, ACC_MEM); #undef ent @@ -1048,10 +1080,12 @@ int domain_adjust_node_perms(struct node *node) static int domain_acc_add_valid(struct domain *d, enum accitem what, int add) { + unsigned int val; + assert(what < ARRAY_SIZE(d->acc)); - if ((add < 0 && -add > d->acc[what]) || - (add > 0 && (INT_MAX - d->acc[what]) < add)) { + if ((add < 0 && -add > d->acc[what].val) || + (add > 0 && (INT_MAX - d->acc[what].val) < add)) { /* * In a transaction when a node is being added/removed AND the * same node has been added/removed outside the transaction in @@ -1062,7 +1096,13 @@ static int domain_acc_add_valid(struct domain *d, enum accitem what, int add) return (add < 0) ? 0 : INT_MAX; } - return d->acc[what] + add; + val = d->acc[what].val + add; + if (val > d->acc[what].max) + d->acc[what].max = val; + if (val > acc_global_max[what] && domid_is_unprivileged(d->domid)) + acc_global_max[what] = val; + + return val; } static int domain_acc_add(struct connection *conn, unsigned int domid, @@ -1118,10 +1158,10 @@ static int domain_acc_add(struct connection *conn, unsigned int domid, } trace_acc("global change domid %u: what=%u %u add %d\n", domid, what, - d->acc[what], add); - d->acc[what] = domain_acc_add_valid(d, what, add); + d->acc[what].val, add); + d->acc[what].val = domain_acc_add_valid(d, what, add); - return d->acc[what]; + return d->acc[what].val; } void acc_drop(struct connection *conn) @@ -1159,6 +1199,28 @@ void acc_commit(struct connection *conn) conn->in = in; } +static int domain_reset_global_acc_sub(const void *k, void *v, void *arg) +{ + struct domain *d = v; + unsigned int i; + + for (i = 0; i < ACC_N; i++) + d->acc[i].max = d->acc[i].val; + + return 0; +} + +void domain_reset_global_acc(void) +{ + unsigned int i; + + for (i = 0; i < ACC_N; i++) + acc_global_max[i] = 0; + + /* Set current max values seen. */ + hashtable_iterate(domhash, domain_reset_global_acc_sub, NULL); +} + int domain_nbentry_inc(struct connection *conn, unsigned int domid) { return (domain_acc_add(conn, domid, ACC_NODES, 1, false) < 0) @@ -1659,7 +1721,7 @@ static int domain_check_acc_init_sub(const void *k, void *v, void *arg) * If everything is correct incrementing the value for each node will * result in dom->nodes being 0 at the end. */ - dom->nodes = -d->acc[ACC_NODES]; + dom->nodes = -d->acc[ACC_NODES].val; if (!hashtable_insert(domains, &dom->domid, dom)) { talloc_free(dom); @@ -1714,7 +1776,7 @@ static int domain_check_acc_cb(const void *k, void *v, void *arg) if (!d) return 0; - d->acc[ACC_NODES] += dom->nodes; + d->acc[ACC_NODES].val += dom->nodes; return 0; } diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 01b6f1861b..416df25cb2 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -127,6 +127,8 @@ int domain_get_quota(const void *ctx, struct connection *conn, int acc_fix_domains(struct list_head *head, bool chk_quota, bool update); void acc_drop(struct connection *conn); void acc_commit(struct connection *conn); +int domain_max_global_acc(const void *ctx, struct connection *conn); +void domain_reset_global_acc(void); /* Write rate limiting */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:03:57 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:03:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546443.853337 (Exim 4.92) (envelope-from ) id 1q7tZl-0006iw-2E; Sat, 10 Jun 2023 08:03:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546443.853337; Sat, 10 Jun 2023 08:03:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZk-0006ip-VY; Sat, 10 Jun 2023 08:03:56 +0000 Received: by outflank-mailman (input) for mailman id 546443; Sat, 10 Jun 2023 08:03:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZi-0006iY-Sj for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZi-0005K5-Rt for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tZi-0002FK-R9 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:03:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EKmEXAMcia/0eF0H4KESRAmzJTpV8X52Mm3ygNLstmk=; b=3mSem0N5qfvnbHVtlRZb/13wXQ IdTE4nQx2V5Uyh5rEfzvX5wlW4Sz/qzXXlcJVf1XdelWHx7G3xrV0fD+dBrOOrQa5nR46WKrHlC+m Pswtpoqbw6IOb1M63bmoAxiKIAht8bQgd6o5IwVX0igz+d6JDt9XMvNmQpHVuGdBZGEE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: use generic accounting for remaining quotas Message-Id: Date: Sat, 10 Jun 2023 08:03:54 +0000 commit 564a093c203de787d275bff59730226b25cbe2f8 Author: Juergen Gross AuthorDate: Tue May 30 10:24:22 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: use generic accounting for remaining quotas The maxrequests, node size, number of node permissions, and path length quota are a little bit special, as they are either active in transactions only (maxrequests), or they are just per item instead of count values. Nevertheless being able to know the maximum number of those quota related values per domain would be beneficial, so add them to the generic accounting. The per domain value will never show current numbers other than zero, but the maximum number seen can be gathered the same way as the number of nodes during a transaction. To be able to use the const qualifier for a new function switch domain_is_unprivileged() to take a const pointer, too. For printing the quota/max values, adapt the print format string to the longest quota name (now 17 characters long). Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 15 ++++++------ tools/xenstore/xenstored_core.h | 2 +- tools/xenstore/xenstored_domain.c | 43 +++++++++++++++++++++++++++++----- tools/xenstore/xenstored_domain.h | 6 +++++ tools/xenstore/xenstored_transaction.c | 4 ++-- tools/xenstore/xenstored_watch.c | 2 +- 6 files changed, 55 insertions(+), 17 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 3343f939b4..dd00f74cb6 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -799,8 +799,9 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, + node->perms.num * sizeof(node->perms.p[0]) + node->datalen + node->childlen; - if (!no_quota_check && domain_is_unprivileged(conn) && - data.dsize >= quota_max_entry_size) { + /* Call domain_max_chk() in any case in order to record max values. */ + if (domain_max_chk(conn, ACC_NODESZ, data.dsize, quota_max_entry_size) + && !no_quota_check) { errno = ENOSPC; return errno; } @@ -1170,7 +1171,7 @@ static bool valid_chars(const char *node) "0123456789-/_@") == strlen(node)); } -bool is_valid_nodename(const char *node) +bool is_valid_nodename(const struct connection *conn, const char *node) { int local_off = 0; unsigned int domid; @@ -1190,7 +1191,8 @@ bool is_valid_nodename(const char *node) if (sscanf(node, "/local/domain/%5u/%n", &domid, &local_off) != 1) local_off = 0; - if (strlen(node) > local_off + quota_max_path_len) + if (domain_max_chk(conn, ACC_PATHLEN, strlen(node) - local_off, + quota_max_path_len)) return false; return valid_chars(node); @@ -1252,7 +1254,7 @@ static struct node *get_node_canonicalized(struct connection *conn, *canonical_name = canonicalize(conn, ctx, name); if (!*canonical_name) return NULL; - if (!is_valid_nodename(*canonical_name)) { + if (!is_valid_nodename(conn, *canonical_name)) { errno = EINVAL; return NULL; } @@ -1784,8 +1786,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, return EINVAL; perms.num--; - if (domain_is_unprivileged(conn) && - perms.num > quota_nb_perms_per_node) + if (domain_max_chk(conn, ACC_NPERM, perms.num, quota_nb_perms_per_node)) return ENOSPC; permstr = in->buffer + strlen(in->buffer) + 1; diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 3564d85d7d..9339820156 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -258,7 +258,7 @@ void check_store(void); void corrupt(struct connection *conn, const char *fmt, ...); /* Is this a valid node name? */ -bool is_valid_nodename(const char *node); +bool is_valid_nodename(const struct connection *conn, const char *node); /* Get name of parent node. */ char *get_parent(const void *ctx, const char *node); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index de723ce0fe..ebd56928ed 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -430,7 +430,7 @@ int domain_get_quota(const void *ctx, struct connection *conn, return ENOMEM; #define ent(t, e) \ - resp = talloc_asprintf_append(resp, "%-16s: %8u (max: %8u\n", #t, \ + resp = talloc_asprintf_append(resp, "%-17s: %8u (max: %8u\n", #t, \ d->acc[e].val, d->acc[e].max); \ if (!resp) return ENOMEM @@ -439,6 +439,10 @@ int domain_get_quota(const void *ctx, struct connection *conn, ent(transactions, ACC_TRANS); ent(outstanding, ACC_OUTST); ent(memory, ACC_MEM); + ent(transaction-nodes, ACC_TRANSNODES); + ent(node-permissions, ACC_NPERM); + ent(path-length, ACC_PATHLEN); + ent(node-size, ACC_NODESZ); #undef ent @@ -456,7 +460,7 @@ int domain_max_global_acc(const void *ctx, struct connection *conn) return ENOMEM; #define ent(t, e) \ - resp = talloc_asprintf_append(resp, "%-16s: %8u\n", #t, \ + resp = talloc_asprintf_append(resp, "%-17s: %8u\n", #t, \ acc_global_max[e]); \ if (!resp) return ENOMEM @@ -465,6 +469,10 @@ int domain_max_global_acc(const void *ctx, struct connection *conn) ent(transactions, ACC_TRANS); ent(outstanding, ACC_OUTST); ent(memory, ACC_MEM); + ent(transaction-nodes, ACC_TRANSNODES); + ent(node-permissions, ACC_NPERM); + ent(path-length, ACC_PATHLEN); + ent(node-size, ACC_NODESZ); #undef ent @@ -1078,6 +1086,18 @@ int domain_adjust_node_perms(struct node *node) return 0; } +static void domain_acc_valid_max(struct domain *d, enum accitem what, + unsigned int val) +{ + assert(what < ARRAY_SIZE(d->acc)); + assert(what < ARRAY_SIZE(acc_global_max)); + + if (val > d->acc[what].max) + d->acc[what].max = val; + if (val > acc_global_max[what] && domid_is_unprivileged(d->domid)) + acc_global_max[what] = val; +} + static int domain_acc_add_valid(struct domain *d, enum accitem what, int add) { unsigned int val; @@ -1097,10 +1117,7 @@ static int domain_acc_add_valid(struct domain *d, enum accitem what, int add) } val = d->acc[what].val + add; - if (val > d->acc[what].max) - d->acc[what].max = val; - if (val > acc_global_max[what] && domid_is_unprivileged(d->domid)) - acc_global_max[what] = val; + domain_acc_valid_max(d, what, val); return val; } @@ -1221,6 +1238,20 @@ void domain_reset_global_acc(void) hashtable_iterate(domhash, domain_reset_global_acc_sub, NULL); } +bool domain_max_chk(const struct connection *conn, enum accitem what, + unsigned int val, unsigned int quota) +{ + if (!conn || !conn->domain) + return false; + + if (domain_is_unprivileged(conn) && val > quota) + return true; + + domain_acc_valid_max(conn->domain, what, val); + + return false; +} + int domain_nbentry_inc(struct connection *conn, unsigned int domid) { return (domain_acc_add(conn, domid, ACC_NODES, 1, false) < 0) diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 416df25cb2..78ca434531 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -33,6 +33,10 @@ enum accitem { ACC_OUTST, ACC_MEM, ACC_TRANS, + ACC_TRANSNODES, + ACC_NPERM, + ACC_PATHLEN, + ACC_NODESZ, ACC_N, /* Number of elements per domain. */ }; @@ -129,6 +133,8 @@ void acc_drop(struct connection *conn); void acc_commit(struct connection *conn); int domain_max_global_acc(const void *ctx, struct connection *conn); void domain_reset_global_acc(void); +bool domain_max_chk(const struct connection *conn, unsigned int what, + unsigned int val, unsigned int quota); /* Write rate limiting */ diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 9cfb0017c8..580d7bd090 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -252,8 +252,8 @@ int access_node(struct connection *conn, struct node *node, i = find_accessed_node(trans, node->name); if (!i) { - if (trans->nodes >= quota_trans_nodes && - domain_is_unprivileged(conn)) { + if (domain_max_chk(conn, ACC_TRANSNODES, trans->nodes + 1, + quota_trans_nodes)) { ret = ENOSPC; goto err; } diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index e30cd89be3..61b1e3421e 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -176,7 +176,7 @@ static int check_watch_path(struct connection *conn, const void *ctx, *path = canonicalize(conn, ctx, *path); if (!*path) return errno; - if (!is_valid_nodename(*path)) + if (!is_valid_nodename(conn, *path)) goto inval; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:04:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:04:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546445.853342 (Exim 4.92) (envelope-from ) id 1q7tZu-0006m5-7d; Sat, 10 Jun 2023 08:04:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546445.853342; Sat, 10 Jun 2023 08:04:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZu-0006ly-3h; Sat, 10 Jun 2023 08:04:06 +0000 Received: by outflank-mailman (input) for mailman id 546445; Sat, 10 Jun 2023 08:04:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZs-0006lp-Vj for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tZs-0005KS-Uw for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tZs-0002Fy-UC for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XUzPzRYOXMbw1IgweD+o1CRVq240R6KLqnVJ9pB12h8=; b=p22DTMEcTJgaCAZ2a7opNRADwf okExvQ1A6C8qg9rPQGnB8PkIo9gYyklZMBhBZyRlpDdbn1SVTnCGkkvXFhSMJLmVnYAX6iNQozGBG g8Sdp6uwyuuNxGiPCsMtes5klYcSoawFm2OGYRJObNyc280nziTnF0v+KZLJx/0shlnU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: switch get_optval_int() to get_optval_uint() Message-Id: Date: Sat, 10 Jun 2023 08:04:04 +0000 commit 561687f6bc3533e663f6f953a7d9cde5c0a130da Author: Juergen Gross AuthorDate: Tue May 30 10:24:23 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: switch get_optval_int() to get_optval_uint() Let get_optval_int() return an unsigned value and rename it accordingly. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/xenstored_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index dd00f74cb6..0a350dd6f8 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2706,13 +2706,13 @@ int dom0_domid = 0; int dom0_event = 0; int priv_domid = 0; -static int get_optval_int(const char *arg) +static unsigned int get_optval_uint(const char *arg) { char *end; - long val; + unsigned long val; - val = strtol(arg, &end, 10); - if (!*arg || *end || val < 0 || val > INT_MAX) + val = strtoul(arg, &end, 10); + if (!*arg || *end || val > INT_MAX) barf("invalid parameter value \"%s\"\n", arg); return val; @@ -2732,7 +2732,7 @@ static void set_timeout(const char *arg) if (!eq) barf("quotas must be specified via =\n"); - val = get_optval_int(eq + 1); + val = get_optval_uint(eq + 1); if (what_matches(arg, "watch-event")) timeout_watch_event_msec = val * 1000; else @@ -2746,7 +2746,7 @@ static void set_quota(const char *arg, bool soft) if (!eq) barf("quotas must be specified via =\n"); - val = get_optval_int(eq + 1); + val = get_optval_uint(eq + 1); if (what_matches(arg, "outstanding") && !soft) quota_req_outstanding = val; else if (what_matches(arg, "transaction-nodes") && !soft) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:04:16 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:04:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546446.853345 (Exim 4.92) (envelope-from ) id 1q7ta4-0006pC-93; Sat, 10 Jun 2023 08:04:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546446.853345; Sat, 10 Jun 2023 08:04:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7ta4-0006p3-5y; Sat, 10 Jun 2023 08:04:16 +0000 Received: by outflank-mailman (input) for mailman id 546446; Sat, 10 Jun 2023 08:04:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7ta3-0006on-2f for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7ta3-0005KZ-1w for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7ta3-0002Gl-1B for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=t/hdb/kbSotK2ZeZ6ZcQSlFcg3uw2Y7FvUgE7B8onPE=; b=h3uEJQ8jSmiLG4r6e7nRVJ4YSk gHZcWytuH71ZrZWR5uqsfXzsmTaC2pYkI0jq8Ml80mhx3Jlt1W0GDj8F2pUQMrEV6mNCKez1u5DHF OQnXIu21nNgnomsQaKc1dK3Z9J+W7hztJ74Qzp8Uqh0VGOP6AM/mzMi0j9JDAudoSVp0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: switch quota management to be table based Message-Id: Date: Sat, 10 Jun 2023 08:04:15 +0000 commit 685048441e1cd935b622bba47d3ca612e75b4ef6 Author: Juergen Gross AuthorDate: Tue May 30 10:24:24 2023 +0200 Commit: Julien Grall CommitDate: Wed Jun 7 12:10:31 2023 +0100 tools/xenstore: switch quota management to be table based Instead of having individual quota variables switch to a table based approach like the generic accounting. Include all the related data in the same table and add accessor functions. This enables to use the command line --quota parameter for setting all possible quota values, keeping the previous parameters for compatibility. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_control.c | 43 ++-------- tools/xenstore/xenstored_core.c | 81 +++++++++---------- tools/xenstore/xenstored_core.h | 10 --- tools/xenstore/xenstored_domain.c | 138 +++++++++++++++++++++------------ tools/xenstore/xenstored_domain.h | 12 ++- tools/xenstore/xenstored_transaction.c | 5 +- tools/xenstore/xenstored_watch.c | 2 +- 7 files changed, 153 insertions(+), 138 deletions(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 620a7da997..ed80924ee4 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -221,35 +221,6 @@ static int do_control_log(const void *ctx, struct connection *conn, return 0; } -struct quota { - const char *name; - int *quota; - const char *descr; -}; - -static const struct quota hard_quotas[] = { - { "nodes", "a_nb_entry_per_domain, "Nodes per domain" }, - { "watches", "a_nb_watch_per_domain, "Watches per domain" }, - { "transactions", "a_max_transaction, "Transactions per domain" }, - { "outstanding", "a_req_outstanding, - "Outstanding requests per domain" }, - { "transaction-nodes", "a_trans_nodes, - "Max. number of accessed nodes per transaction" }, - { "memory", "a_memory_per_domain_hard, - "Total Xenstore memory per domain (error level)" }, - { "node-size", "a_max_entry_size, "Max. size of a node" }, - { "path-max", "a_max_path_len, "Max. length of a node path" }, - { "permissions", "a_nb_perms_per_node, - "Max. number of permissions per node" }, - { NULL, NULL, NULL } -}; - -static const struct quota soft_quotas[] = { - { "memory", "a_memory_per_domain_soft, - "Total Xenstore memory per domain (warning level)" }, - { NULL, NULL, NULL } -}; - static int quota_show_current(const void *ctx, struct connection *conn, const struct quota *quotas) { @@ -260,9 +231,11 @@ static int quota_show_current(const void *ctx, struct connection *conn, if (!resp) return ENOMEM; - for (i = 0; quotas[i].quota; i++) { + for (i = 0; i < ACC_N; i++) { + if (!quotas[i].name) + continue; resp = talloc_asprintf_append(resp, "%-17s: %8d %s\n", - quotas[i].name, *quotas[i].quota, + quotas[i].name, quotas[i].val, quotas[i].descr); if (!resp) return ENOMEM; @@ -274,7 +247,7 @@ static int quota_show_current(const void *ctx, struct connection *conn, } static int quota_set(const void *ctx, struct connection *conn, - char **vec, int num, const struct quota *quotas) + char **vec, int num, struct quota *quotas) { unsigned int i; int val; @@ -286,9 +259,9 @@ static int quota_set(const void *ctx, struct connection *conn, if (val < 1) return EINVAL; - for (i = 0; quotas[i].quota; i++) { - if (!strcmp(vec[0], quotas[i].name)) { - *quotas[i].quota = val; + for (i = 0; i < ACC_N; i++) { + if (quotas[i].name && !strcmp(vec[0], quotas[i].name)) { + quotas[i].val = val; send_ack(conn, XS_CONTROL); return 0; } diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 0a350dd6f8..6f03f6687a 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -89,17 +89,6 @@ unsigned int trace_flags = TRACE_OBJ | TRACE_IO; static const char *sockmsg_string(enum xsd_sockmsg_type type); -int quota_nb_entry_per_domain = 1000; -int quota_nb_watch_per_domain = 128; -int quota_max_entry_size = 2048; /* 2K */ -int quota_max_transaction = 10; -int quota_nb_perms_per_node = 5; -int quota_trans_nodes = 1024; -int quota_max_path_len = XENSTORE_REL_PATH_MAX; -int quota_req_outstanding = 20; -int quota_memory_per_domain_soft = 2 * 1024 * 1024; /* 2 MB */ -int quota_memory_per_domain_hard = 2 * 1024 * 1024 + 512 * 1024; /* 2.5 MB */ - unsigned int timeout_watch_event_msec = 20000; void trace(const char *fmt, ...) @@ -800,8 +789,7 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, struct node *node, + node->datalen + node->childlen; /* Call domain_max_chk() in any case in order to record max values. */ - if (domain_max_chk(conn, ACC_NODESZ, data.dsize, quota_max_entry_size) - && !no_quota_check) { + if (domain_max_chk(conn, ACC_NODESZ, data.dsize) && !no_quota_check) { errno = ENOSPC; return errno; } @@ -1191,8 +1179,7 @@ bool is_valid_nodename(const struct connection *conn, const char *node) if (sscanf(node, "/local/domain/%5u/%n", &domid, &local_off) != 1) local_off = 0; - if (domain_max_chk(conn, ACC_PATHLEN, strlen(node) - local_off, - quota_max_path_len)) + if (domain_max_chk(conn, ACC_PATHLEN, strlen(node) - local_off)) return false; return valid_chars(node); @@ -1504,7 +1491,7 @@ static struct node *create_node(struct connection *conn, const void *ctx, for (i = node; i; i = i->parent) { /* i->parent is set for each new node, so check quota. */ if (i->parent && - domain_nbentry(conn) >= quota_nb_entry_per_domain) { + domain_nbentry(conn) >= hard_quotas[ACC_NODES].val) { ret = ENOSPC; goto err; } @@ -1786,7 +1773,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, return EINVAL; perms.num--; - if (domain_max_chk(conn, ACC_NPERM, perms.num, quota_nb_perms_per_node)) + if (domain_max_chk(conn, ACC_NPERM, perms.num)) return ENOSPC; permstr = in->buffer + strlen(in->buffer) + 1; @@ -2655,7 +2642,16 @@ static void usage(void) " memory: total used memory per domain for nodes,\n" " transactions, watches and requests, above\n" " which Xenstore will stop talking to domain\n" +" nodes: number nodes owned by a domain\n" +" node-permissions: number of access permissions per\n" +" node\n" +" node-size: total size of a node (permissions +\n" +" children names + content)\n" " outstanding: number of outstanding requests\n" +" path-length: length of a node path\n" +" transactions: number of concurrent transactions\n" +" per domain\n" +" watches: number of watches per domain" " -q, --quota-soft = set a soft quota to the value ,\n" " causing a warning to be issued via syslog() if the\n" " limit is violated, allowed quotas are:\n" @@ -2720,7 +2716,12 @@ static unsigned int get_optval_uint(const char *arg) static bool what_matches(const char *arg, const char *what) { - unsigned int what_len = strlen(what); + unsigned int what_len; + + if (!what) + return false; + + what_len = strlen(what); return !strncmp(arg, what, what_len) && arg[what_len] == '='; } @@ -2728,7 +2729,7 @@ static bool what_matches(const char *arg, const char *what) static void set_timeout(const char *arg) { const char *eq = strchr(arg, '='); - int val; + unsigned int val; if (!eq) barf("quotas must be specified via =\n"); @@ -2742,22 +2743,22 @@ static void set_timeout(const char *arg) static void set_quota(const char *arg, bool soft) { const char *eq = strchr(arg, '='); - int val; + struct quota *q = soft ? soft_quotas : hard_quotas; + unsigned int val; + unsigned int i; if (!eq) barf("quotas must be specified via =\n"); val = get_optval_uint(eq + 1); - if (what_matches(arg, "outstanding") && !soft) - quota_req_outstanding = val; - else if (what_matches(arg, "transaction-nodes") && !soft) - quota_trans_nodes = val; - else if (what_matches(arg, "memory")) { - if (soft) - quota_memory_per_domain_soft = val; - else - quota_memory_per_domain_hard = val; - } else - barf("unknown quota \"%s\"\n", arg); + + for (i = 0; i < ACC_N; i++) { + if (what_matches(arg, q[i].name)) { + q[i].val = val; + return; + } + } + + barf("unknown quota \"%s\"\n", arg); } /* Sorted by bit values of TRACE_* flags. Flag is (1u << index). */ @@ -2819,7 +2820,7 @@ int main(int argc, char *argv[]) no_domain_init = true; break; case 'E': - quota_nb_entry_per_domain = strtol(optarg, NULL, 10); + hard_quotas[ACC_NODES].val = strtoul(optarg, NULL, 10); break; case 'F': pidfile = optarg; @@ -2837,10 +2838,10 @@ int main(int argc, char *argv[]) recovery = false; break; case 'S': - quota_max_entry_size = strtol(optarg, NULL, 10); + hard_quotas[ACC_NODESZ].val = strtoul(optarg, NULL, 10); break; case 't': - quota_max_transaction = strtol(optarg, NULL, 10); + hard_quotas[ACC_TRANS].val = strtoul(optarg, NULL, 10); break; case 'T': tracefile = optarg; @@ -2860,15 +2861,17 @@ int main(int argc, char *argv[]) verbose = true; break; case 'W': - quota_nb_watch_per_domain = strtol(optarg, NULL, 10); + hard_quotas[ACC_WATCH].val = strtoul(optarg, NULL, 10); break; case 'A': - quota_nb_perms_per_node = strtol(optarg, NULL, 10); + hard_quotas[ACC_NPERM].val = strtoul(optarg, NULL, 10); break; case 'M': - quota_max_path_len = strtol(optarg, NULL, 10); - quota_max_path_len = min(XENSTORE_REL_PATH_MAX, - quota_max_path_len); + hard_quotas[ACC_PATHLEN].val = + strtoul(optarg, NULL, 10); + hard_quotas[ACC_PATHLEN].val = + min((unsigned int)XENSTORE_REL_PATH_MAX, + hard_quotas[ACC_PATHLEN].val); break; case 'Q': set_quota(optarg, false); diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 9339820156..92d5b50f3c 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -316,16 +316,6 @@ extern TDB_CONTEXT *tdb_ctx; extern int dom0_domid; extern int dom0_event; extern int priv_domid; -extern int quota_nb_watch_per_domain; -extern int quota_max_transaction; -extern int quota_max_entry_size; -extern int quota_nb_perms_per_node; -extern int quota_max_path_len; -extern int quota_nb_entry_per_domain; -extern int quota_req_outstanding; -extern int quota_trans_nodes; -extern int quota_memory_per_domain_soft; -extern int quota_memory_per_domain_hard; extern bool keep_orphans; extern unsigned int timeout_watch_event_msec; diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index ebd56928ed..e284cf1cf1 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -43,7 +43,61 @@ static evtchn_port_t virq_port; xenevtchn_handle *xce_handle = NULL; -static unsigned int acc_global_max[ACC_N]; +struct quota hard_quotas[ACC_N] = { + [ACC_NODES] = { + .name = "nodes", + .descr = "Nodes per domain", + .val = 1000, + }, + [ACC_WATCH] = { + .name = "watches", + .descr = "Watches per domain", + .val = 128, + }, + [ACC_OUTST] = { + .name = "outstanding", + .descr = "Outstanding requests per domain", + .val = 20, + }, + [ACC_MEM] = { + .name = "memory", + .descr = "Total Xenstore memory per domain (error level)", + .val = 2 * 1024 * 1024 + 512 * 1024, /* 2.5 MB */ + }, + [ACC_TRANS] = { + .name = "transactions", + .descr = "Active transactions per domain", + .val = 10, + }, + [ACC_TRANSNODES] = { + .name = "transaction-nodes", + .descr = "Max. number of accessed nodes per transaction", + .val = 1024, + }, + [ACC_NPERM] = { + .name = "node-permissions", + .descr = "Max. number of permissions per node", + .val = 5, + }, + [ACC_PATHLEN] = { + .name = "path-max", + .descr = "Max. length of a node path", + .val = XENSTORE_REL_PATH_MAX, + }, + [ACC_NODESZ] = { + .name = "node-size", + .descr = "Max. size of a node", + .val = 2048, + }, +}; + +struct quota soft_quotas[ACC_N] = { + [ACC_MEM] = { + .name = "memory", + .descr = "Total Xenstore memory per domain (warning level)", + .val = 2 * 1024 * 1024, /* 2.0 MB */ + }, +}; struct domain { @@ -204,10 +258,10 @@ static bool domain_can_read(struct connection *conn) if (domain_is_unprivileged(conn)) { if (domain->wrl_credit < 0) return false; - if (domain->acc[ACC_OUTST].val >= quota_req_outstanding) + if (domain->acc[ACC_OUTST].val >= hard_quotas[ACC_OUTST].val) return false; - if (domain->acc[ACC_MEM].val >= quota_memory_per_domain_hard && - quota_memory_per_domain_hard) + if (domain->acc[ACC_MEM].val >= hard_quotas[ACC_MEM].val && + hard_quotas[ACC_MEM].val) return false; } @@ -421,6 +475,7 @@ int domain_get_quota(const void *ctx, struct connection *conn, { struct domain *d = find_domain_struct(domid); char *resp; + unsigned int i; if (!d) return ENOENT; @@ -429,22 +484,15 @@ int domain_get_quota(const void *ctx, struct connection *conn, if (!resp) return ENOMEM; -#define ent(t, e) \ - resp = talloc_asprintf_append(resp, "%-17s: %8u (max: %8u\n", #t, \ - d->acc[e].val, d->acc[e].max); \ - if (!resp) return ENOMEM - - ent(nodes, ACC_NODES); - ent(watches, ACC_WATCH); - ent(transactions, ACC_TRANS); - ent(outstanding, ACC_OUTST); - ent(memory, ACC_MEM); - ent(transaction-nodes, ACC_TRANSNODES); - ent(node-permissions, ACC_NPERM); - ent(path-length, ACC_PATHLEN); - ent(node-size, ACC_NODESZ); - -#undef ent + for (i = 0; i < ACC_N; i++) { + if (!hard_quotas[i].name) + continue; + resp = talloc_asprintf_append(resp, "%-17s: %8u (max %8u)\n", + hard_quotas[i].name, + d->acc[i].val, d->acc[i].max); + if (!resp) + return ENOMEM; + } send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); @@ -454,27 +502,21 @@ int domain_get_quota(const void *ctx, struct connection *conn, int domain_max_global_acc(const void *ctx, struct connection *conn) { char *resp; + unsigned int i; resp = talloc_asprintf(ctx, "Max. seen accounting values:\n"); if (!resp) return ENOMEM; -#define ent(t, e) \ - resp = talloc_asprintf_append(resp, "%-17s: %8u\n", #t, \ - acc_global_max[e]); \ - if (!resp) return ENOMEM - - ent(nodes, ACC_NODES); - ent(watches, ACC_WATCH); - ent(transactions, ACC_TRANS); - ent(outstanding, ACC_OUTST); - ent(memory, ACC_MEM); - ent(transaction-nodes, ACC_TRANSNODES); - ent(node-permissions, ACC_NPERM); - ent(path-length, ACC_PATHLEN); - ent(node-size, ACC_NODESZ); - -#undef ent + for (i = 0; i < ACC_N; i++) { + if (!hard_quotas[i].name) + continue; + resp = talloc_asprintf_append(resp, "%-17s: %8u\n", + hard_quotas[i].name, + hard_quotas[i].max); + if (!resp) + return ENOMEM; + } send_reply(conn, XS_CONTROL, resp, strlen(resp) + 1); @@ -589,7 +631,7 @@ int acc_fix_domains(struct list_head *head, bool chk_quota, bool update) list_for_each_entry(cd, head, list) { cnt = domain_nbentry_fix(cd->domid, cd->acc[ACC_NODES], update); if (!update) { - if (chk_quota && cnt >= quota_nb_entry_per_domain) + if (chk_quota && cnt >= hard_quotas[ACC_NODES].val) return ENOSPC; if (cnt < 0) return ENOMEM; @@ -1090,12 +1132,12 @@ static void domain_acc_valid_max(struct domain *d, enum accitem what, unsigned int val) { assert(what < ARRAY_SIZE(d->acc)); - assert(what < ARRAY_SIZE(acc_global_max)); + assert(what < ARRAY_SIZE(hard_quotas)); if (val > d->acc[what].max) d->acc[what].max = val; - if (val > acc_global_max[what] && domid_is_unprivileged(d->domid)) - acc_global_max[what] = val; + if (val > hard_quotas[what].max && domid_is_unprivileged(d->domid)) + hard_quotas[what].max = val; } static int domain_acc_add_valid(struct domain *d, enum accitem what, int add) @@ -1232,19 +1274,19 @@ void domain_reset_global_acc(void) unsigned int i; for (i = 0; i < ACC_N; i++) - acc_global_max[i] = 0; + hard_quotas[i].max = 0; /* Set current max values seen. */ hashtable_iterate(domhash, domain_reset_global_acc_sub, NULL); } bool domain_max_chk(const struct connection *conn, enum accitem what, - unsigned int val, unsigned int quota) + unsigned int val) { if (!conn || !conn->domain) return false; - if (domain_is_unprivileged(conn) && val > quota) + if (domain_is_unprivileged(conn) && val > hard_quotas[what].val) return true; domain_acc_valid_max(conn->domain, what, val); @@ -1293,8 +1335,7 @@ static bool domain_chk_quota(struct connection *conn, unsigned int mem) domain = conn->domain; now = time(NULL); - if (mem >= quota_memory_per_domain_hard && - quota_memory_per_domain_hard) { + if (mem >= hard_quotas[ACC_MEM].val && hard_quotas[ACC_MEM].val) { if (domain->hard_quota_reported) return true; syslog(LOG_ERR, "Domain %u exceeds hard memory quota, Xenstore interface to domain stalled\n", @@ -1311,15 +1352,14 @@ static bool domain_chk_quota(struct connection *conn, unsigned int mem) syslog(LOG_INFO, "Domain %u below hard memory quota again\n", domain->domid); } - if (mem >= quota_memory_per_domain_soft && - quota_memory_per_domain_soft && - !domain->soft_quota_reported) { + if (mem >= soft_quotas[ACC_MEM].val && + soft_quotas[ACC_MEM].val && !domain->soft_quota_reported) { domain->mem_last_msg = now; domain->soft_quota_reported = true; syslog(LOG_WARNING, "Domain %u exceeds soft memory quota\n", domain->domid); } - if (mem < quota_memory_per_domain_soft && + if (mem < soft_quotas[ACC_MEM].val && domain->soft_quota_reported) { domain->mem_last_msg = now; domain->soft_quota_reported = false; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 78ca434531..5123453f6c 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -40,6 +40,16 @@ enum accitem { ACC_N, /* Number of elements per domain. */ }; +struct quota { + const char *name; + const char *descr; + unsigned int val; + unsigned int max; +}; + +extern struct quota hard_quotas[ACC_N]; +extern struct quota soft_quotas[ACC_N]; + void handle_event(void); void check_domains(void); @@ -134,7 +144,7 @@ void acc_commit(struct connection *conn); int domain_max_global_acc(const void *ctx, struct connection *conn); void domain_reset_global_acc(void); bool domain_max_chk(const struct connection *conn, unsigned int what, - unsigned int val, unsigned int quota); + unsigned int val); /* Write rate limiting */ diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index 580d7bd090..db06d0e7f1 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -252,8 +252,7 @@ int access_node(struct connection *conn, struct node *node, i = find_accessed_node(trans, node->name); if (!i) { - if (domain_max_chk(conn, ACC_TRANSNODES, trans->nodes + 1, - quota_trans_nodes)) { + if (domain_max_chk(conn, ACC_TRANSNODES, trans->nodes + 1)) { ret = ENOSPC; goto err; } @@ -479,7 +478,7 @@ int do_transaction_start(const void *ctx, struct connection *conn, if (conn->transaction) return EBUSY; - if (domain_transaction_get(conn) > quota_max_transaction) + if (domain_transaction_get(conn) > hard_quotas[ACC_TRANS].val) return ENOSPC; /* Attach transaction to ctx for autofree until it's complete */ diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index 61b1e3421e..e8eb35de02 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -239,7 +239,7 @@ int do_watch(const void *ctx, struct connection *conn, struct buffered_data *in) return EEXIST; } - if (domain_watch(conn) > quota_nb_watch_per_domain) + if (domain_watch(conn) > hard_quotas[ACC_WATCH].val) return E2BIG; watch = add_watch(conn, vec[0], vec[1], relative, false); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:04:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:04:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546450.853360 (Exim 4.92) (envelope-from ) id 1q7taD-00078d-Lp; Sat, 10 Jun 2023 08:04:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546450.853360; Sat, 10 Jun 2023 08:04:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taD-00078V-JA; Sat, 10 Jun 2023 08:04:25 +0000 Received: by outflank-mailman (input) for mailman id 546450; Sat, 10 Jun 2023 08:04:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taD-00078N-5d for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taD-0005Kl-51 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7taD-0002Ht-4G for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=73Le9dyuMnIs2fvIuLmvet+SBHCW1oOePONUOpDjPm4=; b=TqplyxrIfQ4CmLtnm/GzEmLm6m do2PWSFE8qxCASQ1Vyf/KdQ0OpmbBsEJCN3YRYxZcl/1zUDEjsrPDwa6OgwNfda1af+W3UknNYYPQ DUtkhD3gDJwMoENEDzY5zn3A6Ac3YaqKAW65QO53r7HkWejC7wLA76ZMbfNJ24C+jcYw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs: Fix xl.cfg documentation Message-Id: Date: Sat, 10 Jun 2023 08:04:25 +0000 commit 0c2d0d32b341eb79bb095fd3f35b9a2672333d64 Author: Luca Fancellu AuthorDate: Wed Jun 7 14:54:19 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 7 16:18:01 2023 +0100 docs: Fix xl.cfg documentation A recent change to the documentation for the xl.cfg introduced a build error, fix the issue. Fixes: b46e8207d0ae ("xen/tools: add sve parameter in XL configuration") Signed-off-by: Luca Fancellu Reviewed-by: Michal Orzel Tested-by: Michal Orzel --- docs/man/xl.cfg.5.pod.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 1b4e13ab64..3979be2a59 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2955,6 +2955,8 @@ Currently, only the "sbsa_uart" model is supported for ARM. =back +=over 4 + =item B The `sve` parameter enables Arm Scalable Vector Extension (SVE) usage for the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:04:35 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:04:35 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546453.853364 (Exim 4.92) (envelope-from ) id 1q7taN-0007Hg-NV; Sat, 10 Jun 2023 08:04:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546453.853364; Sat, 10 Jun 2023 08:04:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taN-0007HZ-Kk; Sat, 10 Jun 2023 08:04:35 +0000 Received: by outflank-mailman (input) for mailman id 546453; Sat, 10 Jun 2023 08:04:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taN-0007GI-8j for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taN-0005Kv-7x for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7taN-0002Ij-77 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=NznyOi+lyYJmMTXzqqaLkHLgxL4JyCQeTzAmSjuXy24=; b=WMkrlNXImpJ3naFp1xerJZBOmy rHEf5whht8omTx3PU3b7QaVOTeQqqew2ATCWwDEJ4VZS/egumOxJJcO2VOMieEp0MT5CG00LLU57i 1OMHb7yg6+2Fd+QsHMcTKEU26LvaPG+bvNm43YciHzytpW+TiaZt/CnJomk+6QW37WCg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Fix the github actions Coverity run Message-Id: Date: Sat, 10 Jun 2023 08:04:35 +0000 commit 606bb708e13d64596b2d68ac1de78d142d682e20 Author: Andrew Cooper AuthorDate: Wed Jun 7 10:27:35 2023 +0100 Commit: Andrew Cooper CommitDate: Thu Jun 8 11:48:53 2023 +0100 CI: Fix the github actions Coverity run The Install step is failing with: Package python-dev is not available, but is referred to by another package. This may mean that the package is missing, has been obsoleted, or E: Package 'python-dev' has no installation candidate is only available from another source However the following packages replace it: python2-dev python2 python-dev-is-python3 which is a side effect of ubuntu-latest having changed from 20.04 to 22.04. Drop python-dev as python3-dev is already present, and used a fixed runs-on to avoid such problems in the future. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini Reviewed-by: Roger Pau Monné --- .github/workflows/coverity.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 427fb86f94..60ac8dee55 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -8,7 +8,7 @@ on: jobs: coverity: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Install build dependencies run: | @@ -18,7 +18,7 @@ jobs: libbz2-dev e2fslibs-dev uuid-dev ocaml \ ocaml-findlib libyajl-dev \ autoconf libtool liblzma-dev \ - python3-dev golang python-dev libsystemd-dev + python3-dev golang libsystemd-dev - uses: actions/checkout@v2 with: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:04:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:04:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546456.853367 (Exim 4.92) (envelope-from ) id 1q7taX-0007QO-QT; Sat, 10 Jun 2023 08:04:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546456.853367; Sat, 10 Jun 2023 08:04:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taX-0007QH-Nx; Sat, 10 Jun 2023 08:04:45 +0000 Received: by outflank-mailman (input) for mailman id 546456; Sat, 10 Jun 2023 08:04:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taX-0007PV-Bu for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7taX-0005LO-B8 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7taX-0002JW-AP for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=W1o/+FY7yPS1hlz5Z8gD0vl8ou0QgA0L7v46GSQUW+8=; b=etUAjaMbYNz/mHIalDBQs2vBAT /0KdouF+nwASzmW6FCCiE8zekQaGrWhC2q4SD3FPhNiKsIdNsVkI0eRr6ALxnpEh303RsgUBvpKeI ZP6KJV1xnerx61E4SPpxFL10yxYniyqa+oget3K4Ze844IULMLh4/cIdaGu8c803syks=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/hvm: print valid CR4 bits in case of error Message-Id: Date: Sat, 10 Jun 2023 08:04:45 +0000 commit 6915a120641b5d232762af7882266048cf039ca0 Author: Roger Pau Monne AuthorDate: Thu Jun 8 11:59:39 2023 +0200 Commit: Andrew Cooper CommitDate: Thu Jun 8 11:48:53 2023 +0100 x86/hvm: print valid CR4 bits in case of error Some of the current users of hvm_cr4_guest_valid_bits() don't print the valid mask in case of error, and thus the resulting error messages are not as helpful as they could be. Amend callers to always print the value of hvm_cr4_guest_valid_bits() together with the rejected bits in the checked value. Also take the opportunity and adjust all the users to use the same print formatter. No functional change intended. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/domain.c | 9 ++++++--- xen/arch/x86/hvm/hvm.c | 17 +++++++++-------- xen/arch/x86/hvm/svm/svmdebug.c | 4 ++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/domain.c b/xen/arch/x86/hvm/domain.c index deec74fdb4..7692ee24c2 100644 --- a/xen/arch/x86/hvm/domain.c +++ b/xen/arch/x86/hvm/domain.c @@ -107,6 +107,7 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) struct segment_register cs, ds, ss, es, tr; const char *errstr; int rc; + unsigned long valid; if ( ctx->pad != 0 ) return -EINVAL; @@ -264,10 +265,12 @@ int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) if ( v->arch.hvm.guest_efer & EFER_LME ) v->arch.hvm.guest_efer |= EFER_LMA; - if ( v->arch.hvm.guest_cr[4] & ~hvm_cr4_guest_valid_bits(d) ) + valid = hvm_cr4_guest_valid_bits(d); + if ( v->arch.hvm.guest_cr[4] & ~valid ) { - gprintk(XENLOG_ERR, "Bad CR4 value: %#016lx\n", - v->arch.hvm.guest_cr[4]); + gprintk(XENLOG_ERR, "Bad CR4 %#lx (valid %#lx, rejected %#lx)\n", + v->arch.hvm.guest_cr[4], valid, + v->arch.hvm.guest_cr[4] & ~valid); return -EINVAL; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2d6e4bb9c6..a67ef79dc0 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -991,6 +991,7 @@ static int cf_check hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) struct hvm_hw_cpu ctxt; struct segment_register seg; const char *errstr; + unsigned long valid; /* Which vcpu is this? */ if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL ) @@ -1016,10 +1017,11 @@ static int cf_check hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - if ( ctxt.cr4 & ~hvm_cr4_guest_valid_bits(d) ) + valid = hvm_cr4_guest_valid_bits(d); + if ( ctxt.cr4 & ~valid ) { - printk(XENLOG_G_ERR "HVM%d restore: bad CR4 %#" PRIx64 "\n", - d->domain_id, ctxt.cr4); + printk(XENLOG_G_ERR "HVM%d restore: bad CR4 %#lx (valid %#lx, rejected %#lx)\n", + d->domain_id, ctxt.cr4, valid, ctxt.cr4 & ~valid); return -EINVAL; } @@ -2456,13 +2458,12 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) int hvm_set_cr4(unsigned long value, bool may_defer) { struct vcpu *v = current; - unsigned long old_cr; + unsigned long old_cr, valid = hvm_cr4_guest_valid_bits(v->domain); - if ( value & ~hvm_cr4_guest_valid_bits(v->domain) ) + if ( value & ~valid ) { - HVM_DBG_LOG(DBG_LEVEL_1, - "Guest attempts to set reserved bit in CR4: %lx", - value); + HVM_DBG_LOG(DBG_LEVEL_1, "Bad CR4 %#lx (valid %#lx, rejected %#lx)", + value, valid, value & ~valid); return X86EMUL_EXCEPTION; } diff --git a/xen/arch/x86/hvm/svm/svmdebug.c b/xen/arch/x86/hvm/svm/svmdebug.c index 7d6dc9ef47..24358c6eea 100644 --- a/xen/arch/x86/hvm/svm/svmdebug.c +++ b/xen/arch/x86/hvm/svm/svmdebug.c @@ -124,8 +124,8 @@ bool svm_vmcb_isvalid(const char *from, const struct vmcb_struct *vmcb, valid = hvm_cr4_guest_valid_bits(v->domain); if ( cr4 & ~valid ) - PRINTF("CR4: invalid bits are set (%#"PRIx64", valid: %#"PRIx64")\n", - cr4, valid); + PRINTF("CR4: invalid value %#lx (valid %#lx, rejected %#lx)\n", + cr4, valid, cr4 & ~valid); if ( vmcb_get_dr6(vmcb) >> 32 ) PRINTF("DR6: bits [63:32] are not zero (%#"PRIx64")\n", -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:04:57 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:04:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546459.853371 (Exim 4.92) (envelope-from ) id 1q7tai-0007YI-S5; Sat, 10 Jun 2023 08:04:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546459.853371; Sat, 10 Jun 2023 08:04:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tai-0007YB-PU; Sat, 10 Jun 2023 08:04:56 +0000 Received: by outflank-mailman (input) for mailman id 546459; Sat, 10 Jun 2023 08:04:55 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tah-0007Xs-Ex for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:55 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tah-0005Lc-EI for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tah-0002Kj-Db for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:04:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ckpaHaVZCKYeUEPcegT3+IXk/xtrP+1R4in6VLyrURY=; b=aJhj11eTnYcZt41VDUvldbUjtd Pe4SD7xX0mv61wftaj3XgnWsbjbMb6zNGaJXWhulg0Q58LWmiIQO/KFclMQfCraOH2MUvONuWe9BU HlXpZbt7dF78iHS1V/pNCutBh5ngVgUZ38XXur6IS47H8NafEDUPOBW62YpXbsO6w/N4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: Move MASK_INSR to common-macros.h Message-Id: Date: Sat, 10 Jun 2023 08:04:55 +0000 commit 3a82e4501c4ec4d53b764c5b69955997b03d1137 Author: Andrew Cooper AuthorDate: Wed Jun 7 20:41:49 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 9 14:02:34 2023 +0100 tools: Move MASK_INSR to common-macros.h MASK_EXTR() and MASK_INSR() are a matching pair. Keep them together. Drop the pair from x86-emulate.h which includes common-macros.h. Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") Signed-off-by: Andrew Cooper Reviewed-by: Luca Fancellu Acked-by: Roger Pau Monné Reviewed-by: Jason Andryuk --- tools/include/xen-tools/common-macros.h | 1 + tools/libs/light/libxl_internal.h | 2 -- tools/tests/x86_emulator/x86-emulate.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index d53b881825..168691be0e 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -73,6 +73,7 @@ #endif #define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) +#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) #ifndef __must_check #define __must_check __attribute__((__warn_unused_result__)) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 8aba3e1389..61f4fe1dec 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -132,8 +132,6 @@ #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d)) -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) - #define LIBXL__LOGGING_ENABLED #ifdef LIBXL__LOGGING_ENABLED diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index de1f826680..aa1ed75ec8 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -51,9 +51,6 @@ #define DEFINE_PER_CPU(type, var) type per_cpu_##var #define this_cpu(var) per_cpu_##var -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) -#define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) - #define __init #define __maybe_unused __attribute__((__unused__)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:05:09 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:05:09 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546460.853376 (Exim 4.92) (envelope-from ) id 1q7tas-0007eG-Uv; Sat, 10 Jun 2023 08:05:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546460.853376; Sat, 10 Jun 2023 08:05:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tas-0007e8-RS; Sat, 10 Jun 2023 08:05:06 +0000 Received: by outflank-mailman (input) for mailman id 546460; Sat, 10 Jun 2023 08:05:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tar-0007dw-Tn for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tar-0005Lv-HH for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tar-0002M2-Ga for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZDSEZzpdx6f++EXiunZhzMRCQGrN/NxxtiUq4XGmaG4=; b=rEX6vDm774kdSIVll3DYodwO42 mnPE9ipHDzl7hhCy4Lugdo2aUCayxaLt3eq0SxsHH5dtVAZUlwDAEjkVuVi4MaegUbC7UwxJmjqdC 1ArNM1WJlN1wIesE8/l5psfEo9leel5Eplg8Vu/tQ8SZcw9Tbi5tsv+ycmOUc6jCKEdY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: verify command line parameters better Message-Id: Date: Sat, 10 Jun 2023 08:05:05 +0000 commit ea1e8a2dafdcf44453fdbce284b3d4fe7826e130 Author: Juergen Gross AuthorDate: Tue May 30 10:54:03 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: verify command line parameters better Add some more verification of command line parameters. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 6f03f6687a..22df395aac 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2820,7 +2820,7 @@ int main(int argc, char *argv[]) no_domain_init = true; break; case 'E': - hard_quotas[ACC_NODES].val = strtoul(optarg, NULL, 10); + hard_quotas[ACC_NODES].val = get_optval_uint(optarg); break; case 'F': pidfile = optarg; @@ -2838,10 +2838,10 @@ int main(int argc, char *argv[]) recovery = false; break; case 'S': - hard_quotas[ACC_NODESZ].val = strtoul(optarg, NULL, 10); + hard_quotas[ACC_NODESZ].val = get_optval_uint(optarg); break; case 't': - hard_quotas[ACC_TRANS].val = strtoul(optarg, NULL, 10); + hard_quotas[ACC_TRANS].val = get_optval_uint(optarg); break; case 'T': tracefile = optarg; @@ -2861,14 +2861,13 @@ int main(int argc, char *argv[]) verbose = true; break; case 'W': - hard_quotas[ACC_WATCH].val = strtoul(optarg, NULL, 10); + hard_quotas[ACC_WATCH].val = get_optval_uint(optarg); break; case 'A': - hard_quotas[ACC_NPERM].val = strtoul(optarg, NULL, 10); + hard_quotas[ACC_NPERM].val = get_optval_uint(optarg); break; case 'M': - hard_quotas[ACC_PATHLEN].val = - strtoul(optarg, NULL, 10); + hard_quotas[ACC_PATHLEN].val = get_optval_uint(optarg); hard_quotas[ACC_PATHLEN].val = min((unsigned int)XENSTORE_REL_PATH_MAX, hard_quotas[ACC_PATHLEN].val); @@ -2883,13 +2882,13 @@ int main(int argc, char *argv[]) set_timeout(optarg); break; case 'e': - dom0_event = strtol(optarg, NULL, 10); + dom0_event = get_optval_uint(optarg); break; case 'm': - dom0_domid = strtol(optarg, NULL, 10); + dom0_domid = get_optval_uint(optarg); break; case 'p': - priv_domid = strtol(optarg, NULL, 10); + priv_domid = get_optval_uint(optarg); break; #ifndef NO_LIVE_UPDATE case 'U': -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:05:17 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:05:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546461.853380 (Exim 4.92) (envelope-from ) id 1q7tb3-0007hD-06; Sat, 10 Jun 2023 08:05:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546461.853380; Sat, 10 Jun 2023 08:05:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tb2-0007h5-TS; Sat, 10 Jun 2023 08:05:16 +0000 Received: by outflank-mailman (input) for mailman id 546461; Sat, 10 Jun 2023 08:05:15 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tb1-0007gt-L8 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:15 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tb1-0005M4-KQ for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tb1-0002N4-Jg for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bUiWYWNtTaX0CvRHX/N4I118L4olQJGomBVzKzSAdNk=; b=tM0o4l2DdOgBrh62VYtdS7RQnu sTv7r0tKZ0DFZ4rj8NYEpU/a5wxZll8VbSJttS2IR/SKoEEIYjrBY9dFS91MTJP6i/2HTTJCZg7Ez w2AoEfc8eYVAgrfmUbmJ8x31xlrDIKRm/3Nee+Luo8bkZsNtVW3xYuMng8tVY1g9fJ/A=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: do some cleanup of hashtable.c Message-Id: Date: Sat, 10 Jun 2023 08:05:15 +0000 commit d3c7262d7535487887951d703cd6f5db31938a66 Author: Juergen Gross AuthorDate: Tue May 30 10:54:04 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: do some cleanup of hashtable.c Do the following cleanups: - hashtable_count() isn't used at all, so remove it - replace prime_table_length and max_load_factor with macros - make hash() static - add a loadlimit() helper function - remove the /***/ lines between functions - do some style corrections Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/hashtable.c | 76 ++++++++++++++++++---------------------------- tools/xenstore/hashtable.h | 10 ------ 2 files changed, 30 insertions(+), 56 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index 3d4466b597..dc209158fa 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -40,22 +40,25 @@ static const unsigned int primes[] = { 50331653, 100663319, 201326611, 402653189, 805306457, 1610612741 }; -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); -const unsigned int max_load_factor = 65; /* percentage */ -/*****************************************************************************/ -/* indexFor */ -static inline unsigned int -indexFor(unsigned int tablelength, unsigned int hashvalue) { +#define PRIME_TABLE_LEN ARRAY_SIZE(primes) +#define MAX_LOAD_PERCENT 65 + +static inline unsigned int indexFor(unsigned int tablelength, + unsigned int hashvalue) +{ return (hashvalue % tablelength); } -/*****************************************************************************/ -struct hashtable * -create_hashtable(const void *ctx, unsigned int minsize, - unsigned int (*hashf) (const void *), - int (*eqf) (const void *, const void *), - unsigned int flags) +static unsigned int loadlimit(unsigned int pindex) +{ + return ((uint64_t)primes[pindex] * MAX_LOAD_PERCENT) / 100; +} + +struct hashtable *create_hashtable(const void *ctx, unsigned int minsize, + unsigned int (*hashf) (const void *), + int (*eqf) (const void *, const void *), + unsigned int flags) { struct hashtable *h; unsigned int pindex, size = primes[0]; @@ -64,8 +67,11 @@ create_hashtable(const void *ctx, unsigned int minsize, if (minsize > (1u << 30)) return NULL; /* Enforce size as prime */ - for (pindex=0; pindex < prime_table_length; pindex++) { - if (primes[pindex] > minsize) { size = primes[pindex]; break; } + for (pindex = 0; pindex < PRIME_TABLE_LEN; pindex++) { + if (primes[pindex] > minsize) { + size = primes[pindex]; + break; + } } h = talloc_zero(ctx, struct hashtable); @@ -81,7 +87,7 @@ create_hashtable(const void *ctx, unsigned int minsize, h->entrycount = 0; h->hashfn = hashf; h->eqfn = eqf; - h->loadlimit = (unsigned int)(((uint64_t)size * max_load_factor) / 100); + h->loadlimit = loadlimit(pindex); return h; err1: @@ -90,9 +96,7 @@ err0: return NULL; } -/*****************************************************************************/ -unsigned int -hash(const struct hashtable *h, const void *k) +static unsigned int hash(const struct hashtable *h, const void *k) { /* Aim to protect against poor hash functions by adding logic here * - logic taken from java 1.4 hashtable source */ @@ -104,9 +108,7 @@ hash(const struct hashtable *h, const void *k) return i; } -/*****************************************************************************/ -static int -hashtable_expand(struct hashtable *h) +static int hashtable_expand(struct hashtable *h) { /* Double the size of the table to accomodate more entries */ struct entry **newtable; @@ -114,7 +116,7 @@ hashtable_expand(struct hashtable *h) struct entry **pE; unsigned int newsize, i, index; /* Check we're not hitting max capacity */ - if (h->primeindex == (prime_table_length - 1)) return 0; + if (h->primeindex == (PRIME_TABLE_LEN - 1)) return 0; newsize = primes[++(h->primeindex)]; newtable = talloc_realloc(h, h->table, struct entry *, newsize); @@ -144,21 +146,11 @@ hashtable_expand(struct hashtable *h) } h->tablelength = newsize; - h->loadlimit = (unsigned int) - (((uint64_t)newsize * max_load_factor) / 100); + h->loadlimit = loadlimit(h->primeindex); return -1; } -/*****************************************************************************/ -unsigned int -hashtable_count(const struct hashtable *h) -{ - return h->entrycount; -} - -/*****************************************************************************/ -int -hashtable_insert(struct hashtable *h, void *k, void *v) +int hashtable_insert(struct hashtable *h, void *k, void *v) { /* This method allows duplicate keys - but they shouldn't be used */ unsigned int index; @@ -186,9 +178,7 @@ hashtable_insert(struct hashtable *h, void *k, void *v) return -1; } -/*****************************************************************************/ -void * /* returns value associated with key */ -hashtable_search(const struct hashtable *h, const void *k) +void *hashtable_search(const struct hashtable *h, const void *k) { struct entry *e; unsigned int hashvalue, index; @@ -204,7 +194,6 @@ hashtable_search(const struct hashtable *h, const void *k) return NULL; } -/*****************************************************************************/ void hashtable_remove(struct hashtable *h, const void *k) { @@ -234,10 +223,8 @@ hashtable_remove(struct hashtable *h, const void *k) } } -/*****************************************************************************/ -int -hashtable_iterate(struct hashtable *h, - int (*func)(const void *k, void *v, void *arg), void *arg) +int hashtable_iterate(struct hashtable *h, + int (*func)(const void *k, void *v, void *arg), void *arg) { int ret; unsigned int i; @@ -260,10 +247,7 @@ hashtable_iterate(struct hashtable *h, return 0; } -/*****************************************************************************/ -/* destroy */ -void -hashtable_destroy(struct hashtable *h) +void hashtable_destroy(struct hashtable *h) { talloc_free(h); } diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index cc0090f133..04310783b6 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -74,16 +74,6 @@ hashtable_search(const struct hashtable *h, const void *k); void hashtable_remove(struct hashtable *h, const void *k); -/***************************************************************************** - * hashtable_count - - * @name hashtable_count - * @param h the hashtable - * @return the number of items stored in the hashtable - */ -unsigned int -hashtable_count(const struct hashtable *h); - /***************************************************************************** * hashtable_iterate -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:05:27 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:05:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546462.853384 (Exim 4.92) (envelope-from ) id 1q7tbD-0007k8-2A; Sat, 10 Jun 2023 08:05:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546462.853384; Sat, 10 Jun 2023 08:05:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbC-0007k1-V0; Sat, 10 Jun 2023 08:05:26 +0000 Received: by outflank-mailman (input) for mailman id 546462; Sat, 10 Jun 2023 08:05:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbB-0007jh-OL for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbB-0005MD-Nh for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tbB-0002O4-My for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3QDibetl02hms6zfr6UQx8qkeKegHV+hekkawANF8MA=; b=EcUNezJttnw2stShloPktQTIyD 6yO7TbMXbEbyA8vZPI2hdmQnD8QUg50V2pt3zORPi57iYGvz/moFwnpv2+FlpyzvSBi8ykX7REYxp wf6FWTkWLhZOhC+77zGTJ01+kV1PjUYGl0xiDRyWwDcgtXwvgj/s/elwMmrPO5u18mMg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: modify interface of create_hashtable() Message-Id: Date: Sat, 10 Jun 2023 08:05:25 +0000 commit 9b2c27e277c4d0e4aea3e841fb3e8f87594fa56c Author: Juergen Gross AuthorDate: Tue May 30 10:54:05 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: modify interface of create_hashtable() The minsize parameter of create_hashtable() doesn't have any real use case for Xenstore, so drop it. For better talloc_report_full() diagnostic output add a name parameter to create_hashtable(). Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/hashtable.c | 23 ++++++----------------- tools/xenstore/hashtable.h | 4 ++-- tools/xenstore/xenstored_core.c | 2 +- tools/xenstore/xenstored_domain.c | 4 ++-- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index dc209158fa..3d2d3a0e22 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -55,39 +55,28 @@ static unsigned int loadlimit(unsigned int pindex) return ((uint64_t)primes[pindex] * MAX_LOAD_PERCENT) / 100; } -struct hashtable *create_hashtable(const void *ctx, unsigned int minsize, +struct hashtable *create_hashtable(const void *ctx, const char *name, unsigned int (*hashf) (const void *), int (*eqf) (const void *, const void *), unsigned int flags) { struct hashtable *h; - unsigned int pindex, size = primes[0]; - - /* Check requested hashtable isn't too large */ - if (minsize > (1u << 30)) return NULL; - - /* Enforce size as prime */ - for (pindex = 0; pindex < PRIME_TABLE_LEN; pindex++) { - if (primes[pindex] > minsize) { - size = primes[pindex]; - break; - } - } h = talloc_zero(ctx, struct hashtable); if (NULL == h) goto err0; - h->table = talloc_zero_array(h, struct entry *, size); + talloc_set_name_const(h, name); + h->table = talloc_zero_array(h, struct entry *, primes[0]); if (NULL == h->table) goto err1; - h->tablelength = size; + h->primeindex = 0; + h->tablelength = primes[h->primeindex]; h->flags = flags; - h->primeindex = pindex; h->entrycount = 0; h->hashfn = hashf; h->eqfn = eqf; - h->loadlimit = loadlimit(pindex); + h->loadlimit = loadlimit(h->primeindex); return h; err1: diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 04310783b6..0e1a6f61c2 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -10,7 +10,7 @@ struct hashtable; * @name create_hashtable * @param ctx talloc context to use for allocations - * @param minsize minimum initial size of hashtable + * @param name talloc name of the hashtable * @param hashfunction function for hashing keys * @param key_eq_fn function for determining key equality * @param flags flags HASHTABLE_* @@ -23,7 +23,7 @@ struct hashtable; #define HASHTABLE_FREE_KEY (1U << 1) struct hashtable * -create_hashtable(const void *ctx, unsigned int minsize, +create_hashtable(const void *ctx, const char *name, unsigned int (*hashfunction) (const void *), int (*key_eq_fn) (const void *, const void *), unsigned int flags diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 22df395aac..418790d8d7 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2521,7 +2521,7 @@ void check_store(void) struct check_store_data data; /* Don't free values (they are all void *1) */ - data.reachable = create_hashtable(NULL, 16, hash_from_key_fn, + data.reachable = create_hashtable(NULL, "checkstore", hash_from_key_fn, keys_equal_fn, HASHTABLE_FREE_KEY); if (!data.reachable) { log("check_store: ENOMEM"); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index e284cf1cf1..d67d67fae3 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1014,7 +1014,7 @@ void domain_init(int evtfd) int rc; /* Start with a random rather low domain count for the hashtable. */ - domhash = create_hashtable(NULL, 8, domhash_fn, domeq_fn, 0); + domhash = create_hashtable(NULL, "domains", domhash_fn, domeq_fn, 0); if (!domhash) barf_perror("Failed to allocate domain hashtable"); @@ -1806,7 +1806,7 @@ struct hashtable *domain_check_acc_init(void) { struct hashtable *domains; - domains = create_hashtable(NULL, 8, domhash_fn, domeq_fn, + domains = create_hashtable(NULL, "domain_check", domhash_fn, domeq_fn, HASHTABLE_FREE_VALUE); if (!domains) return NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:05:37 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:05:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546463.853387 (Exim 4.92) (envelope-from ) id 1q7tbN-0007pB-5n; Sat, 10 Jun 2023 08:05:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546463.853387; Sat, 10 Jun 2023 08:05:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbN-0007p4-38; Sat, 10 Jun 2023 08:05:37 +0000 Received: by outflank-mailman (input) for mailman id 546463; Sat, 10 Jun 2023 08:05:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbL-0007of-Ra for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbL-0005MK-Qs for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tbL-0002P0-Q4 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=FuwwGqE3kRw7wQI4Gcw0Wr/jhTF5p2Og9199l8p0BMk=; b=O01wvnE8GZicqp5dWWAmu2qpDe idbA0ZEaWXQivE8vBxGhL2DiBm0dFXji+h/AFN2HpvXpIEZ/HvvcqsbVoIHhW8E1Pp9CFVD5M+3y6 CHNxwDXsCSrOVzsQiOytqeLXjIcgq5qdPPVDMbH476HhQ1M0/GS3oVv/nanTtsSAUPPU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: rename hashtable_insert() and let it return 0 on success Message-Id: Date: Sat, 10 Jun 2023 08:05:35 +0000 commit d78c91c40689355101ed651a0bb4bcade6be3d2c Author: Juergen Gross AuthorDate: Tue May 30 10:54:06 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: rename hashtable_insert() and let it return 0 on success Today hashtable_insert() returns 0 in case of an error. Change that to let it return an errno value in the error case and 0 in case of success. In order to avoid any missed return value checks or related future backport errors, rename hashtable_insert() to hashtable_add(). Even if not used today, do the same switch for the return value of hashtable_expand(). Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/hashtable.c | 17 +++++++++++------ tools/xenstore/hashtable.h | 8 ++++---- tools/xenstore/xenstored_core.c | 6 +++--- tools/xenstore/xenstored_domain.c | 4 ++-- tools/xenstore/xenstored_transaction.c | 4 ++-- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index 3d2d3a0e22..11f6bf8f15 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -105,14 +105,15 @@ static int hashtable_expand(struct hashtable *h) struct entry **pE; unsigned int newsize, i, index; /* Check we're not hitting max capacity */ - if (h->primeindex == (PRIME_TABLE_LEN - 1)) return 0; + if (h->primeindex == (PRIME_TABLE_LEN - 1)) + return ENOSPC; newsize = primes[++(h->primeindex)]; newtable = talloc_realloc(h, h->table, struct entry *, newsize); if (!newtable) { h->primeindex--; - return 0; + return ENOMEM; } h->table = newtable; @@ -136,10 +137,10 @@ static int hashtable_expand(struct hashtable *h) h->tablelength = newsize; h->loadlimit = loadlimit(h->primeindex); - return -1; + return 0; } -int hashtable_insert(struct hashtable *h, void *k, void *v) +int hashtable_add(struct hashtable *h, void *k, void *v) { /* This method allows duplicate keys - but they shouldn't be used */ unsigned int index; @@ -153,7 +154,11 @@ int hashtable_insert(struct hashtable *h, void *k, void *v) hashtable_expand(h); } e = talloc_zero(h, struct entry); - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ + if (NULL == e) + { + --h->entrycount; + return ENOMEM; + } e->h = hash(h,k); index = indexFor(h->tablelength,e->h); e->k = k; @@ -164,7 +169,7 @@ int hashtable_insert(struct hashtable *h, void *k, void *v) talloc_steal(e, v); e->next = h->table[index]; h->table[index] = e; - return -1; + return 0; } void *hashtable_search(const struct hashtable *h, const void *k) diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 0e1a6f61c2..5a2cc4a4be 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -30,13 +30,13 @@ create_hashtable(const void *ctx, const char *name, ); /***************************************************************************** - * hashtable_insert + * hashtable_add - * @name hashtable_insert + * @name hashtable_add * @param h the hashtable to insert into * @param k the key - hashtable claims ownership and will free on removal * @param v the value - does not claim ownership - * @return non-zero for successful insertion + * @return zero for successful insertion * * This function will cause the table to expand if the insertion would take * the ratio of entries to table size over the maximum load factor. @@ -49,7 +49,7 @@ create_hashtable(const void *ctx, const char *name, */ int -hashtable_insert(struct hashtable *h, void *k, void *v); +hashtable_add(struct hashtable *h, void *k, void *v); /***************************************************************************** * hashtable_search diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 418790d8d7..c467a704a1 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2404,8 +2404,8 @@ int remember_string(struct hashtable *hash, const char *str) char *k = talloc_strdup(NULL, str); if (!k) - return 0; - return hashtable_insert(hash, k, (void *)1); + return ENOMEM; + return hashtable_add(hash, k, (void *)1); } /** @@ -2438,7 +2438,7 @@ static int check_store_step(const void *ctx, struct connection *conn, : WALK_TREE_SKIP_CHILDREN; } - if (!remember_string(data->reachable, node->name)) + if (remember_string(data->reachable, node->name)) return WALK_TREE_ERROR_STOP; domain_check_acc_add(node, data->domains); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index d67d67fae3..af8db0d4a2 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -537,7 +537,7 @@ static struct domain *alloc_domain(const void *context, unsigned int domid) domain->generation = generation; domain->introduced = false; - if (!hashtable_insert(domhash, &domain->domid, domain)) { + if (hashtable_add(domhash, &domain->domid, domain)) { talloc_free(domain); errno = ENOMEM; return NULL; @@ -1794,7 +1794,7 @@ static int domain_check_acc_init_sub(const void *k, void *v, void *arg) */ dom->nodes = -d->acc[ACC_NODES].val; - if (!hashtable_insert(domains, &dom->domid, dom)) { + if (hashtable_add(domains, &dom->domid, dom)) { talloc_free(dom); return -1; } diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c index db06d0e7f1..334f1609f1 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -601,13 +601,13 @@ int check_transactions(struct hashtable *hash) list_for_each_entry(trans, &conn->transaction_list, list) { tname = talloc_asprintf(trans, "%"PRIu64, trans->generation); - if (!tname || !remember_string(hash, tname)) + if (!tname || remember_string(hash, tname)) goto nomem; list_for_each_entry(i, &trans->accessed, list) { if (!i->ta_node) continue; - if (!remember_string(hash, i->trans_name)) + if (remember_string(hash, i->trans_name)) goto nomem; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:05:47 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:05:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546465.853392 (Exim 4.92) (envelope-from ) id 1q7tbX-0007sh-7c; Sat, 10 Jun 2023 08:05:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546465.853392; Sat, 10 Jun 2023 08:05:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbX-0007sa-4n; Sat, 10 Jun 2023 08:05:47 +0000 Received: by outflank-mailman (input) for mailman id 546465; Sat, 10 Jun 2023 08:05:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbV-0007sC-V6 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbV-0005Mr-UQ for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tbV-0002PV-TS for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=sIEkFDJ63qpwnmWw2vIwrdkWlSwtC5LnECr0boRZ/Y8=; b=cawpnCdOBn8jQZJV9KxWSNP7Ti KeDfd5fElePSgLvujvhpWY/yb7ZSlsPN7mJOhZInKDY6bH7vZkfaQfi0shm/XL3Tcelvta6MChJiC 1tkmhHaT5aTZp6D6iLH5MLYlPx34IY4ZokDxjjUVeVe2z2O7HsNqVhbnVFn3SABIOurY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: make some write limit functions static Message-Id: Date: Sat, 10 Jun 2023 08:05:45 +0000 commit f8f4042b39d599c9beac5b7dfa9f9bd88815cf5f Author: Juergen Gross AuthorDate: Tue May 30 10:54:07 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: make some write limit functions static Some wrl_*() functions are only used in xenstored_domain.c, so make them static. In order to avoid the need of forward declarations, move the whole function block to the start of the file. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_domain.c | 456 +++++++++++++++++++------------------- tools/xenstore/xenstored_domain.h | 3 - 2 files changed, 228 insertions(+), 231 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index af8db0d4a2..9ef0d994f6 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -157,6 +157,234 @@ struct changed_domain static struct hashtable *domhash; +static wrl_creditt wrl_config_writecost = WRL_FACTOR; +static wrl_creditt wrl_config_rate = WRL_RATE * WRL_FACTOR; +static wrl_creditt wrl_config_dburst = WRL_DBURST * WRL_FACTOR; +static wrl_creditt wrl_config_gburst = WRL_GBURST * WRL_FACTOR; +static wrl_creditt wrl_config_newdoms_dburst = + WRL_DBURST * WRL_NEWDOMS * WRL_FACTOR; + +long wrl_ntransactions; + +static long wrl_ndomains; +static wrl_creditt wrl_reserve; /* [-wrl_config_newdoms_dburst, +_gburst ] */ +static time_t wrl_log_last_warning; /* 0: no previous warning */ + +#define trace_wrl(...) \ +do { \ + if (trace_flags & TRACE_WRL) \ + trace("wrl: " __VA_ARGS__); \ +} while (0) + +void wrl_gettime_now(struct wrl_timestampt *now_wt) +{ + struct timespec now_ts; + int r; + + r = clock_gettime(CLOCK_MONOTONIC, &now_ts); + if (r) + barf_perror("Could not find time (clock_gettime failed)"); + + now_wt->sec = now_ts.tv_sec; + now_wt->msec = now_ts.tv_nsec / 1000000; +} + +static void wrl_xfer_credit(wrl_creditt *debit, wrl_creditt debit_floor, + wrl_creditt *credit, wrl_creditt credit_ceil) + /* + * Transfers zero or more credit from "debit" to "credit". + * Transfers as much as possible while maintaining + * debit >= debit_floor and credit <= credit_ceil. + * (If that's violated already, does nothing.) + * + * Sufficient conditions to avoid overflow, either of: + * |every argument| <= 0x3fffffff + * |every argument| <= 1E9 + * |every argument| <= WRL_CREDIT_MAX + * (And this condition is preserved.) + */ +{ + wrl_creditt xfer = MIN( *debit - debit_floor, + credit_ceil - *credit ); + if (xfer > 0) { + *debit -= xfer; + *credit += xfer; + } +} + +static void wrl_domain_new(struct domain *domain) +{ + domain->wrl_credit = 0; + wrl_gettime_now(&domain->wrl_timestamp); + wrl_ndomains++; + /* Steal up to DBURST from the reserve */ + wrl_xfer_credit(&wrl_reserve, -wrl_config_newdoms_dburst, + &domain->wrl_credit, wrl_config_dburst); +} + +static void wrl_domain_destroy(struct domain *domain) +{ + wrl_ndomains--; + /* + * Don't bother recalculating domain's credit - this just + * means we don't give the reserve the ending domain's credit + * for time elapsed since last update. + */ + wrl_xfer_credit(&domain->wrl_credit, 0, + &wrl_reserve, wrl_config_dburst); +} + +static void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) +{ + /* + * We want to calculate + * credit += (now - timestamp) * RATE / ndoms; + * But we want it to saturate, and to avoid floating point. + * To avoid rounding errors from constantly adding small + * amounts of credit, we only add credit for whole milliseconds. + */ + long seconds = now.sec - domain->wrl_timestamp.sec; + long milliseconds = now.msec - domain->wrl_timestamp.msec; + long msec; + int64_t denom, num; + wrl_creditt surplus; + + seconds = MIN(seconds, 1000*1000); /* arbitrary, prevents overflow */ + msec = seconds * 1000 + milliseconds; + + if (msec < 0) + /* shouldn't happen with CLOCK_MONOTONIC */ + msec = 0; + + /* 32x32 -> 64 cannot overflow */ + denom = (int64_t)msec * wrl_config_rate; + num = (int64_t)wrl_ndomains * 1000; + /* denom / num <= 1E6 * wrl_config_rate, so with + reasonable wrl_config_rate, denom / num << 2^64 */ + + /* at last! */ + domain->wrl_credit = MIN( (int64_t)domain->wrl_credit + denom / num, + WRL_CREDIT_MAX ); + /* (maybe briefly violating the DBURST cap on wrl_credit) */ + + /* maybe take from the reserve to make us nonnegative */ + wrl_xfer_credit(&wrl_reserve, 0, + &domain->wrl_credit, 0); + + /* return any surplus (over DBURST) to the reserve */ + surplus = 0; + wrl_xfer_credit(&domain->wrl_credit, wrl_config_dburst, + &surplus, WRL_CREDIT_MAX); + wrl_xfer_credit(&surplus, 0, + &wrl_reserve, wrl_config_gburst); + /* surplus is now implicitly discarded */ + + domain->wrl_timestamp = now; + + trace_wrl("dom %4d %6ld msec %9ld credit %9ld reserve %9ld discard\n", + domain->domid, msec, (long)domain->wrl_credit, + (long)wrl_reserve, (long)surplus); +} + +void wrl_check_timeout(struct domain *domain, + struct wrl_timestampt now, + int *ptimeout) +{ + uint64_t num, denom; + int wakeup; + + wrl_credit_update(domain, now); + + if (domain->wrl_credit >= 0) + /* not blocked */ + return; + + if (!*ptimeout) + /* already decided on immediate wakeup, + so no need to calculate our timeout */ + return; + + /* calculate wakeup = now + -credit / (RATE / ndoms); */ + + /* credit cannot go more -ve than one transaction, + * so the first multiplication cannot overflow even 32-bit */ + num = (uint64_t)(-domain->wrl_credit * 1000) * wrl_ndomains; + denom = wrl_config_rate; + + wakeup = MIN( num / denom /* uint64_t */, INT_MAX ); + if (*ptimeout==-1 || wakeup < *ptimeout) + *ptimeout = wakeup; + + trace_wrl("domain %u credit=%ld (reserve=%ld) SLEEPING for %d\n", + domain->domid, (long)domain->wrl_credit, (long)wrl_reserve, + wakeup); +} + +#define WRL_LOG(now, ...) \ + (syslog(LOG_WARNING, "write rate limit: " __VA_ARGS__)) + +void wrl_apply_debit_actual(struct domain *domain) +{ + struct wrl_timestampt now; + + if (!domain || !domain_is_unprivileged(domain->conn)) + /* sockets and privileged domain escape the write rate limit */ + return; + + wrl_gettime_now(&now); + wrl_credit_update(domain, now); + + domain->wrl_credit -= wrl_config_writecost; + trace_wrl("domain %u credit=%ld (reserve=%ld)\n", domain->domid, + (long)domain->wrl_credit, (long)wrl_reserve); + + if (domain->wrl_credit < 0) { + if (!domain->wrl_delay_logged) { + domain->wrl_delay_logged = true; + WRL_LOG(now, "domain %ld is affected\n", + (long)domain->domid); + } else if (!wrl_log_last_warning) { + WRL_LOG(now, "rate limiting restarts\n"); + } + wrl_log_last_warning = now.sec; + } +} + +void wrl_log_periodic(struct wrl_timestampt now) +{ + if (wrl_log_last_warning && + (now.sec - wrl_log_last_warning) > WRL_LOGEVERY) { + WRL_LOG(now, "not in force recently\n"); + wrl_log_last_warning = 0; + } +} + +void wrl_apply_debit_direct(struct connection *conn) +{ + if (!conn) + /* some writes are generated internally */ + return; + + if (conn->transaction) + /* these are accounted for when the transaction ends */ + return; + + if (!wrl_ntransactions) + /* we don't conflict with anyone */ + return; + + wrl_apply_debit_actual(conn->domain); +} + +void wrl_apply_debit_trans_commit(struct connection *conn) +{ + if (wrl_ntransactions <= 1) + /* our own transaction appears in the counter */ + return; + + wrl_apply_debit_actual(conn->domain); +} + static bool check_indexes(XENSTORE_RING_IDX cons, XENSTORE_RING_IDX prod) { return ((prod - cons) <= XENSTORE_RING_SIZE); @@ -1445,234 +1673,6 @@ unsigned int domain_transaction_get(struct connection *conn) : 0; } -static wrl_creditt wrl_config_writecost = WRL_FACTOR; -static wrl_creditt wrl_config_rate = WRL_RATE * WRL_FACTOR; -static wrl_creditt wrl_config_dburst = WRL_DBURST * WRL_FACTOR; -static wrl_creditt wrl_config_gburst = WRL_GBURST * WRL_FACTOR; -static wrl_creditt wrl_config_newdoms_dburst = - WRL_DBURST * WRL_NEWDOMS * WRL_FACTOR; - -long wrl_ntransactions; - -static long wrl_ndomains; -static wrl_creditt wrl_reserve; /* [-wrl_config_newdoms_dburst, +_gburst ] */ -static time_t wrl_log_last_warning; /* 0: no previous warning */ - -#define trace_wrl(...) \ -do { \ - if (trace_flags & TRACE_WRL) \ - trace("wrl: " __VA_ARGS__); \ -} while (0) - -void wrl_gettime_now(struct wrl_timestampt *now_wt) -{ - struct timespec now_ts; - int r; - - r = clock_gettime(CLOCK_MONOTONIC, &now_ts); - if (r) - barf_perror("Could not find time (clock_gettime failed)"); - - now_wt->sec = now_ts.tv_sec; - now_wt->msec = now_ts.tv_nsec / 1000000; -} - -static void wrl_xfer_credit(wrl_creditt *debit, wrl_creditt debit_floor, - wrl_creditt *credit, wrl_creditt credit_ceil) - /* - * Transfers zero or more credit from "debit" to "credit". - * Transfers as much as possible while maintaining - * debit >= debit_floor and credit <= credit_ceil. - * (If that's violated already, does nothing.) - * - * Sufficient conditions to avoid overflow, either of: - * |every argument| <= 0x3fffffff - * |every argument| <= 1E9 - * |every argument| <= WRL_CREDIT_MAX - * (And this condition is preserved.) - */ -{ - wrl_creditt xfer = MIN( *debit - debit_floor, - credit_ceil - *credit ); - if (xfer > 0) { - *debit -= xfer; - *credit += xfer; - } -} - -void wrl_domain_new(struct domain *domain) -{ - domain->wrl_credit = 0; - wrl_gettime_now(&domain->wrl_timestamp); - wrl_ndomains++; - /* Steal up to DBURST from the reserve */ - wrl_xfer_credit(&wrl_reserve, -wrl_config_newdoms_dburst, - &domain->wrl_credit, wrl_config_dburst); -} - -void wrl_domain_destroy(struct domain *domain) -{ - wrl_ndomains--; - /* - * Don't bother recalculating domain's credit - this just - * means we don't give the reserve the ending domain's credit - * for time elapsed since last update. - */ - wrl_xfer_credit(&domain->wrl_credit, 0, - &wrl_reserve, wrl_config_dburst); -} - -void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) -{ - /* - * We want to calculate - * credit += (now - timestamp) * RATE / ndoms; - * But we want it to saturate, and to avoid floating point. - * To avoid rounding errors from constantly adding small - * amounts of credit, we only add credit for whole milliseconds. - */ - long seconds = now.sec - domain->wrl_timestamp.sec; - long milliseconds = now.msec - domain->wrl_timestamp.msec; - long msec; - int64_t denom, num; - wrl_creditt surplus; - - seconds = MIN(seconds, 1000*1000); /* arbitrary, prevents overflow */ - msec = seconds * 1000 + milliseconds; - - if (msec < 0) - /* shouldn't happen with CLOCK_MONOTONIC */ - msec = 0; - - /* 32x32 -> 64 cannot overflow */ - denom = (int64_t)msec * wrl_config_rate; - num = (int64_t)wrl_ndomains * 1000; - /* denom / num <= 1E6 * wrl_config_rate, so with - reasonable wrl_config_rate, denom / num << 2^64 */ - - /* at last! */ - domain->wrl_credit = MIN( (int64_t)domain->wrl_credit + denom / num, - WRL_CREDIT_MAX ); - /* (maybe briefly violating the DBURST cap on wrl_credit) */ - - /* maybe take from the reserve to make us nonnegative */ - wrl_xfer_credit(&wrl_reserve, 0, - &domain->wrl_credit, 0); - - /* return any surplus (over DBURST) to the reserve */ - surplus = 0; - wrl_xfer_credit(&domain->wrl_credit, wrl_config_dburst, - &surplus, WRL_CREDIT_MAX); - wrl_xfer_credit(&surplus, 0, - &wrl_reserve, wrl_config_gburst); - /* surplus is now implicitly discarded */ - - domain->wrl_timestamp = now; - - trace_wrl("dom %4d %6ld msec %9ld credit %9ld reserve %9ld discard\n", - domain->domid, msec, (long)domain->wrl_credit, - (long)wrl_reserve, (long)surplus); -} - -void wrl_check_timeout(struct domain *domain, - struct wrl_timestampt now, - int *ptimeout) -{ - uint64_t num, denom; - int wakeup; - - wrl_credit_update(domain, now); - - if (domain->wrl_credit >= 0) - /* not blocked */ - return; - - if (!*ptimeout) - /* already decided on immediate wakeup, - so no need to calculate our timeout */ - return; - - /* calculate wakeup = now + -credit / (RATE / ndoms); */ - - /* credit cannot go more -ve than one transaction, - * so the first multiplication cannot overflow even 32-bit */ - num = (uint64_t)(-domain->wrl_credit * 1000) * wrl_ndomains; - denom = wrl_config_rate; - - wakeup = MIN( num / denom /* uint64_t */, INT_MAX ); - if (*ptimeout==-1 || wakeup < *ptimeout) - *ptimeout = wakeup; - - trace_wrl("domain %u credit=%ld (reserve=%ld) SLEEPING for %d\n", - domain->domid, (long)domain->wrl_credit, (long)wrl_reserve, - wakeup); -} - -#define WRL_LOG(now, ...) \ - (syslog(LOG_WARNING, "write rate limit: " __VA_ARGS__)) - -void wrl_apply_debit_actual(struct domain *domain) -{ - struct wrl_timestampt now; - - if (!domain || !domid_is_unprivileged(domain->domid)) - /* sockets and privileged domain escape the write rate limit */ - return; - - wrl_gettime_now(&now); - wrl_credit_update(domain, now); - - domain->wrl_credit -= wrl_config_writecost; - trace_wrl("domain %u credit=%ld (reserve=%ld)\n", domain->domid, - (long)domain->wrl_credit, (long)wrl_reserve); - - if (domain->wrl_credit < 0) { - if (!domain->wrl_delay_logged) { - domain->wrl_delay_logged = true; - WRL_LOG(now, "domain %ld is affected\n", - (long)domain->domid); - } else if (!wrl_log_last_warning) { - WRL_LOG(now, "rate limiting restarts\n"); - } - wrl_log_last_warning = now.sec; - } -} - -void wrl_log_periodic(struct wrl_timestampt now) -{ - if (wrl_log_last_warning && - (now.sec - wrl_log_last_warning) > WRL_LOGEVERY) { - WRL_LOG(now, "not in force recently\n"); - wrl_log_last_warning = 0; - } -} - -void wrl_apply_debit_direct(struct connection *conn) -{ - if (!conn) - /* some writes are generated internally */ - return; - - if (conn->transaction) - /* these are accounted for when the transaction ends */ - return; - - if (!wrl_ntransactions) - /* we don't conflict with anyone */ - return; - - wrl_apply_debit_actual(conn->domain); -} - -void wrl_apply_debit_trans_commit(struct connection *conn) -{ - if (wrl_ntransactions <= 1) - /* our own transaction appears in the counter */ - return; - - wrl_apply_debit_actual(conn->domain); -} - const char *dump_state_connections(FILE *fp) { const char *ret = NULL; diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 5123453f6c..89be643de4 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -163,9 +163,6 @@ struct wrl_timestampt { extern long wrl_ntransactions; void wrl_gettime_now(struct wrl_timestampt *now_ts); -void wrl_domain_new(struct domain *domain); -void wrl_domain_destroy(struct domain *domain); -void wrl_credit_update(struct domain *domain, struct wrl_timestampt now); void wrl_check_timeout(struct domain *domain, struct wrl_timestampt now, int *ptimeout); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:05:57 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:05:57 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546466.853396 (Exim 4.92) (envelope-from ) id 1q7tbh-0007vg-Aa; Sat, 10 Jun 2023 08:05:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546466.853396; Sat, 10 Jun 2023 08:05:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbh-0007vZ-79; Sat, 10 Jun 2023 08:05:57 +0000 Received: by outflank-mailman (input) for mailman id 546466; Sat, 10 Jun 2023 08:05:56 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbg-0007vJ-2A for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbg-0005Mz-1P for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tbg-0002Q5-0a for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:05:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Fj9vhmG6/yp287lRfeI2cIMvrHJ1mIO4egJ6uAORFW8=; b=3sFuV1PHW3nkhkD0R/xeC0+xlu 7sry7YtReMLfVe01czYVUHTtice+FFmL8i2tY/JXm0XamqGfso+QWUB2Xb4+fxYsKWXISH75TpJMz UvEIa5bGsKNVXQxj/uI7eM8AYgNuSZZA98GQMRXdvq7hYPWRMBH3iuJr7/0NQVrXQaL4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: switch write limiting to use millisecond time base Message-Id: Date: Sat, 10 Jun 2023 08:05:56 +0000 commit f28a3b49d3f338c4cd451905032b10bb2a7e9e8c Author: Juergen Gross AuthorDate: Tue May 30 10:54:08 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: switch write limiting to use millisecond time base There is no need to keep struct wrl_timestampt, as it serves the same purpose as the more simple time base provided by get_now(). Move some more stuff from xenstored_domain.h into xenstored_domain.c as it is being used nowhere else. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_core.c | 8 +++--- tools/xenstore/xenstored_core.h | 7 +++-- tools/xenstore/xenstored_domain.c | 56 +++++++++++++++++---------------------- tools/xenstore/xenstored_domain.h | 21 ++------------- 4 files changed, 32 insertions(+), 60 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index c467a704a1..e8f46495de 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -192,7 +192,7 @@ void reopen_log(void) } } -static uint64_t get_now_msec(void) +uint64_t get_now_msec(void) { struct timespec now_ts; @@ -510,7 +510,6 @@ fail: static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) { struct connection *conn; - struct wrl_timestampt now; uint64_t msecs; if (fds) @@ -530,13 +529,12 @@ static void initialize_fds(int *p_sock_pollfd_idx, int *ptimeout) xce_pollfd_idx = set_fd(xenevtchn_fd(xce_handle), POLLIN|POLLPRI); - wrl_gettime_now(&now); - wrl_log_periodic(now); msecs = get_now_msec(); + wrl_log_periodic(msecs); list_for_each_entry(conn, &connections, list) { if (conn->domain) { - wrl_check_timeout(conn->domain, now, ptimeout); + wrl_check_timeout(conn->domain, msecs, ptimeout); check_event_timeout(conn, msecs, ptimeout); if (conn_can_read(conn) || (conn_can_write(conn) && diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 92d5b50f3c..84a611cbb5 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -47,10 +47,6 @@ /* DEFAULT_BUFFER_SIZE should be large enough for each errno string. */ #define DEFAULT_BUFFER_SIZE 16 -typedef int32_t wrl_creditt; -#define WRL_CREDIT_MAX (1000*1000*1000) -/* ^ satisfies non-overflow condition for wrl_xfer_credit */ - struct xs_state_connection; struct buffered_data @@ -320,6 +316,9 @@ extern bool keep_orphans; extern unsigned int timeout_watch_event_msec; +/* Get internal time in milliseconds. */ +uint64_t get_now_msec(void); + /* Map the kernel's xenstore page. */ void *xenbus_map(void); void unmap_xenbus(void *interface); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 9ef0d994f6..632ddb5efc 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -99,6 +99,8 @@ struct quota soft_quotas[ACC_N] = { }, }; +typedef int32_t wrl_creditt; + struct domain { /* The id of this domain */ @@ -139,7 +141,7 @@ struct domain /* write rate limit */ wrl_creditt wrl_credit; /* [ -wrl_config_writecost, +_dburst ] */ - struct wrl_timestampt wrl_timestamp; + uint64_t wrl_timestamp; bool wrl_delay_logged; }; @@ -157,6 +159,17 @@ struct changed_domain static struct hashtable *domhash; +/* Write rate limiting */ + +/* Satisfies non-overflow condition for wrl_xfer_credit. */ +#define WRL_CREDIT_MAX (1000*1000*1000) +#define WRL_FACTOR 1000 /* for fixed-point arithmetic */ +#define WRL_RATE 200 +#define WRL_DBURST 10 +#define WRL_GBURST 1000 +#define WRL_NEWDOMS 5 +#define WRL_LOGEVERY 120 /* seconds */ + static wrl_creditt wrl_config_writecost = WRL_FACTOR; static wrl_creditt wrl_config_rate = WRL_RATE * WRL_FACTOR; static wrl_creditt wrl_config_dburst = WRL_DBURST * WRL_FACTOR; @@ -176,19 +189,6 @@ do { \ trace("wrl: " __VA_ARGS__); \ } while (0) -void wrl_gettime_now(struct wrl_timestampt *now_wt) -{ - struct timespec now_ts; - int r; - - r = clock_gettime(CLOCK_MONOTONIC, &now_ts); - if (r) - barf_perror("Could not find time (clock_gettime failed)"); - - now_wt->sec = now_ts.tv_sec; - now_wt->msec = now_ts.tv_nsec / 1000000; -} - static void wrl_xfer_credit(wrl_creditt *debit, wrl_creditt debit_floor, wrl_creditt *credit, wrl_creditt credit_ceil) /* @@ -215,7 +215,7 @@ static void wrl_xfer_credit(wrl_creditt *debit, wrl_creditt debit_floor, static void wrl_domain_new(struct domain *domain) { domain->wrl_credit = 0; - wrl_gettime_now(&domain->wrl_timestamp); + domain->wrl_timestamp = get_now_msec(); wrl_ndomains++; /* Steal up to DBURST from the reserve */ wrl_xfer_credit(&wrl_reserve, -wrl_config_newdoms_dburst, @@ -234,7 +234,7 @@ static void wrl_domain_destroy(struct domain *domain) &wrl_reserve, wrl_config_dburst); } -static void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) +static void wrl_credit_update(struct domain *domain, uint64_t now) { /* * We want to calculate @@ -243,18 +243,12 @@ static void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) * To avoid rounding errors from constantly adding small * amounts of credit, we only add credit for whole milliseconds. */ - long seconds = now.sec - domain->wrl_timestamp.sec; - long milliseconds = now.msec - domain->wrl_timestamp.msec; long msec; int64_t denom, num; wrl_creditt surplus; - seconds = MIN(seconds, 1000*1000); /* arbitrary, prevents overflow */ - msec = seconds * 1000 + milliseconds; - - if (msec < 0) - /* shouldn't happen with CLOCK_MONOTONIC */ - msec = 0; + /* Prevent overflow by limiting to 32 bits. */ + msec = MIN(now - domain->wrl_timestamp, 1000 * 1000 * 1000); /* 32x32 -> 64 cannot overflow */ denom = (int64_t)msec * wrl_config_rate; @@ -286,9 +280,7 @@ static void wrl_credit_update(struct domain *domain, struct wrl_timestampt now) (long)wrl_reserve, (long)surplus); } -void wrl_check_timeout(struct domain *domain, - struct wrl_timestampt now, - int *ptimeout) +void wrl_check_timeout(struct domain *domain, uint64_t now, int *ptimeout) { uint64_t num, denom; int wakeup; @@ -325,13 +317,13 @@ void wrl_check_timeout(struct domain *domain, void wrl_apply_debit_actual(struct domain *domain) { - struct wrl_timestampt now; + uint64_t now; if (!domain || !domain_is_unprivileged(domain->conn)) /* sockets and privileged domain escape the write rate limit */ return; - wrl_gettime_now(&now); + now = get_now_msec(); wrl_credit_update(domain, now); domain->wrl_credit -= wrl_config_writecost; @@ -346,14 +338,14 @@ void wrl_apply_debit_actual(struct domain *domain) } else if (!wrl_log_last_warning) { WRL_LOG(now, "rate limiting restarts\n"); } - wrl_log_last_warning = now.sec; + wrl_log_last_warning = now / 1000; } } -void wrl_log_periodic(struct wrl_timestampt now) +void wrl_log_periodic(uint64_t now) { if (wrl_log_last_warning && - (now.sec - wrl_log_last_warning) > WRL_LOGEVERY) { + (now / 1000 - wrl_log_last_warning) > WRL_LOGEVERY) { WRL_LOG(now, "not in force recently\n"); wrl_log_last_warning = 0; } diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index 89be643de4..bf63f3fcc6 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -146,27 +146,10 @@ void domain_reset_global_acc(void); bool domain_max_chk(const struct connection *conn, unsigned int what, unsigned int val); -/* Write rate limiting */ - -#define WRL_FACTOR 1000 /* for fixed-point arithmetic */ -#define WRL_RATE 200 -#define WRL_DBURST 10 -#define WRL_GBURST 1000 -#define WRL_NEWDOMS 5 -#define WRL_LOGEVERY 120 /* seconds */ - -struct wrl_timestampt { - time_t sec; - int msec; -}; - extern long wrl_ntransactions; -void wrl_gettime_now(struct wrl_timestampt *now_ts); -void wrl_check_timeout(struct domain *domain, - struct wrl_timestampt now, - int *ptimeout); -void wrl_log_periodic(struct wrl_timestampt now); +void wrl_check_timeout(struct domain *domain, uint64_t now, int *ptimeout); +void wrl_log_periodic(uint64_t now); void wrl_apply_debit_direct(struct connection *conn); void wrl_apply_debit_trans_commit(struct connection *conn); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:06:07 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:06:07 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546467.853400 (Exim 4.92) (envelope-from ) id 1q7tbr-0007yu-EX; Sat, 10 Jun 2023 08:06:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546467.853400; Sat, 10 Jun 2023 08:06:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbr-0007yj-Ah; Sat, 10 Jun 2023 08:06:07 +0000 Received: by outflank-mailman (input) for mailman id 546467; Sat, 10 Jun 2023 08:06:06 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbq-0007yU-5M for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:06 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tbq-0005NM-4Z for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tbq-0002Ql-3f for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=bhd9VnZW0IKdCdvsqS+EtIMpCMJp0Bbg6d5XrsEc3ls=; b=Rhdhoj0AQLcwYpADfDbnBoY8OA 08U+t5U5Jv6hdAofxkcF/a37oJeK9lfWc7MRNst92zkL40Ggy1mYc4AyyIEZ9qM1GdCxZ+B0LHfJy Hg7SUWo8gSm5gavr2KXSLjiExnYPMKeLWP9PFTkzdHfoDb8d92c5wcGBbEEjusJo3Ct4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remove stale TODO file Message-Id: Date: Sat, 10 Jun 2023 08:06:06 +0000 commit 38f430ceb23bcce6cb7243fa438271ed14aeb9df Author: Juergen Gross AuthorDate: Tue May 30 10:54:09 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: remove stale TODO file The TODO file is not really helpful any longer. It contains only entries which no longer apply or it is unknown what they are meant for ("Dynamic/supply nodes", "Remove assumption that rename doesn't fail"). Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/TODO | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/xenstore/TODO b/tools/xenstore/TODO deleted file mode 100644 index 71d5bbbf50..0000000000 --- a/tools/xenstore/TODO +++ /dev/null @@ -1,10 +0,0 @@ -TODO in no particular order. Some of these will never be done. There -are omissions of important but necessary things. It is up to the -reader to fill in the blanks. - -- Timeout failed watch responses -- Dynamic/supply nodes -- Persistant storage of introductions, watches and transactions, so daemon can restart -- Remove assumption that rename doesn't fail -- Multi-root transactions, for setting up front and back ends at same time. - -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:06:17 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:06:17 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546468.853404 (Exim 4.92) (envelope-from ) id 1q7tc1-00081o-Fa; Sat, 10 Jun 2023 08:06:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546468.853404; Sat, 10 Jun 2023 08:06:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tc1-00081g-Cj; Sat, 10 Jun 2023 08:06:17 +0000 Received: by outflank-mailman (input) for mailman id 546468; Sat, 10 Jun 2023 08:06:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tc0-00081W-8I for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tc0-0005NS-7b for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tc0-0002RV-6l for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XNbBJZ+5tWOc40V4mGYtz40BxJAg8aALk+ahojsgawI=; b=tSnBHlh5K+SP1v9R4EpGAnPjDg 7cBKgJObgJFDWrk6kA0Ga3+y0+6n0BzIh/KKaeHUdtu2CS95cTTL/mk29nWhnhVZcat4pgJwryZYk W+LuWns5VWVw7ep8RWEjhfglG+eY9WDbxOyb3PJk21iEQ7Jy9jcLHHTWzyVMGGUrQBX8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remove unused events list Message-Id: Date: Sat, 10 Jun 2023 08:06:16 +0000 commit 2b58b249cde902e075c09b9a9149e3f7800e9c77 Author: Juergen Gross AuthorDate: Tue May 30 10:54:10 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: remove unused events list struct watch contains an unused struct list_head events. Remove it. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/xenstored_watch.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c index e8eb35de02..4195c59e17 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -36,9 +36,6 @@ struct watch /* Watches on this connection */ struct list_head list; - /* Current outstanding events applying to this watch. */ - struct list_head events; - /* Offset into path for skipping prefix (used for relative paths). */ unsigned int prefix_len; @@ -205,8 +202,6 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token, watch->prefix_len = relative ? strlen(get_implicit_path(conn)) + 1 : 0; - INIT_LIST_HEAD(&watch->events); - domain_watch_inc(conn); list_add_tail(&watch->list, &conn->watches); talloc_set_destructor(watch, destroy_watch); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:06:27 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:06:27 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546469.853407 (Exim 4.92) (envelope-from ) id 1q7tcB-00084x-Gz; Sat, 10 Jun 2023 08:06:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546469.853407; Sat, 10 Jun 2023 08:06:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcB-00084q-EM; Sat, 10 Jun 2023 08:06:27 +0000 Received: by outflank-mailman (input) for mailman id 546469; Sat, 10 Jun 2023 08:06:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcA-00084f-Bf for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcA-0005Ni-An for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tcA-0002S4-9u for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XUAon5u+dQLhcn54/exvh0zXarn66mkTiFTmNOgR068=; b=09eDqg1vt2SWzQJi8URnB8f/Mn plUd15toN5lLIOxG/FiunexdpmTXO/R568br2vCEHdDf8ndcgDJ093DZvRU2oGCYN4h077RrWIGOW OSkhjDFG1he6zzGWF891pBGBP+URTHwRWKbz3HtR3zjd3/ZyYlJetMKfTbBpgyCX9DUc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remove support of file backed data base Message-Id: Date: Sat, 10 Jun 2023 08:06:26 +0000 commit 5b02f568d37522fb30d6867dbac79421caad88de Author: Juergen Gross AuthorDate: Tue May 30 10:54:11 2023 +0200 Commit: Julien Grall CommitDate: Fri Jun 9 19:16:46 2023 +0100 tools/xenstore: remove support of file backed data base In order to prepare the replacement of TDB with direct accessible nodes in memory, remove the support for a file backed data base. This allows to remove xs_tdb_dump, too. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- .gitignore | 1 - tools/xenstore/Makefile | 5 +-- tools/xenstore/xenstored_core.c | 18 ++------- tools/xenstore/xs_tdb_dump.c | 86 ----------------------------------------- 4 files changed, 4 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index c94c51ade3..c1b73b0968 100644 --- a/.gitignore +++ b/.gitignore @@ -248,7 +248,6 @@ tools/xenstore/xenstore-rm tools/xenstore/xenstore-watch tools/xenstore/xenstore-write tools/xenstore/xenstored -tools/xenstore/xs_tdb_dump tools/xentop/xentop tools/xentrace/xentrace_setsize tools/xentrace/tbctl diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index ce7a68178f..56723139a1 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -29,7 +29,7 @@ CLIENTS += xenstore-write xenstore-ls xenstore-watch TARGETS := xenstore $(CLIENTS) xenstore-control ifeq ($(XENSTORE_XENSTORED),y) -TARGETS += xs_tdb_dump xenstored +TARGETS += xenstored endif .PHONY: all @@ -50,9 +50,6 @@ xenstore: xenstore_client.o xs_lib.o xenstore-control: xenstore_control.o $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) -xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o - $(CC) $(LDFLAGS) $^ -o $@ $(APPEND_LDFLAGS) - .PHONY: clean clean:: $(RM) $(TARGETS) $(DEPS_RM) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index e8f46495de..07fbac55ac 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2301,8 +2301,6 @@ static void accept_connection(int sock) } #endif -static int tdb_flags = TDB_INTERNAL | TDB_NOLOCK; - /* We create initial nodes manually. */ static void manual_node(const char *name, const char *child) { @@ -2354,14 +2352,11 @@ void setup_structure(bool live_update) { char *tdbname; - tdbname = talloc_strdup(talloc_autofree_context(), xs_daemon_tdb()); + tdbname = talloc_strdup(talloc_autofree_context(), "/dev/mem"); if (!tdbname) barf_perror("Could not create tdbname"); - if (!(tdb_flags & TDB_INTERNAL)) - unlink(tdbname); - - tdb_ctx = tdb_open_ex(tdbname, 7919, tdb_flags, + tdb_ctx = tdb_open_ex(tdbname, 7919, TDB_INTERNAL | TDB_NOLOCK, O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0640, &tdb_logger, NULL); if (!tdb_ctx) @@ -2659,8 +2654,6 @@ static void usage(void) " watch-event: time a watch-event is kept pending\n" " -R, --no-recovery to request that no recovery should be attempted when\n" " the store is corrupted (debug only),\n" -" -I, --internal-db [on|off] store database in memory, not on disk, default is\n" -" memory, with \"--internal-db off\" it is on disk\n" " -K, --keep-orphans don't delete nodes owned by a domain when the\n" " domain is deleted (this is a security risk!)\n" " -V, --verbose to request verbose execution.\n"); @@ -2687,7 +2680,6 @@ static struct option options[] = { { "quota-soft", 1, NULL, 'q' }, { "timeout", 1, NULL, 'w' }, { "no-recovery", 0, NULL, 'R' }, - { "internal-db", 2, NULL, 'I' }, { "keep-orphans", 0, NULL, 'K' }, { "verbose", 0, NULL, 'V' }, { "watch-nb", 1, NULL, 'W' }, @@ -2811,7 +2803,7 @@ int main(int argc, char *argv[]) orig_argv = argv; while ((opt = getopt_long(argc, argv, - "DE:F:HI::KNPS:t:A:M:Q:q:T:RVW:w:U", + "DE:F:H::KNPS:t:A:M:Q:q:T:RVW:w:U", options, NULL)) != -1) { switch (opt) { case 'D': @@ -2848,10 +2840,6 @@ int main(int argc, char *argv[]) if (set_trace_switch(optarg)) barf("Illegal trace switch \"%s\"\n", optarg); break; - case 'I': - if (optarg && !strcmp(optarg, "off")) - tdb_flags = 0; - break; case 'K': keep_orphans = true; break; diff --git a/tools/xenstore/xs_tdb_dump.c b/tools/xenstore/xs_tdb_dump.c deleted file mode 100644 index 5d2db392b4..0000000000 --- a/tools/xenstore/xs_tdb_dump.c +++ /dev/null @@ -1,86 +0,0 @@ -/* Simple program to dump out all records of TDB */ -#include -#include -#include -#include -#include -#include -#include -#include "xenstore_lib.h" -#include "tdb.h" -#include "talloc.h" -#include "utils.h" - -static uint32_t total_size(struct xs_tdb_record_hdr *hdr) -{ - return sizeof(*hdr) + hdr->num_perms * sizeof(struct xs_permissions) - + hdr->datalen + hdr->childlen; -} - -static char perm_to_char(unsigned int perm) -{ - return perm == XS_PERM_READ ? 'r' : - perm == XS_PERM_WRITE ? 'w' : - perm == XS_PERM_NONE ? '-' : - perm == (XS_PERM_READ|XS_PERM_WRITE) ? 'b' : - '?'; -} - -static void tdb_logger(TDB_CONTEXT *tdb, int level, const char * fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); -} - -int main(int argc, char *argv[]) -{ - TDB_DATA key; - TDB_CONTEXT *tdb; - - if (argc != 2) - barf("Usage: xs_tdb_dump "); - - tdb = tdb_open_ex(talloc_strdup(NULL, argv[1]), 0, 0, O_RDONLY, 0, - &tdb_logger, NULL); - if (!tdb) - barf_perror("Could not open %s", argv[1]); - - key = tdb_firstkey(tdb); - while (key.dptr) { - TDB_DATA data; - struct xs_tdb_record_hdr *hdr; - - data = tdb_fetch(tdb, key); - hdr = (void *)data.dptr; - if (data.dsize < sizeof(*hdr)) - fprintf(stderr, "%.*s: BAD truncated\n", - (int)key.dsize, key.dptr); - else if (data.dsize != total_size(hdr)) - fprintf(stderr, "%.*s: BAD length %zu for %u/%u/%u (%u)\n", - (int)key.dsize, key.dptr, data.dsize, - hdr->num_perms, hdr->datalen, - hdr->childlen, total_size(hdr)); - else { - unsigned int i; - char *p; - - printf("%.*s: ", (int)key.dsize, key.dptr); - for (i = 0; i < hdr->num_perms; i++) - printf("%s%c%u", - i == 0 ? "" : ",", - perm_to_char(hdr->perms[i].perms), - hdr->perms[i].id); - p = (void *)&hdr->perms[hdr->num_perms]; - printf(" %.*s\n", hdr->datalen, p); - p += hdr->datalen; - for (i = 0; i < hdr->childlen; i += strlen(p+i)+1) - printf("\t-> %s\n", p+i); - } - key = tdb_nextkey(tdb, key); - } - return 0; -} - -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:06:37 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:06:37 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546470.853412 (Exim 4.92) (envelope-from ) id 1q7tcL-00087l-JN; Sat, 10 Jun 2023 08:06:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546470.853412; Sat, 10 Jun 2023 08:06:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcL-00087e-G2; Sat, 10 Jun 2023 08:06:37 +0000 Received: by outflank-mailman (input) for mailman id 546470; Sat, 10 Jun 2023 08:06:36 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcK-00087T-Ei for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:36 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcK-0005Np-Du for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tcK-0002SW-D3 for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YBaCmtCTT3tSJLy4OSOZqlJgllzR45gXi6qetE0213A=; b=ZOOUgE1IbRSvWprVZ08z6AfVe5 bwo2affBc3WdI9U2X3UR/dVQ7vP7bOn5MRUkTm1Ht2MY7Cvu7aiNrLI0SoBNHknkX8HoC+vdijR80 lvM7UrQagrmmABSIjwRX46yF+RpjZVEQk0x1y3fsaYfXKKMLn7T+PrDMVOo8q/H2D2sw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] CI: Add Ocaml to the alpine containers Message-Id: Date: Sat, 10 Jun 2023 08:06:36 +0000 commit 961a63e13b9d1bf15992a7fab914cd2a50e06985 Author: Andrew Cooper AuthorDate: Fri Jun 9 16:59:20 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 9 20:13:22 2023 +0100 CI: Add Ocaml to the alpine containers This gets more coverage of optional parts of the build, and makes it easier to trial Ocaml related changes in the smoke tests. Signed-off-by: Andrew Cooper Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++ automation/build/alpine/3.12.dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/build/alpine/3.12-arm64v8.dockerfile index 3f1e6a3fc6..1be3bf7805 100644 --- a/automation/build/alpine/3.12-arm64v8.dockerfile +++ b/automation/build/alpine/3.12-arm64v8.dockerfile @@ -28,6 +28,8 @@ RUN apk --no-cache add \ make \ musl-dev \ ncurses-dev \ + ocaml \ + ocaml-findlib \ patch \ python3-dev \ texinfo \ diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile index c847aa82d9..72ad3a07ad 100644 --- a/automation/build/alpine/3.12.dockerfile +++ b/automation/build/alpine/3.12.dockerfile @@ -30,6 +30,8 @@ RUN apk --no-cache add \ make \ musl-dev \ ncurses-dev \ + ocaml \ + ocaml-findlib \ patch \ python3-dev \ texinfo \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 10 08:06:47 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Jun 2023 08:06:47 +0000 Received: from list by lists.xenproject.org with outflank-mailman.546471.853415 (Exim 4.92) (envelope-from ) id 1q7tcV-0008AR-LA; Sat, 10 Jun 2023 08:06:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 546471.853415; Sat, 10 Jun 2023 08:06:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcV-0008AJ-IQ; Sat, 10 Jun 2023 08:06:47 +0000 Received: by outflank-mailman (input) for mailman id 546471; Sat, 10 Jun 2023 08:06:46 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcU-0008A7-Hr for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:46 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q7tcU-0005OB-Gx for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q7tcU-0002Sz-GC for xen-changelog@lists.xenproject.org; Sat, 10 Jun 2023 08:06:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZGeJ6sC33fJA9MqpDNh0FvoemZd/DiPcJwlYtGceuSE=; b=wJPeIOC35dEFBY9Ox6w4K7dVxu fjJRCAxOODcz9UI/lE7ymJTCP4iC2VuWXPSUC3AcHHOvxL70nS/kRxxrRR5zKaDlGGViPBHPXrCKe RfboeC2+v3PR0OWtvrmfKzQiptTyYhgO0yyUfxImvFSMqCpXF+NLURhOzpErFy4vjan4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/ocaml/xc: Fix xc_physinfo() bindings Message-Id: Date: Sat, 10 Jun 2023 08:06:46 +0000 commit b4642c32c4d079916d5607ddda0232aae5e1690e Author: Andrew Cooper AuthorDate: Thu Jun 8 10:59:37 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 9 20:13:22 2023 +0100 tools/ocaml/xc: Fix xc_physinfo() bindings The original change doesn't compile on ARM: xenctrl_stubs.c: In function 'stub_xc_physinfo': xenctrl_stubs.c:821:16: error: unused variable 'arch_cap_flags_tag' [-Werror=unused-variable] 821 | int r, arch_cap_flags_tag; | ^~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors but it was buggy too. First, it tried storing an int in a pointer slot, causing heap corruption. Next, it is not legitimate to exclude arm32 in the toolstack as it explicitly can operate an arm64 toolstack and build arm64 domains. That in turn means that you can't stash a C uint32_t in an OCaml int. Rewrite the arch_capabilities handling from scratch. Break it out into a separate function, and make the construction of arch_physinfo_cap_flags common to prevent other indirection bugs. Reintroduce arm_physinfo_caps with the fields broken out. Fixes: 56a7aaa16bfe ("tools: add physinfo arch_capabilities handling for Arm") Signed-off-by: Andrew Cooper Acked-by: Christian Lindig --- tools/ocaml/libs/xc/xenctrl.ml | 7 ++++- tools/ocaml/libs/xc/xenctrl.mli | 7 ++++- tools/ocaml/libs/xc/xenctrl_stubs.c | 52 +++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index bf23ca50bb..d6c6eb73db 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -128,10 +128,15 @@ type physinfo_cap_flag = | CAP_Gnttab_v1 | CAP_Gnttab_v2 +type arm_physinfo_caps = + { + sve_vl: int; + } + type x86_physinfo_cap_flag type arch_physinfo_cap_flags = - | ARM of int + | ARM of arm_physinfo_caps | X86 of x86_physinfo_cap_flag list type physinfo = diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index ed1e28ea30..3bfc16edba 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -113,10 +113,15 @@ type physinfo_cap_flag = | CAP_Gnttab_v1 | CAP_Gnttab_v2 +type arm_physinfo_caps = + { + sve_vl: int; + } + type x86_physinfo_cap_flag type arch_physinfo_cap_flags = - | ARM of int + | ARM of arm_physinfo_caps | X86 of x86_physinfo_cap_flag list type physinfo = { diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index a03da31f6f..e4d9070f2d 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -812,13 +812,46 @@ CAMLprim value stub_xc_send_debug_keys(value xch_val, value keys) CAMLreturn(Val_unit); } +CAMLprim value physinfo_arch_caps(const xc_physinfo_t *info) +{ + CAMLparam0(); + CAMLlocal2(arch_cap_flags, arch_obj); + int tag = -1; + +#if defined(__arm__) || defined(__aarch64__) + + tag = 0; /* tag ARM */ + + arch_obj = caml_alloc_tuple(1); + + Store_field(arch_obj, 0, + Val_int(MASK_EXTR(info->arch_capabilities, + XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK) * 128)); + +#elif defined(__i386__) || defined(__x86_64__) + + tag = 1; /* tag x86 */ + + arch_obj = Tag_cons; + +#endif + + if ( tag < 0 ) + caml_failwith("Unhandled architecture"); + + arch_cap_flags = caml_alloc_small(1, tag); + Store_field(arch_cap_flags, 0, arch_obj); + + CAMLreturn(arch_cap_flags); +} + CAMLprim value stub_xc_physinfo(value xch_val) { CAMLparam1(xch_val); - CAMLlocal4(physinfo, cap_list, arch_cap_flags, arch_cap_list); + CAMLlocal2(physinfo, cap_list); xc_interface *xch = xch_of_val(xch_val); xc_physinfo_t c_physinfo; - int r, arch_cap_flags_tag; + int r; caml_enter_blocking_section(); r = xc_physinfo(xch, &c_physinfo); @@ -846,20 +879,7 @@ CAMLprim value stub_xc_physinfo(value xch_val) Store_field(physinfo, 7, caml_copy_nativeint(c_physinfo.scrub_pages)); Store_field(physinfo, 8, cap_list); Store_field(physinfo, 9, Val_int(c_physinfo.max_cpu_id + 1)); - -#if defined(__i386__) || defined(__x86_64__) - arch_cap_list = Tag_cons; - - arch_cap_flags_tag = 1; /* tag x86 */ - - arch_cap_flags = caml_alloc_small(1, arch_cap_flags_tag); - Store_field(arch_cap_flags, 0, arch_cap_list); - Store_field(physinfo, 10, arch_cap_flags); -#elif defined(__aarch64__) - Store_field(physinfo, 10, Val_int(c_physinfo.arch_capabilities)); -#else - caml_failwith("Unhandled architecture"); -#endif + Store_field(physinfo, 10, physinfo_arch_caps(&c_physinfo)); CAMLreturn(physinfo); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:22:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:22:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548678.856728 (Exim 4.92) (envelope-from ) id 1q9Nda-0005N0-Ne; Wed, 14 Jun 2023 10:22:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548678.856728; Wed, 14 Jun 2023 10:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nda-0005Ms-KW; Wed, 14 Jun 2023 10:22:02 +0000 Received: by outflank-mailman (input) for mailman id 548678; Wed, 14 Jun 2023 10:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nda-0005Mm-2s for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nda-00077b-0y for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9NdZ-0004uR-W0 for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7rTCjq2OEeEH1YN8YC/JRzxXjeIN/T59SACd3YQkw98=; b=b53upqCrhewDRpW4eFOoN9P0+N kESBtFuMLsK7WGifFUm5DVUS05KldHZsL0FYdUA2IvsyhCASaC7Ha+DwXBefNanUXF2T2Zs3qEWBE YDGkb7FSbHfUN70UckDf5ROh0oyyogdkyPW0wq7jyM2vraUBu+d5a9XStF/zs6ATwtnw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: rename guest_cpuinfo in domain_cpuinfo Message-Id: Date: Wed, 14 Jun 2023 10:22:01 +0000 commit 84ac67cd1e3df780c413cd7093aa3ad8d508b79a Author: Bertrand Marquis AuthorDate: Mon Jun 12 15:00:46 2023 +0200 Commit: Julien Grall CommitDate: Mon Jun 12 22:34:13 2023 +0100 xen/arm: rename guest_cpuinfo in domain_cpuinfo Rename the guest_cpuinfo structure to domain_cpuinfo as it is not only used for guests but also for dom0 so domain is a more suitable name. While there also rename the create_guest_cpuinfo function to create_domain_cpuinfo to be coherent and fix comments accordingly. Signed-off-by: Bertrand Marquis --- xen/arch/arm/arm64/vsysreg.c | 6 ++--- xen/arch/arm/cpufeature.c | 44 +++++++++++++++++------------------ xen/arch/arm/include/asm/cpufeature.h | 2 +- xen/arch/arm/vcpreg.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index fe31f7b382..b5d54c569b 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -76,7 +76,7 @@ TVM_REG(CONTEXTIDR_EL1) case HSR_SYSREG_##reg: \ { \ return handle_ro_read_val(regs, regidx, hsr.sysreg.read, hsr, \ - 1, guest_cpuinfo.field.bits[offset]); \ + 1, domain_cpuinfo.field.bits[offset]); \ } void do_sysreg(struct cpu_user_regs *regs, @@ -300,7 +300,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_ID_AA64PFR0_EL1: { - register_t guest_reg_value = guest_cpuinfo.pfr64.bits[0]; + register_t guest_reg_value = domain_cpuinfo.pfr64.bits[0]; if ( is_sve_domain(v->domain) ) { @@ -336,7 +336,7 @@ void do_sysreg(struct cpu_user_regs *regs, * When the guest has the SVE feature enabled, the whole id_aa64zfr0_el1 * needs to be exposed. */ - register_t guest_reg_value = guest_cpuinfo.zfr64.bits[0]; + register_t guest_reg_value = domain_cpuinfo.zfr64.bits[0]; if ( is_sve_domain(v->domain) ) guest_reg_value = system_cpuinfo.zfr64.bits[0]; diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index b53e1a9776..f43d5cb338 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -14,7 +14,7 @@ DECLARE_BITMAP(cpu_hwcaps, ARM_NCAPS); -struct cpuinfo_arm __read_mostly guest_cpuinfo; +struct cpuinfo_arm __read_mostly domain_cpuinfo; #ifdef CONFIG_ARM_64 static bool has_sb_instruction(const struct arm_cpu_capabilities *entry) @@ -190,46 +190,46 @@ void identify_cpu(struct cpuinfo_arm *c) /* * This function is creating a cpuinfo structure with values modified to mask - * all cpu features that should not be published to guest. - * The created structure is then used to provide ID registers values to guests. + * all cpu features that should not be published to domains. + * The created structure is then used to provide ID registers values to domains. */ -static int __init create_guest_cpuinfo(void) +static int __init create_domain_cpuinfo(void) { - /* Use the sanitized cpuinfo as initial guest cpuinfo */ - guest_cpuinfo = system_cpuinfo; + /* Use the sanitized cpuinfo as initial domain cpuinfo */ + domain_cpuinfo = system_cpuinfo; #ifdef CONFIG_ARM_64 /* Hide MPAM support as xen does not support it */ - guest_cpuinfo.pfr64.mpam = 0; - guest_cpuinfo.pfr64.mpam_frac = 0; + domain_cpuinfo.pfr64.mpam = 0; + domain_cpuinfo.pfr64.mpam_frac = 0; /* Hide SVE by default */ - guest_cpuinfo.pfr64.sve = 0; - guest_cpuinfo.zfr64.bits[0] = 0; + domain_cpuinfo.pfr64.sve = 0; + domain_cpuinfo.zfr64.bits[0] = 0; /* Hide MTE support as Xen does not support it */ - guest_cpuinfo.pfr64.mte = 0; + domain_cpuinfo.pfr64.mte = 0; /* Hide PAC support as Xen does not support it */ - guest_cpuinfo.isa64.apa = 0; - guest_cpuinfo.isa64.api = 0; - guest_cpuinfo.isa64.gpa = 0; - guest_cpuinfo.isa64.gpi = 0; + domain_cpuinfo.isa64.apa = 0; + domain_cpuinfo.isa64.api = 0; + domain_cpuinfo.isa64.gpa = 0; + domain_cpuinfo.isa64.gpi = 0; #endif /* Hide AMU support */ #ifdef CONFIG_ARM_64 - guest_cpuinfo.pfr64.amu = 0; + domain_cpuinfo.pfr64.amu = 0; #endif - guest_cpuinfo.pfr32.amu = 0; + domain_cpuinfo.pfr32.amu = 0; /* Hide RAS support as Xen does not support it */ #ifdef CONFIG_ARM_64 - guest_cpuinfo.pfr64.ras = 0; - guest_cpuinfo.pfr64.ras_frac = 0; + domain_cpuinfo.pfr64.ras = 0; + domain_cpuinfo.pfr64.ras_frac = 0; #endif - guest_cpuinfo.pfr32.ras = 0; - guest_cpuinfo.pfr32.ras_frac = 0; + domain_cpuinfo.pfr32.ras = 0; + domain_cpuinfo.pfr32.ras_frac = 0; return 0; } @@ -237,7 +237,7 @@ static int __init create_guest_cpuinfo(void) * This function needs to be run after all smp are started to have * cpuinfo structures for all cores. */ -__initcall(create_guest_cpuinfo); +__initcall(create_domain_cpuinfo); /* * Local variables: diff --git a/xen/arch/arm/include/asm/cpufeature.h b/xen/arch/arm/include/asm/cpufeature.h index 03fe684b4d..894f278a4a 100644 --- a/xen/arch/arm/include/asm/cpufeature.h +++ b/xen/arch/arm/include/asm/cpufeature.h @@ -461,7 +461,7 @@ static inline void update_system_features(const struct cpuinfo_arm *cpuinfo) extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] -extern struct cpuinfo_arm guest_cpuinfo; +extern struct cpuinfo_arm domain_cpuinfo; #endif /* __ASSEMBLY__ */ diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index 4adfc0a68d..39aeda9dab 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -169,7 +169,7 @@ TVM_REG32(CONTEXTIDR, CONTEXTIDR_EL1) case HSR_CPREG32(reg): \ { \ return handle_ro_read_val(regs, regidx, cp32.read, hsr, 1, \ - guest_cpuinfo.field.bits[offset]);\ + domain_cpuinfo.field.bits[offset]);\ } /* helper to define cases for all registers for one CRm value */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:22:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:22:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548679.856732 (Exim 4.92) (envelope-from ) id 1q9Ndk-0005Oi-Oq; Wed, 14 Jun 2023 10:22:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548679.856732; Wed, 14 Jun 2023 10:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ndk-0005OY-MA; Wed, 14 Jun 2023 10:22:12 +0000 Received: by outflank-mailman (input) for mailman id 548679; Wed, 14 Jun 2023 10:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ndk-0005OS-5G for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ndk-00077l-4I for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9Ndk-0004vQ-3F for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=GjPzWJjhxRxKhBVK75ILCPm3uUH3tkDUPs4Owi6iMLI=; b=HpOjoASRrbEfKHimCzf/zu7hs0 9gMwepRLyhEUWBCA0Kw2fWgEC5IqFkC9SaTdXD9vp/TcNzG0XbEP8N+14/cr7tz+oGq+IV5BWgih+ xOqh1pGbSvumHEkYlW2jZUC09Oa2mMEVYPsNcnMG2Y/eYWJCb0BNusx0BBVwgcz8M918=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/store: use xen_list.h instead of xenstore/list.h Message-Id: Date: Wed, 14 Jun 2023 10:22:12 +0000 commit 0d5dfd2ed60addc1361ae82cbb52378abc912ede Author: Juergen Gross AuthorDate: Tue May 30 10:54:12 2023 +0200 Commit: Julien Grall CommitDate: Mon Jun 12 22:36:58 2023 +0100 tools/libs/store: use xen_list.h instead of xenstore/list.h Replace the usage of the xenstore private list.h header with the common xen_list.h one. Use the XEN_TAILQ type list, as it allows to directly swap the related macros/functions without having to change the logic. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/libs/store/xs.c | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 7a9a8b1656..3813b69ae2 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -35,13 +35,13 @@ #include #include "xenstore.h" #include "xs_lib.h" -#include "list.h" #include "utils.h" #include +#include struct xs_stored_msg { - struct list_head list; + XEN_TAILQ_ENTRY(struct xs_stored_msg) list; struct xsd_sockmsg hdr; char *body; }; @@ -70,7 +70,7 @@ struct xs_handle { * A list of fired watch messages, protected by a mutex. Users can * wait on the conditional variable until a watch is pending. */ - struct list_head watch_list; + XEN_TAILQ_HEAD(, struct xs_stored_msg) watch_list; pthread_mutex_t watch_mutex; pthread_cond_t watch_condvar; @@ -84,7 +84,7 @@ struct xs_handle { * because we serialise requests. The requester can wait on the * conditional variable for its response. */ - struct list_head reply_list; + XEN_TAILQ_HEAD(, struct xs_stored_msg) reply_list; pthread_mutex_t reply_mutex; pthread_cond_t reply_condvar; @@ -133,8 +133,8 @@ static void *read_thread(void *arg); struct xs_handle { int fd; Xentoolcore__Active_Handle tc_ah; /* for restrict */ - struct list_head reply_list; - struct list_head watch_list; + XEN_TAILQ_HEAD(, struct xs_stored_msg) reply_list; + XEN_TAILQ_HEAD(, struct xs_stored_msg) watch_list; /* Clients can select() on this pipe to wait for a watch to fire. */ int watch_pipe[2]; /* Filtering watch event in unwatch function? */ @@ -180,7 +180,7 @@ int xs_fileno(struct xs_handle *h) if ((h->watch_pipe[0] == -1) && (pipe(h->watch_pipe) != -1)) { /* Kick things off if the watch list is already non-empty. */ - if (!list_empty(&h->watch_list)) + if (!XEN_TAILQ_EMPTY(&h->watch_list)) while (write(h->watch_pipe[1], &c, 1) != 1) continue; } @@ -262,8 +262,8 @@ static struct xs_handle *get_handle(const char *connect_to) if (h->fd == -1) goto err; - INIT_LIST_HEAD(&h->reply_list); - INIT_LIST_HEAD(&h->watch_list); + XEN_TAILQ_INIT(&h->reply_list); + XEN_TAILQ_INIT(&h->watch_list); /* Watch pipe is allocated on demand in xs_fileno(). */ h->watch_pipe[0] = h->watch_pipe[1] = -1; @@ -329,12 +329,12 @@ struct xs_handle *xs_open(unsigned long flags) static void close_free_msgs(struct xs_handle *h) { struct xs_stored_msg *msg, *tmsg; - list_for_each_entry_safe(msg, tmsg, &h->reply_list, list) { + XEN_TAILQ_FOREACH_SAFE(msg, &h->reply_list, list, tmsg) { free(msg->body); free(msg); } - list_for_each_entry_safe(msg, tmsg, &h->watch_list, list) { + XEN_TAILQ_FOREACH_SAFE(msg, &h->watch_list, list, tmsg) { free(msg->body); free(msg); } @@ -459,17 +459,17 @@ static void *read_reply( mutex_lock(&h->reply_mutex); #ifdef USE_PTHREAD - while (list_empty(&h->reply_list) && read_from_thread && h->fd != -1) + while (XEN_TAILQ_EMPTY(&h->reply_list) && read_from_thread && h->fd != -1) condvar_wait(&h->reply_condvar, &h->reply_mutex); #endif - if (list_empty(&h->reply_list)) { + if (XEN_TAILQ_EMPTY(&h->reply_list)) { mutex_unlock(&h->reply_mutex); errno = EINVAL; return NULL; } - msg = list_top(&h->reply_list, struct xs_stored_msg, list); - list_del(&msg->list); - assert(list_empty(&h->reply_list)); + msg = XEN_TAILQ_FIRST(&h->reply_list); + XEN_TAILQ_REMOVE(&h->reply_list, msg, list); + assert(XEN_TAILQ_EMPTY(&h->reply_list)); mutex_unlock(&h->reply_mutex); *type = msg->hdr.type; @@ -883,7 +883,7 @@ static void xs_maybe_clear_watch_pipe(struct xs_handle *h) { char c; - if (list_empty(&h->watch_list) && (h->watch_pipe[0] != -1)) + if (XEN_TAILQ_EMPTY(&h->watch_list) && (h->watch_pipe[0] != -1)) while (read(h->watch_pipe[0], &c, 1) != 1) continue; } @@ -907,7 +907,7 @@ static char **read_watch_internal(struct xs_handle *h, unsigned int *num, * we haven't called xs_watch. Presumably the application * will do so later; in the meantime we just block. */ - while (list_empty(&h->watch_list) && h->fd != -1) { + while (XEN_TAILQ_EMPTY(&h->watch_list) && h->fd != -1) { if (nonblocking) { mutex_unlock(&h->watch_mutex); errno = EAGAIN; @@ -925,13 +925,13 @@ static char **read_watch_internal(struct xs_handle *h, unsigned int *num, #endif /* !defined(USE_PTHREAD) */ - if (list_empty(&h->watch_list)) { + if (XEN_TAILQ_EMPTY(&h->watch_list)) { mutex_unlock(&h->watch_mutex); errno = EINVAL; return NULL; } - msg = list_top(&h->watch_list, struct xs_stored_msg, list); - list_del(&msg->list); + msg = XEN_TAILQ_FIRST(&h->watch_list); + XEN_TAILQ_REMOVE(&h->watch_list, msg, list); xs_maybe_clear_watch_pipe(h); mutex_unlock(&h->watch_mutex); @@ -1007,12 +1007,12 @@ bool xs_unwatch(struct xs_handle *h, const char *path, const char *token) /* Filter the watch list to remove potential message */ mutex_lock(&h->watch_mutex); - if (list_empty(&h->watch_list)) { + if (XEN_TAILQ_EMPTY(&h->watch_list)) { mutex_unlock(&h->watch_mutex); return res; } - list_for_each_entry_safe(msg, tmsg, &h->watch_list, list) { + XEN_TAILQ_FOREACH_SAFE(msg, &h->watch_list, list, tmsg) { assert(msg->hdr.type == XS_WATCH_EVENT); s = msg->body; @@ -1034,7 +1034,7 @@ bool xs_unwatch(struct xs_handle *h, const char *path, const char *token) if (l_token && !strcmp(token, l_token) && l_path && xs_path_is_subpath(path, l_path)) { - list_del(&msg->list); + XEN_TAILQ_REMOVE(&h->watch_list, msg, list); free(msg); } } @@ -1290,12 +1290,12 @@ static int read_message(struct xs_handle *h, int nonblocking) cleanup_push(pthread_mutex_unlock, &h->watch_mutex); /* Kick users out of their select() loop. */ - if (list_empty(&h->watch_list) && + if (XEN_TAILQ_EMPTY(&h->watch_list) && (h->watch_pipe[1] != -1)) while (write(h->watch_pipe[1], body, 1) != 1) /* Cancellation point */ continue; - list_add_tail(&msg->list, &h->watch_list); + XEN_TAILQ_INSERT_TAIL(&h->watch_list, msg, list); condvar_signal(&h->watch_condvar); @@ -1304,13 +1304,13 @@ static int read_message(struct xs_handle *h, int nonblocking) mutex_lock(&h->reply_mutex); /* There should only ever be one response pending! */ - if (!list_empty(&h->reply_list)) { + if (!XEN_TAILQ_EMPTY(&h->reply_list)) { mutex_unlock(&h->reply_mutex); saved_errno = EEXIST; goto error_freebody; } - list_add_tail(&msg->list, &h->reply_list); + XEN_TAILQ_INSERT_TAIL(&h->reply_list, msg, list); condvar_signal(&h->reply_condvar); mutex_unlock(&h->reply_mutex); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:22:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:22:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548680.856735 (Exim 4.92) (envelope-from ) id 1q9Ndu-0005RY-Q8; Wed, 14 Jun 2023 10:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548680.856735; Wed, 14 Jun 2023 10:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ndu-0005RR-Ne; Wed, 14 Jun 2023 10:22:22 +0000 Received: by outflank-mailman (input) for mailman id 548680; Wed, 14 Jun 2023 10:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ndu-0005RJ-8Q for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ndu-00077x-7Z for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9Ndu-0004wV-6S for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LJhNtbDGMSNz+35p4QUOdkyVdxu3XQNuY3meUX+kz+E=; b=Mf6nA/7jpK7lSxiFzUWYVX4FN9 L3BeUZEwT6bfLDLJQ3Swwqg3rJasjpDQoWUaf8D6ANQ0x8gJrn0EIOm+DRMwIQADfmY++1BGXXgMb AzO9SVJF77JERjYKp0eA1ORgtiG0WhW9zBNpfj/09vt3H5Zwbz11hl/dpk6ehZdHwZrs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/libs/store: make libxenstore independent of utils.h Message-Id: Date: Wed, 14 Jun 2023 10:22:22 +0000 commit 1a0342507cb4011607673efec13a8f3238ac6aa8 Author: Juergen Gross AuthorDate: Tue May 30 10:54:13 2023 +0200 Commit: Julien Grall CommitDate: Mon Jun 12 22:37:22 2023 +0100 tools/libs/store: make libxenstore independent of utils.h There is no real need for including tools/xenstore/utils.h from libxenstore, as only streq() and ARRAY_SIZE() are obtained via that header. streq() is just !strcmp(), and ARRAY_SIZE() is brought in via xen-tools/common-macros.h. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/libs/store/xs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 3813b69ae2..76ffb1be45 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -33,9 +33,9 @@ #include #include #include +#include #include "xenstore.h" #include "xs_lib.h" -#include "utils.h" #include #include @@ -437,7 +437,7 @@ static int get_error(const char *errorstring) { unsigned int i; - for (i = 0; !streq(errorstring, xsd_errors[i].errstring); i++) + for (i = 0; strcmp(errorstring, xsd_errors[i].errstring); i++) if (i == ARRAY_SIZE(xsd_errors) - 1) return EINVAL; return xsd_errors[i].errnum; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:22:32 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:22:32 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548681.856739 (Exim 4.92) (envelope-from ) id 1q9Ne4-0005UX-Ry; Wed, 14 Jun 2023 10:22:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548681.856739; Wed, 14 Jun 2023 10:22:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ne4-0005UQ-PD; Wed, 14 Jun 2023 10:22:32 +0000 Received: by outflank-mailman (input) for mailman id 548681; Wed, 14 Jun 2023 10:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ne4-0005UH-BU for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Ne4-000789-Ai for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9Ne4-0004xK-9h for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=rZX67zkneewZS+GdSyWXKzRpMIoVToDbNlLoVqDwjZo=; b=tZNStXHUEU9zQXmgCsHVLsjMyY hUHwm2IbWdxCCtbySDeOD/or0vZASeWUHw53LgeYelkQZNtqv6N8jmSkZJtkzk6yYskkG49ZmhJZE 6NPYrZUgf5zlZj1Yoxb48TSoSKG453Fyr0VhRRDeAJRjP/U1OhvN+oc38+iQf6voWZV4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstored: Correct the prototype of domain_max_chk() Message-Id: Date: Wed, 14 Jun 2023 10:22:32 +0000 commit 128557e3a44d79f0c9360dc88e42c3d0ef728edf Author: Julien Grall AuthorDate: Mon Jun 12 11:13:19 2023 +0100 Commit: Julien Grall CommitDate: Mon Jun 12 22:38:13 2023 +0100 tools/xenstored: Correct the prototype of domain_max_chk() Some version of GCC will complain because the prototype and the declaration of domain_max_chk() don't match: xenstored_domain.c:1503:6: error: conflicting types for 'domain_max_chk' due to enum/integer mismatch; have '_Bool(const struct connection *, enum accitem, unsigned int)' [-Werror=enum-int-mismatch] 1503 | bool domain_max_chk(const struct connection *conn, enum accitem what, | ^~~~~~~~~~~~~~ In file included from xenstored_domain.c:31: xenstored_domain.h:146:6: note: previous declaration of 'domain_max_chk' with type '_Bool(const struct connection *, unsigned int, unsigned int)' 146 | bool domain_max_chk(const struct connection *conn, unsigned int what, | ^~~~~~~~~~~~~~ Update the prototype to match the declaration. This was spotted by Gitlab CI with the job opensuse-tumbleweed-gcc. Fixes: 685048441e1c ("tools/xenstore: switch quota management to be table based") Signed-off-by: Julien Grall Reviewed-by: Jason Andryuk Tested-by: Jason Andryuk Reviewed-by: Juergen Gross --- tools/xenstore/xenstored_domain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h index bf63f3fcc6..4950b00aee 100644 --- a/tools/xenstore/xenstored_domain.h +++ b/tools/xenstore/xenstored_domain.h @@ -143,7 +143,7 @@ void acc_drop(struct connection *conn); void acc_commit(struct connection *conn); int domain_max_global_acc(const void *ctx, struct connection *conn); void domain_reset_global_acc(void); -bool domain_max_chk(const struct connection *conn, unsigned int what, +bool domain_max_chk(const struct connection *conn, enum accitem what, unsigned int val); extern long wrl_ntransactions; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:22:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548682.856743 (Exim 4.92) (envelope-from ) id 1q9NeF-0005Wu-Tc; Wed, 14 Jun 2023 10:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548682.856743; Wed, 14 Jun 2023 10:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeF-0005Wn-Qu; Wed, 14 Jun 2023 10:22:43 +0000 Received: by outflank-mailman (input) for mailman id 548682; Wed, 14 Jun 2023 10:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeE-0005Wd-FS for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeE-00078Z-EY for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9NeE-0004yG-Cs for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=jLt8CyQ8fxszgVC5DEJL4NkefYK9GiIUHLhP6JUxxyI=; b=yA1qP3eo9hW7QkYm+8s2xbTarb oiUYWao1M+TlahGRQneO/BDxAldySo6c3QtR6pWODEIQECpQC93hC+OPROxrFqjTX2oXTPgPVmw0S fqBMxI7xVh2R67BMvCTjuOHAgFAgvHR00es2fAYoeZXZayhqhg55TyQDEEa3b5vlGiwk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: virtio: Remove unused frontend nodes Message-Id: Date: Wed, 14 Jun 2023 10:22:42 +0000 commit 5e3463af07003f0144fcac187063a281a37be68a Author: Viresh Kumar AuthorDate: Tue Jun 13 11:12:10 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 11:12:10 2023 +0200 libxl: virtio: Remove unused frontend nodes Only the VirtIO backend will watch xenstore to find out when a new instance needs to be created for a guest, and read the parameters from there. VirtIO frontend are only virtio, so they will not do anything with the xenstore nodes. They can be removed. While at it, also add a comment to the libxl_virtio.c file. Signed-off-by: Viresh Kumar Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_virtio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_virtio.c b/tools/libs/light/libxl_virtio.c index faada49e18..f8a78e22d1 100644 --- a/tools/libs/light/libxl_virtio.c +++ b/tools/libs/light/libxl_virtio.c @@ -1,4 +1,9 @@ /* + * Setup VirtIO backend. This is intended to interact with a VirtIO + * backend that is watching xenstore, and create new VirtIO devices + * with the parameter found in xenstore (VirtIO frontend don't + * interact with xenstore.) + * * Copyright (C) 2022 Linaro Ltd. * * This program is free software; you can redistribute it and/or modify @@ -49,11 +54,6 @@ static int libxl__set_xenstore_virtio(libxl__gc *gc, uint32_t domid, flexarray_append_pair(back, "type", GCSPRINTF("%s", virtio->type)); flexarray_append_pair(back, "transport", GCSPRINTF("%s", transport)); - flexarray_append_pair(front, "irq", GCSPRINTF("%u", virtio->irq)); - flexarray_append_pair(front, "base", GCSPRINTF("%#"PRIx64, virtio->base)); - flexarray_append_pair(front, "type", GCSPRINTF("%s", virtio->type)); - flexarray_append_pair(front, "transport", GCSPRINTF("%s", transport)); - return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:22:53 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:22:53 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548683.856747 (Exim 4.92) (envelope-from ) id 1q9NeP-0005a6-VE; Wed, 14 Jun 2023 10:22:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548683.856747; Wed, 14 Jun 2023 10:22:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeP-0005Zy-Sg; Wed, 14 Jun 2023 10:22:53 +0000 Received: by outflank-mailman (input) for mailman id 548683; Wed, 14 Jun 2023 10:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeO-0005Zl-I9 for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeO-00078l-HQ for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9NeO-0004zG-Gi for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=JVCiXNST8gVtuRgnRbEHWLE1QIzpBTtFPtpElgd9HJE=; b=GLe//TDzsY8uqupXNOTfnZiYDQ 6omuRm159EuM9mJLZu4ds9u6LepUSCcneRAw56Q9Q3l41MWKBMnnIftS7xKBSJJ3cZWoHpAd8BBpB k6hhcVgKLAUonhY3izhep4o2UVR+KWJBDnX9XYTCOL/IpjABQ289FNhMyUb5Q7R6hcsw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: Call libxl__virtio_devtype.set_default() early enough Message-Id: Date: Wed, 14 Jun 2023 10:22:52 +0000 commit f68f4723ec06a07c7850c22790b01d888184b2ce Author: Viresh Kumar AuthorDate: Tue Jun 13 11:12:24 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 11:12:24 2023 +0200 libxl: Call libxl__virtio_devtype.set_default() early enough The _setdefault() function for virtio devices is getting called after libxl__prepare_dtb(), which is late as libxl__prepare_dtb() expects the defaults to be already set by this time. Call libxl__virtio_devtype.set_default() from libxl__domain_config_setdefault(), in a similar way as other devices like disk, etc. Suggested-by: Anthony PERARD Signed-off-by: Viresh Kumar Reviewed-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index ec8eab02c2..36770af6d4 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1068,7 +1068,7 @@ int libxl__domain_config_setdefault(libxl__gc *gc, uint32_t domid /* for logging, only */) { libxl_ctx *ctx = libxl__gc_owner(gc); - int ret; + int ret, i; bool pod_enabled = false; libxl_domain_create_info *c_info = &d_config->c_info; @@ -1266,6 +1266,15 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } + for (i = 0; i < d_config->num_virtios; i++) { + ret = libxl__virtio_devtype.set_default(gc, domid, + &d_config->virtios[i], false); + if (ret) { + LOGD(ERROR, domid, "Unable to set virtio defaults for device %d", i); + goto error_out; + } + } + ret = 0; error_out: return ret; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:23:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548684.856752 (Exim 4.92) (envelope-from ) id 1q9Nea-0005dF-2G; Wed, 14 Jun 2023 10:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548684.856752; Wed, 14 Jun 2023 10:23:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeZ-0005d7-Ve; Wed, 14 Jun 2023 10:23:03 +0000 Received: by outflank-mailman (input) for mailman id 548684; Wed, 14 Jun 2023 10:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeY-0005ct-LL for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NeY-000798-KO for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9NeY-00050U-JW for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=pHhNfSUXoaKMqXPj7JAio/6Y/LvBgsIewx0FB0zR+uI=; b=BkeVKZLvvKRJHJnr9Wfhbl9k6d hoqBXmlgp8rK0rTd/atEmbzD83f3Jz7Fg6nx6HATeWbMn2WoU660SP3KndtAWBj785aq+cDcx5I8f +8JWrNLdyfFxiytkFtROS7mMGlzUmpw71+yO7TytWfioXvCTGhXxjOvyQNXeP4kHsvWc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add __ASSEMBLY__ guard to asm/page.h Message-Id: Date: Wed, 14 Jun 2023 10:23:02 +0000 commit 7d5e58730d0967492c1117e0931508454dd20bb4 Author: Oleksii Kurochko AuthorDate: Tue Jun 13 11:13:06 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 11:13:06 2023 +0200 xen/riscv: add __ASSEMBLY__ guard to asm/page.h Signed-off-by: Oleksii Kurochko Acked-by: Alistair Francis --- xen/arch/riscv/include/asm/page.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm/page.h index a7e2eee964..22b36e03a4 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -1,6 +1,8 @@ #ifndef _ASM_RISCV_PAGE_H #define _ASM_RISCV_PAGE_H +#ifndef __ASSEMBLY__ + #include #include @@ -58,4 +60,6 @@ static inline bool pte_is_valid(pte_t p) return p.pte & PTE_VALID; } +#endif /* __ASSEMBLY__ */ + #endif /* _ASM_RISCV_PAGE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:23:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548685.856756 (Exim 4.92) (envelope-from ) id 1q9Nek-0005fx-3m; Wed, 14 Jun 2023 10:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548685.856756; Wed, 14 Jun 2023 10:23:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nek-0005fp-0x; Wed, 14 Jun 2023 10:23:14 +0000 Received: by outflank-mailman (input) for mailman id 548685; Wed, 14 Jun 2023 10:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nei-0005fg-OG for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nei-00079G-NR for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9Nei-000517-MV for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=yHkq4O0uFSN4pOFsnsRzn4xXQRGVr/3Iq8lUmuLmXiM=; b=0jq9SVW6tlVp9pR/0VC7yMGhaZ OfqWwaf9tM/Cf/FWcVkkj+Cz9tgYC0kCt2w7GPh/61blTmHxWYoIwPmGWzYu4qrkI2GBntuuxgzPF SozS4YUHV3v+ctgPiUy5iiOARRhW9FIMCPmILXTX8hnx+9radYToxzJhtB3JppH3T+C0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] livepatch: apply_alternatives() is only used for livepatch Message-Id: Date: Wed, 14 Jun 2023 10:23:12 +0000 commit f4be887879c2af52a91c7511579ef01eb007eabb Author: Roger Pau Monné AuthorDate: Tue Jun 13 11:13:39 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 11:13:39 2023 +0200 livepatch: apply_alternatives() is only used for livepatch Guard it with CONFIG_LIVEPATCH. Note alternatives are applied at boot using _apply_alternatives(). Signed-off-by: Roger Pau Monné Reviewed-by: Julien Grall --- xen/arch/arm/alternative.c | 2 ++ xen/arch/x86/alternative.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/alternative.c b/xen/arch/arm/alternative.c index 7366af4ea6..016e66978b 100644 --- a/xen/arch/arm/alternative.c +++ b/xen/arch/arm/alternative.c @@ -223,6 +223,7 @@ void __init apply_alternatives_all(void) vunmap(xenmap); } +#ifdef CONFIG_LIVEPATCH int apply_alternatives(const struct alt_instr *start, const struct alt_instr *end) { const struct alt_region region = { @@ -232,6 +233,7 @@ int apply_alternatives(const struct alt_instr *start, const struct alt_instr *en return __apply_alternatives(®ion, 0); } +#endif /* * Local variables: diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 99482766b5..21af0e8258 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -358,11 +358,12 @@ static void init_or_livepatch _apply_alternatives(struct alt_instr *start, } } -void init_or_livepatch apply_alternatives(struct alt_instr *start, - struct alt_instr *end) +#ifdef CONFIG_LIVEPATCH +void apply_alternatives(struct alt_instr *start, struct alt_instr *end) { _apply_alternatives(start, end, true); } +#endif static unsigned int __initdata alt_todo; static unsigned int __initdata alt_done; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548686.856760 (Exim 4.92) (envelope-from ) id 1q9Neu-0005ik-52; Wed, 14 Jun 2023 10:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548686.856760; Wed, 14 Jun 2023 10:23:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Neu-0005ic-2L; Wed, 14 Jun 2023 10:23:24 +0000 Received: by outflank-mailman (input) for mailman id 548686; Wed, 14 Jun 2023 10:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nes-0005iR-RE for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nes-00079Y-QQ for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9Nes-00051v-Pa for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zvX8TB9cTtEs047JHppGh2LPlsOz8pMapYfkMk4htXE=; b=xcno3xuKOUH9pC3CdMBQTmgvEg wk/znaD/HnY9a1IJ3CWUus2p2SPVfofNSrv17LXdQVjZ4WqacqLg7MbaSUOWhQKsgpM0hS0Kpr9GD bXnAsPHgZ6L4BdrrtoUiWOXKQACTAwvVTWmrB2L59UL+ChTtXyIXvsWKJdWbPISsv7w8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: minor tidying of identify_cpu() Message-Id: Date: Wed, 14 Jun 2023 10:23:22 +0000 commit f29363922c1b41310c3d87fd9a861ffa9db9204a Author: Jan Beulich AuthorDate: Tue Jun 13 11:14:50 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 11:14:50 2023 +0200 x86: minor tidying of identify_cpu() Fields that generic_identify() sets unconditionally don't need pre- setting. (In fact the compiler removes some of those assignments anyway, at least in release builds.) With the setting of ->cpuid_level to -1 gone, also drop the respective BUG_ON() from default_init(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index fb7494ffb0..cfcdaace12 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -114,8 +114,6 @@ bool __init is_forced_cpu_cap(unsigned int cap) static void cf_check default_init(struct cpuinfo_x86 * c) { /* Not much we can do here... */ - /* Check if at least it has cpuid */ - BUG_ON(c->cpuid_level == -1); __clear_bit(X86_FEATURE_SEP, c->x86_capability); } @@ -492,15 +490,11 @@ void identify_cpu(struct cpuinfo_x86 *c) int i; c->x86_cache_size = -1; - c->x86_vendor = X86_VENDOR_UNKNOWN; - c->cpuid_level = -1; /* CPUID not detected */ c->x86_model = c->x86_mask = 0; /* So far unknown... */ - c->x86_vendor_id[0] = '\0'; /* Unset */ c->x86_model_id[0] = '\0'; /* Unset */ c->x86_max_cores = 1; c->x86_num_siblings = 1; c->x86_clflush_size = 0; - c->phys_proc_id = XEN_INVALID_SOCKET_ID; c->cpu_core_id = XEN_INVALID_CORE_ID; c->compute_unit_id = INVALID_CUID; memset(&c->x86_capability, 0, sizeof c->x86_capability); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548687.856764 (Exim 4.92) (envelope-from ) id 1q9Nf4-0005lc-6R; Wed, 14 Jun 2023 10:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548687.856764; Wed, 14 Jun 2023 10:23:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nf4-0005lU-3n; Wed, 14 Jun 2023 10:23:34 +0000 Received: by outflank-mailman (input) for mailman id 548687; Wed, 14 Jun 2023 10:23:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nf2-0005lK-U8 for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9Nf2-00079f-TQ for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9Nf2-00052Q-SV for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=XPgdcZ59D6YwugbI9zthxCwtmqw+tEj0iQMw7zoJy5I=; b=xGQtVNr5pNpghoZ8etLSdKprBy HKxJ3oX2JIHxb6iuhDOSVsRVC2kiuVRmGGPMsH9+3CWY4k7czwkzR0IBTKMNl5AUMFKy64hFMFl6K SAxfUhaqWB1fwCiMwpZD181BlzEI3wgyhMyVD2HqsfqnGXc/1WBDMAyUjRpD4RdfghVg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/amd-vi: fix checking for Invalidate All support in amd_iommu_resume() Message-Id: Date: Wed, 14 Jun 2023 10:23:32 +0000 commit 5ecbb779748a56495f2c892f0610d57dd623c7cd Author: Roger Pau Monné AuthorDate: Tue Jun 13 14:41:32 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 14:41:32 2023 +0200 iommu/amd-vi: fix checking for Invalidate All support in amd_iommu_resume() The iommu local variable does not point to to a valid amd_iommu element after the call to for_each_amd_iommu(). Instead check whether any IOMMU on the system doesn't support Invalidate All in order to perform the per-domain and per-device flushes. Fixes: 9c46139de889 ('amd iommu: Support INVALIDATE_IOMMU_ALL command.') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/passthrough/amd/iommu_init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 9773ccfcb4..7dbd7e7d09 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -1580,6 +1580,7 @@ void cf_check amd_iommu_crash_shutdown(void) void cf_check amd_iommu_resume(void) { struct amd_iommu *iommu; + bool invalidate_all = true; for_each_amd_iommu ( iommu ) { @@ -1589,10 +1590,12 @@ void cf_check amd_iommu_resume(void) */ disable_iommu(iommu); enable_iommu(iommu); + if ( !iommu->features.flds.ia_sup ) + invalidate_all = false; } /* flush all cache entries after iommu re-enabled */ - if ( !iommu->features.flds.ia_sup ) + if ( !invalidate_all ) { invalidate_all_devices(); invalidate_all_domain_pages(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Jun 14 10:23:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Jun 2023 10:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.548688.856767 (Exim 4.92) (envelope-from ) id 1q9NfE-0005ny-7q; Wed, 14 Jun 2023 10:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 548688.856767; Wed, 14 Jun 2023 10:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NfE-0005nr-5M; Wed, 14 Jun 2023 10:23:44 +0000 Received: by outflank-mailman (input) for mailman id 548688; Wed, 14 Jun 2023 10:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NfD-0005nb-0x for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9NfD-0007A4-09 for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9NfC-000535-Va for xen-changelog@lists.xenproject.org; Wed, 14 Jun 2023 10:23:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=unDdyz5PsCTYxFYX+3Fdg6WIygbKMaF3ymWBDQevsVM=; b=SAkfDbpk02ynDVT+UECX26laCS NKu1uR4Db3dyk9ErhnYKpNBD08rJOcTQ1UWIxZzLRgQfIGDxa/1zZA56OmDRt4G26xiy9UX4brMK4 ELdpSpMujjFsRZer1yK+peFiuFwdwXorUamIxV++7lU4WLmBbzE6fRjDAkhwTw2rBOm0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools: fix make rpmball Message-Id: Date: Wed, 14 Jun 2023 10:23:42 +0000 commit 2f69ef96801f0d2b9646abf6396e60f99c56e3a0 Author: Olaf Hering AuthorDate: Tue Jun 13 14:42:14 2023 +0200 Commit: Jan Beulich CommitDate: Tue Jun 13 14:42:14 2023 +0200 tools: fix make rpmball Commit 438c5ffa44e99cceb574c0f9946aacacdedd2952 ("rpmball: Adjust to new rpm, do not require --force") attempted to handle stricter directory permissions in newer distributions. This introduced a few issues: - /boot used to be a constant prior commit 6475d700055fa952f7671cee982a23de2f5e4a7c ("use BOOT_DIR as xen.gz install location"), since this commit the location has to be referenced via ${BOOT_DIR} - it assumed the prefix and the various configurable paths match the glob pattern /*/*/* Adjust the code to build a filelist on demand and filter directories from an installed filesystem.rpm. This works on a SUSE system, and will likely work on a RedHat based system as well. Take the opportunity to replace the usage of $RPM_BUILD_ROOT with %buildroot, and use pushd/popd pairs. Signed-off-by: Olaf Hering Reviewed-by: Anthony PERARD --- tools/misc/mkrpm | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm index 74f6761bb0..b072144a42 100644 --- a/tools/misc/mkrpm +++ b/tools/misc/mkrpm @@ -50,20 +50,32 @@ uninstall. %build %install -rm -rf \$RPM_BUILD_ROOT -mkdir -p \$RPM_BUILD_ROOT -cd %{_xenroot} -dist/install.sh \$RPM_BUILD_ROOT/ - -cd \$RPM_BUILD_ROOT +rm -rf %buildroot +mkdir -p %buildroot +pushd %_xenroot +dist/install.sh %buildroot + +rm -f dist/filesystem.txt +rm -f dist/directories.txt +rm -f dist/files.txt +find %buildroot -type d | sed 's|^%buildroot||' | sort > dist/directories.txt +find %buildroot -type f | sed 's|^%buildroot||' | sort > dist/files.txt +find %buildroot -type l | sed 's|^%buildroot||' | sort >> dist/files.txt +if rpm -ql filesystem > dist/filesystem.txt +then + while read + do + sed -i "s|^\${REPLY}$||" dist/directories.txt + done < dist/filesystem.txt +fi +sed 's|^|%%dir |' dist/directories.txt >> dist/files.txt +popd %clean -rm -rf \$RPM_BUILD_ROOT +rm -rf %buildroot -%files +%files -f %_xenroot/dist/files.txt %defattr(-,root,root,-) -/*/*/* -/boot/* %post EOF -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 15 06:55:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 Jun 2023 06:55:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.549416.857926 (Exim 4.92) (envelope-from ) id 1q9gsp-0004z4-6W; Thu, 15 Jun 2023 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 549416.857926; Thu, 15 Jun 2023 06:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gsp-0004yw-3Y; Thu, 15 Jun 2023 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 549416; Thu, 15 Jun 2023 06:55:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gsn-0004yl-NZ for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gsn-0003Qc-Mb for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9gsn-0002B7-Le for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=B9VzHnxvb77Ssrnh0599aGhxCDNrZy/q8mF50SV3w64=; b=oGksknfD9FOumEnXhZprNCwJRh W1wXevqVAoF3pwk9eSITk2RdY/FUnAZlPikjrkjhVVRPOTD9em1VEA6fids09n1Q7EfmjA45R/F4P FQ9Oie5fG8nB8K8vOMSEPhsCKVvKN8yFB84Mngqti6x1eLxb/NePP9mi6tQYS4yGHbCY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen-mfndump: drop dead assignment to "page" from lookup_pte_func() Message-Id: Date: Thu, 15 Jun 2023 06:55:01 +0000 commit cf584d27f56b9de2f9cd19df35bde0687c8437cc Author: Jan Beulich AuthorDate: Wed Jun 14 12:31:02 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jun 14 12:31:02 2023 +0200 xen-mfndump: drop dead assignment to "page" from lookup_pte_func() The variable isn't used past the loop, and its value also isn't meaningful across iterations. Reduce its scope to make this more obvious. Coverity ID: 1532310 Fixes: ae763e422430 ("tools/misc: introduce xen-mfndump") Signed-off-by: Jan Beulich Reviewed-by: Jason Andryuk Acked-by: Anthony PERARD --- tools/misc/xen-mfndump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/misc/xen-mfndump.c b/tools/misc/xen-mfndump.c index 8863ece3f5..28687afbf0 100644 --- a/tools/misc/xen-mfndump.c +++ b/tools/misc/xen-mfndump.c @@ -265,7 +265,6 @@ int lookup_pte_func(int argc, char *argv[]) { struct xc_domain_meminfo minfo; xc_domaininfo_t info; - void *page = NULL; unsigned long i, j; int domid, pte_num; xen_pfn_t mfn; @@ -301,6 +300,8 @@ int lookup_pte_func(int argc, char *argv[]) for ( i = 0; i < minfo.p2m_size; i++ ) { + void *page; + if ( !(minfo.pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK) ) continue; @@ -323,7 +324,6 @@ int lookup_pte_func(int argc, char *argv[]) } munmap(page, XC_PAGE_SIZE); - page = NULL; } xc_unmap_domain_meminfo(xch, &minfo); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 15 06:55:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 Jun 2023 06:55:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.549417.857930 (Exim 4.92) (envelope-from ) id 1q9gsz-000530-7u; Thu, 15 Jun 2023 06:55:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 549417.857930; Thu, 15 Jun 2023 06:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gsz-00052t-5K; Thu, 15 Jun 2023 06:55:13 +0000 Received: by outflank-mailman (input) for mailman id 549417; Thu, 15 Jun 2023 06:55:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gsx-00052f-Qn for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gsx-0003Qn-Q0 for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9gsx-0002C4-Oz for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iN9tirnpjH8HVdefrZ7zZYl6hW0JP0NesKkigNj5ez8=; b=ipaH3JHzHuv0lCk4aPBBG1vGwH CQP+LQpFF5zPkm2KzO/UpgdHBO8duA899b/niq4JccyF3G/gT/bCcSEW4ozh+p8AfPYHevP5J+woa Ua7HpvSlJgW/q3iMKHx2VpI3+PvAGKR/hU8j9kuxKeCUIxLZFOtmMLQlCn7BK3HLqY7I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: drop dead assignments to "ret" from libxl__domain_config_setdefault() Message-Id: Date: Thu, 15 Jun 2023 06:55:11 +0000 commit 129aba0e799158c00814c0e53e9e104f8ccdb6ca Author: Jan Beulich AuthorDate: Wed Jun 14 12:31:23 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jun 14 12:31:23 2023 +0200 libxl: drop dead assignments to "ret" from libxl__domain_config_setdefault() The variable needs to be properly set only on the error paths. Coverity ID: 1532311 Fixes: ab4440112bec ("xl / libxl: push parsing of SSID and CPU pool ID down to libxl") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Reviewed-by: Daniel P. Smith Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 36770af6d4..d7e80d5df7 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1081,13 +1081,12 @@ int libxl__domain_config_setdefault(libxl__gc *gc, ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->c_info.ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, "XSM Disabled: init_seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid init_seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, "XSM Disabled: init_seclabel not supported"); } } @@ -1096,13 +1095,12 @@ int libxl__domain_config_setdefault(libxl__gc *gc, ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->b_info.exec_ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, "XSM Disabled: seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, "XSM Disabled: seclabel not supported"); } } @@ -1111,14 +1109,13 @@ int libxl__domain_config_setdefault(libxl__gc *gc, ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->b_info.device_model_ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, - "XSM Disabled: device_model_stubdomain_seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid device_model_stubdomain_seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, + "XSM Disabled: device_model_stubdomain_seclabel not supported"); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 15 06:55:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 Jun 2023 06:55:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.549419.857938 (Exim 4.92) (envelope-from ) id 1q9gt9-000570-Ay; Thu, 15 Jun 2023 06:55:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 549419.857938; Thu, 15 Jun 2023 06:55:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gt9-00056s-7z; Thu, 15 Jun 2023 06:55:23 +0000 Received: by outflank-mailman (input) for mailman id 549419; Thu, 15 Jun 2023 06:55:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gt7-00056V-UK for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gt7-0003R9-T5 for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9gt7-0002DB-SC for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=eUKxF+5oGZ8FddIri4PglJx9YXO7csJb1AkfNE2etg0=; b=Jdo7MaeOFy2tLRWXsueggnMZee OXO6iPmlpRc05DwPKnqMuoqviMIDR9eWfx/uFH0wDHj2h++lqQRErw60NLcBsSKuZzPNQ9xg4k0rE 01lpbt5wJ3jyYTqFlIoZYXhvDw1RI4LNrHx7oQs6ahN0kfcY6k3vRTzqMJ9uXlOQyI4I=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxg: drop dead assignment to "rc" from xc_cpuid_apply_policy() Message-Id: Date: Thu, 15 Jun 2023 06:55:21 +0000 commit 2dbc4d4fb502ad1a97fcdd2eeeb7fa008e9f87fb Author: Jan Beulich AuthorDate: Wed Jun 14 12:31:54 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jun 14 12:31:54 2023 +0200 libxg: drop dead assignment to "rc" from xc_cpuid_apply_policy() "rc" is written immediately below the outer if(). Fold the remaining two if()s. Coverity ID: 1532320 Fixes: 685e922d6f30 ("tools/libxc: Rework xc_cpuid_apply_policy() to use {get,set}_cpu_policy()") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Acked-by: Anthony PERARD --- tools/libs/guest/xg_cpuid_x86.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c index 57221ffea8..5b035223f4 100644 --- a/tools/libs/guest/xg_cpuid_x86.c +++ b/tools/libs/guest/xg_cpuid_x86.c @@ -462,17 +462,12 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, /* Get the host policy. */ rc = xc_get_cpu_featureset(xch, XEN_SYSCTL_cpu_featureset_host, &len, host_featureset); - if ( rc ) + /* Tolerate "buffer too small", as we've got the bits we need. */ + if ( rc && errno != ENOBUFS ) { - /* Tolerate "buffer too small", as we've got the bits we need. */ - if ( errno == ENOBUFS ) - rc = 0; - else - { - PERROR("Failed to obtain host featureset"); - rc = -errno; - goto out; - } + PERROR("Failed to obtain host featureset"); + rc = -errno; + goto out; } /* Get the domain's default policy. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 15 06:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 15 Jun 2023 06:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.549420.857941 (Exim 4.92) (envelope-from ) id 1q9gtJ-0005Ae-C5; Thu, 15 Jun 2023 06:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 549420.857941; Thu, 15 Jun 2023 06:55:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gtJ-0005AX-9X; Thu, 15 Jun 2023 06:55:33 +0000 Received: by outflank-mailman (input) for mailman id 549420; Thu, 15 Jun 2023 06:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gtI-0005AO-1M for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q9gtI-0003Sn-07 for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1q9gtH-0002Ff-VP for xen-changelog@lists.xenproject.org; Thu, 15 Jun 2023 06:55:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=V0dSwmNjZrG1Zggy2eq48EIYqU1svb8+0edQTi3+AqQ=; b=VbbUdeNortz+cHhwyN2Tr9A5vR YjmzW0Gl+XUImrrb5fV3c8tuMEffei5i5f/VCZ0S1g4s/eWp7keG8XuPIxQHqWRfdEEHwWpnpfJZI f7hCW+wqJ6jdCUaH1lt997Og6Ve+6AlVyeNcZXXnZudMOnM/vqBH5CXKtXn3Rrd28GmA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxl: drop dead assignment to transaction variable from libxl__domain_make() Message-Id: Date: Thu, 15 Jun 2023 06:55:31 +0000 commit 87c621d0ef75e5f95987d66811ed1fd7129208d1 Author: Jan Beulich AuthorDate: Wed Jun 14 12:32:10 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jun 14 12:32:10 2023 +0200 libxl: drop dead assignment to transaction variable from libxl__domain_make() "t" is written first thing at the "retry_transaction" label. Coverity ID: 1532321 Fixes: 1057300109ea ("libxl: fix error handling (xenstore transaction leak) in libxl__domain_make") Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Acked-by: Anthony PERARD --- tools/libs/light/libxl_create.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index d7e80d5df7..393c535579 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -909,10 +909,8 @@ retry_transaction: strlen(dom_type)); if (!xs_transaction_end(ctx->xsh, t, 0)) { - if (errno == EAGAIN) { - t = 0; + if (errno == EAGAIN) goto retry_transaction; - } LOGED(ERROR, *domid, "domain creation ""xenstore transaction commit failed"); rc = ERROR_FAIL; goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:22:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550618.859710 (Exim 4.92) (envelope-from ) id 1qAU0K-0007i2-0T; Sat, 17 Jun 2023 11:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550618.859710; Sat, 17 Jun 2023 11:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0J-0007ht-Tc; Sat, 17 Jun 2023 11:22:03 +0000 Received: by outflank-mailman (input) for mailman id 550618; Sat, 17 Jun 2023 11:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0I-0007hn-C4 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0I-0002K1-AA for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU0I-0006sl-8u for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ba+YPXoytl7M+JupU7wWPYWh7iW+xWj6EvVbDYgGagY=; b=Wd3zVYaRjUzNAdSUl67hytIcGD bHp73C6qU4FUZQKgDnFCBW/bNUN8wkRZ1F7pdDDtWrMq/SNYaSc3DXeqkbJzyJ423K+NpHJexo81I aFHeSbskc04HCwMzzjdvmwYL/Rs9yUB160B1HhnbGl0mrhSGJJ9KJzIzEekuByoVty/4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] libxg: shrink variable scope in xc_core_arch_map_p2m_list_rw() Message-Id: Date: Sat, 17 Jun 2023 11:22:02 +0000 commit afbfe555440d121077528209d56c8475b92bddc6 Author: Jan Beulich AuthorDate: Thu Jun 15 10:59:30 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jun 15 10:59:30 2023 +0200 libxg: shrink variable scope in xc_core_arch_map_p2m_list_rw() This in particular allows to drop a dead assignment to "ptes" from near the end of the function. Coverity ID: 1532314 Fixes: bd7a29c3d0b9 ("tools/libs/ctrl: fix xc_core_arch_map_p2m() to support linear p2m table") Signed-off-by: Jan Beulich Acked-by: Anthony PERARD --- tools/libs/guest/xg_core_x86.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/libs/guest/xg_core_x86.c b/tools/libs/guest/xg_core_x86.c index dbd3a440f7..cc2a9256ad 100644 --- a/tools/libs/guest/xg_core_x86.c +++ b/tools/libs/guest/xg_core_x86.c @@ -92,11 +92,9 @@ xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context *dinf uint64_t p2m_cr3) { uint64_t p2m_vaddr, p2m_end, mask, off; - xen_pfn_t p2m_mfn, mfn, saved_mfn, max_pfn; - uint64_t *ptes = NULL; + xen_pfn_t p2m_mfn, saved_mfn; xen_pfn_t *mfns = NULL; - unsigned int fpp, n_pages, level, n_levels, shift, - idx_start, idx_end, idx, saved_idx; + unsigned int fpp, level, n_levels, idx_start, idx_end, saved_idx; p2m_vaddr = GET_FIELD(live_shinfo, arch.p2m_vaddr, dinfo->guest_width); fpp = PAGE_SIZE / dinfo->guest_width; @@ -152,8 +150,10 @@ xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context *dinf for ( level = n_levels; level > 0; level-- ) { - n_pages = idx_end - idx_start + 1; - ptes = xc_map_foreign_pages(xch, dom, PROT_READ, mfns, n_pages); + unsigned int n_pages = idx_end - idx_start + 1; + uint64_t *ptes = xc_map_foreign_pages(xch, dom, PROT_READ, mfns, n_pages); + unsigned int shift, idx; + if ( !ptes ) { PERROR("Failed to map %u page table pages for p2m list", n_pages); @@ -169,18 +169,21 @@ xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context *dinf if ( !mfns ) { ERROR("Cannot allocate memory for array of %u mfns", idx); + out_unmap: + munmap(ptes, n_pages * PAGE_SIZE); goto out; } for ( idx = idx_start; idx <= idx_end; idx++ ) { - mfn = (ptes[idx] & 0x000ffffffffff000ULL) >> PAGE_SHIFT; + xen_pfn_t mfn = (ptes[idx] & 0x000ffffffffff000ULL) >> PAGE_SHIFT; + if ( mfn == 0 ) { ERROR("Bad mfn %#lx during page table walk for vaddr %#" PRIx64 " at level %d of p2m list", mfn, off + ((uint64_t)idx << shift), level); errno = ERANGE; - goto out; + goto out_unmap; } mfns[idx - idx_start] = mfn; @@ -197,6 +200,8 @@ xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context *dinf if ( level == 2 ) { + xen_pfn_t max_pfn; + if ( saved_idx == idx_end ) saved_idx++; max_pfn = ((xen_pfn_t)saved_idx << 9) * fpp; @@ -210,7 +215,6 @@ xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context *dinf } munmap(ptes, n_pages * PAGE_SIZE); - ptes = NULL; off = p2m_vaddr & ((mask >> shift) << shift); } @@ -218,8 +222,6 @@ xc_core_arch_map_p2m_list_rw(xc_interface *xch, struct domain_info_context *dinf out: free(mfns); - if ( ptes ) - munmap(ptes, n_pages * PAGE_SIZE); return NULL; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:22:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:22:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550619.859715 (Exim 4.92) (envelope-from ) id 1qAU0U-0007jM-1d; Sat, 17 Jun 2023 11:22:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550619.859715; Sat, 17 Jun 2023 11:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0T-0007jC-VE; Sat, 17 Jun 2023 11:22:13 +0000 Received: by outflank-mailman (input) for mailman id 550619; Sat, 17 Jun 2023 11:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0S-0007j4-FE for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0S-0002K5-EO for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU0S-0006tF-CT for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vYmrUvUXb7NKtF1qxHZxeRdagJaN/X3YvORmto32+4Q=; b=u8G/KZNX5OgpDuzmgMhYCmx6C1 FDIu+Koqxrfz40s21BrNu7aa0PdfmpjMzv+w2CxWTQdEbnAneXJN1MTRkoL4L2dYjnr/t/E6n2Y/+ JZdLL5mlH9/49KZKuZUwwPELh0wKwoB2bXgDlOV19TOPuQ4iKTtHXZg+isslQO+Z9fvc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] spinlock: alter inlining of _spin_lock_cb() Message-Id: Date: Sat, 17 Jun 2023 11:22:12 +0000 commit 9e9aec6141a242c23d28ebf8afeea093c17e4139 Author: Jan Beulich AuthorDate: Thu Jun 15 10:59:56 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jun 15 10:59:56 2023 +0200 spinlock: alter inlining of _spin_lock_cb() To comply with Misra rule 8.10 ("An inline function shall be declared with the static storage class"), convert what is presently _spin_lock_cb() to an always-inline (and static) helper, while making the function itself a thin wrapper, just like _spin_lock() is. While there drop the unlikely() from the callback check, and correct indentation in _spin_lock(). Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- xen/common/spinlock.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index a15f0a2eb6..7f453234a9 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -304,7 +304,8 @@ static always_inline u16 observe_head(spinlock_tickets_t *t) return read_atomic(&t->head); } -void inline _spin_lock_cb(spinlock_t *lock, void (*cb)(void *), void *data) +static void always_inline spin_lock_common(spinlock_t *lock, + void (*cb)(void *), void *data) { spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; LOCK_PROFILE_VAR; @@ -316,7 +317,7 @@ void inline _spin_lock_cb(spinlock_t *lock, void (*cb)(void *), void *data) while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - if ( unlikely(cb) ) + if ( cb ) cb(data); arch_lock_relax(); } @@ -327,7 +328,12 @@ void inline _spin_lock_cb(spinlock_t *lock, void (*cb)(void *), void *data) void _spin_lock(spinlock_t *lock) { - _spin_lock_cb(lock, NULL, NULL); + spin_lock_common(lock, NULL, NULL); +} + +void _spin_lock_cb(spinlock_t *lock, void (*cb)(void *), void *data) +{ + spin_lock_common(lock, cb, data); } void _spin_lock_irq(spinlock_t *lock) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:22:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:22:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550620.859719 (Exim 4.92) (envelope-from ) id 1qAU0e-0007lj-3E; Sat, 17 Jun 2023 11:22:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550620.859719; Sat, 17 Jun 2023 11:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0e-0007lb-0S; Sat, 17 Jun 2023 11:22:24 +0000 Received: by outflank-mailman (input) for mailman id 550620; Sat, 17 Jun 2023 11:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0c-0007lV-In for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0c-0002KJ-Hn for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU0c-0006te-GW for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TEqqYNFvxVsnKRvGWNcvfxeU3xoGn3SaV7eCfpvHpK4=; b=MGaTkBJDKRsSAeiXWE/AgqAEtM YqqKcc4bJkoEknzYy6NzyB92sDtrSl0ArzzDK17KrPIDE9b4Bwg06yxwbjQ6CAzf93Zdis+8yV158 XoIpn78deifCBs8ccby/ym3PeqyDFPG4HZ5Ih4RaEdQj0iOM+zW9n6LikWr5hsoU55IM=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Arm: drop bogus ALIGN() from linker script Message-Id: Date: Sat, 17 Jun 2023 11:22:22 +0000 commit a012a4aba1bbe8d01869bb6e4a5c00b032ec34db Author: Jan Beulich AuthorDate: Thu Jun 15 11:00:22 2023 +0200 Commit: Jan Beulich CommitDate: Thu Jun 15 11:00:22 2023 +0200 Arm: drop bogus ALIGN() from linker script Having ALIGN() inside a section definition usually makes sense only with a label definition following (an exception case is a few lines out of context, where cache line sharing is intended to be avoided). Constituents of .bss.page_aligned need to specify their own alignment correctly anyway, or else they're susceptible to link order changing. This requirement is already met: Arm-specific code has no such object, while common (EFI) code has another one. That one has suitable alignment specified. Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/xen.lds.S | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 6ca3caefe6..be58c2c395 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -199,7 +199,6 @@ SECTIONS .bss : { /* BSS */ __bss_start = .; *(.bss.stack_aligned) - . = ALIGN(PAGE_SIZE); *(.bss.page_aligned) . = ALIGN(PAGE_SIZE); __per_cpu_start = .; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:22:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:22:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550621.859723 (Exim 4.92) (envelope-from ) id 1qAU0o-0007ot-5C; Sat, 17 Jun 2023 11:22:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550621.859723; Sat, 17 Jun 2023 11:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0o-0007oj-2F; Sat, 17 Jun 2023 11:22:34 +0000 Received: by outflank-mailman (input) for mailman id 550621; Sat, 17 Jun 2023 11:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0m-0007oV-MM for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0m-0002Kn-LC for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU0m-0006u3-K9 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=oIKDUW6P/El3hxhFx4HDakIU8/mRGPp+LJn8LcTrfhY=; b=bZhO96PzzyYCcMbTSEyXG8kxK8 vWIjFJcAnDdELabYdHFlmN5AHlh5KbOCSR/LMOFF8UuTgsqANfxDyZh0UZ3T3WxeM4zv9TrQA0lUr inZzHaiYiqq9++ZNnx/15719RKQbCS9cTHXufN9dRnTn6TH1g5hCfwPEK8Xhhyg3SSJ8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/p2m.h: Add include guards Message-Id: Date: Sat, 17 Jun 2023 11:22:32 +0000 commit 621625f696f7be958bef8d31419d42886cffb85d Author: Andrew Cooper AuthorDate: Mon May 9 11:17:35 2022 +0100 Commit: Andrew Cooper CommitDate: Thu Jun 15 10:51:57 2023 +0100 x86/p2m.h: Add include guards Spotted by Eclair MISRA scanner. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Bertrand Marquis --- xen/arch/x86/mm/p2m.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/arch/x86/mm/p2m.h b/xen/arch/x86/mm/p2m.h index 11e63b8fe4..04308cfb6d 100644 --- a/xen/arch/x86/mm/p2m.h +++ b/xen/arch/x86/mm/p2m.h @@ -3,6 +3,9 @@ * arch/x86/mm/p2m.h */ +#ifndef __ARCH_MM_P2M_H__ +#define __ARCH_MM_P2M_H__ + struct p2m_domain *p2m_init_one(struct domain *d); void p2m_free_one(struct p2m_domain *p2m); @@ -27,6 +30,8 @@ int ept_p2m_init(struct p2m_domain *p2m); void ept_p2m_uninit(struct p2m_domain *p2m); void p2m_init_altp2m_ept(struct domain *d, unsigned int i); +#endif /* __ARCH_MM_P2M_H__ */ + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:22:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550622.859727 (Exim 4.92) (envelope-from ) id 1qAU0y-0007sa-74; Sat, 17 Jun 2023 11:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550622.859727; Sat, 17 Jun 2023 11:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0y-0007sT-3x; Sat, 17 Jun 2023 11:22:44 +0000 Received: by outflank-mailman (input) for mailman id 550622; Sat, 17 Jun 2023 11:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0w-0007rx-PL for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU0w-0002Ky-O5 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU0w-0006ue-NI for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Rw3sWjItl9FPno+6P52t2yeAdoyRGWLL9yVgNtG56+k=; b=b4gXDuQIboPlKqTS2ncaWcC7BX mwxscWzQmxw5hAki+idTOJFgdeEn8YnuGT45eOJ9BnkPJI/Vkft9X+4qNzSflhOd7noxHFiq1y2Ef RvRmliJqfU65mWVWXGarvXxgRxT3rK23blZ+5kTPATjvoA+mu28YPKyvAKkLupSeeBpE=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/shadow: Don't use signed bitfield in sh_emulate_ctxt Message-Id: Date: Sat, 17 Jun 2023 11:22:42 +0000 commit 9c0b20700103d746824687383fd330f5da97b72d Author: Andrew Cooper AuthorDate: Mon May 9 11:18:20 2022 +0100 Commit: Andrew Cooper CommitDate: Thu Jun 15 10:51:57 2023 +0100 x86/shadow: Don't use signed bitfield in sh_emulate_ctxt 'int' bitfields in particular have implementation defined behaviour under gcc and can change signed-ness with -funsigned-bitfields. There is no need for low_bit_was_clear to be a bitfield in the first place; it is only used as a boolean. Doing so even improves the code generation in sh_emulate_map_dest() to avoid emitting a merge with structure padding. Spotted by Eclair MISRA scanner. Signed-off-by: Andrew Cooper Reviewed-by: Bertrand Marquis Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm/shadow/private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h index d02d70ab07..a0f275251f 100644 --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -815,7 +815,7 @@ struct sh_emulate_ctxt { #if (SHADOW_OPTIMIZATIONS & SHOPT_SKIP_VERIFY) /* Special case for avoiding having to verify writes: remember * whether the old value had its low bit (_PAGE_PRESENT) clear. */ - int low_bit_was_clear:1; + bool low_bit_was_clear; #endif }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:22:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550623.859730 (Exim 4.92) (envelope-from ) id 1qAU18-0007vE-8o; Sat, 17 Jun 2023 11:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550623.859730; Sat, 17 Jun 2023 11:22:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU18-0007v7-5s; Sat, 17 Jun 2023 11:22:54 +0000 Received: by outflank-mailman (input) for mailman id 550623; Sat, 17 Jun 2023 11:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU16-0007ut-T2 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU16-0002LG-SG for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU16-0006v3-QS for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e2Bc8e+VPfhQlaKV/EpUm/ohnU/Fn8vetLkeQWYTglk=; b=p2N73sFBeSiRYgunbmwp4aonlW LhHFNRDTLshTzQb9Z5I5IkWQjNh672JxCFHr2yhpDw8jbaSTdoUQYQ6hM+9jpkBFSebWh6CM162xz kyEVsx1WGPwwE7S29RldoeKnkvinEqi9/m/c9mh4jSsxqaiXP5+N6DEZR/2AR1M4/VK8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/grant: Purge PIN_FAIL() Message-Id: Date: Sat, 17 Jun 2023 11:22:52 +0000 commit 1512a68721620338daf477bf717d23befbb4faf5 Author: Andrew Cooper AuthorDate: Tue Jun 13 17:25:42 2023 +0100 Commit: Andrew Cooper CommitDate: Thu Jun 15 10:51:57 2023 +0100 xen/grant: Purge PIN_FAIL() The name PIN_FAIL() is poor; it's not used only for pinning failures. More importantly, it interferes with code legibility by hiding control flow. Expand and drop it. * Drop redundant "rc = rc" assignment * Rework gnttab_copy_buf() to be simpler by dropping the rc variable As a side effect, this fixes several violations of MISRA rule 2.1 (dead code - the while() following a goto). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Julien Grall Reviewed-by: Jan Beulich --- xen/common/grant_table.c | 154 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 111 insertions(+), 43 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index d87e58a53d..89b7811c51 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -270,13 +270,6 @@ struct gnttab_unmap_common { #define GNTTAB_UNMAP_BATCH_SIZE 32 -#define PIN_FAIL(_lbl, _rc, _f, _a...) \ - do { \ - gdprintk(XENLOG_WARNING, _f, ## _a ); \ - rc = (_rc); \ - goto _lbl; \ - } while ( 0 ) - /* * Tracks a mapping of another domain's grant reference. Each domain has a * table of these, indexes into which are returned as a 'mapping handle'. @@ -785,9 +778,13 @@ static int _set_status_v1(const grant_entry_header_t *shah, /* If not already pinned, check the grant domid and type. */ if ( !act->pin && (((scombo.flags & mask) != GTF_permit_access) || (scombo.domid != ldomid)) ) - PIN_FAIL(done, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "Bad flags (%x) or dom (%d); expected d%d\n", scombo.flags, scombo.domid, ldomid); + rc = GNTST_general_error; + goto done; + } new = scombo; new.flags |= GTF_reading; @@ -796,8 +793,12 @@ static int _set_status_v1(const grant_entry_header_t *shah, { new.flags |= GTF_writing; if ( unlikely(scombo.flags & GTF_readonly) ) - PIN_FAIL(done, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "Attempt to write-pin a r/o grant entry\n"); + rc = GNTST_general_error; + goto done; + } } prev.raw = guest_cmpxchg(rd, raw_shah, scombo.raw, new.raw); @@ -805,8 +806,11 @@ static int _set_status_v1(const grant_entry_header_t *shah, break; if ( retries++ == 4 ) - PIN_FAIL(done, GNTST_general_error, - "Shared grant entry is unstable\n"); + { + gdprintk(XENLOG_WARNING, "Shared grant entry is unstable\n"); + rc = GNTST_general_error; + goto done; + } scombo = prev; } @@ -840,9 +844,13 @@ static int _set_status_v2(const grant_entry_header_t *shah, ((((scombo.flags & mask) != GTF_permit_access) && (mapflag || ((scombo.flags & mask) != GTF_transitive))) || (scombo.domid != ldomid)) ) - PIN_FAIL(done, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "Bad flags (%x) or dom (%d); expected d%d, flags %x\n", scombo.flags, scombo.domid, ldomid, mask); + rc = GNTST_general_error; + goto done; + } if ( readonly ) { @@ -851,8 +859,12 @@ static int _set_status_v2(const grant_entry_header_t *shah, else { if ( unlikely(scombo.flags & GTF_readonly) ) - PIN_FAIL(done, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "Attempt to write-pin a r/o grant entry\n"); + rc = GNTST_general_error; + goto done; + } *status |= GTF_reading | GTF_writing; } @@ -870,9 +882,11 @@ static int _set_status_v2(const grant_entry_header_t *shah, (!readonly && (scombo.flags & GTF_readonly)) ) { gnttab_clear_flags(rd, GTF_writing | GTF_reading, status); - PIN_FAIL(done, GNTST_general_error, + gdprintk(XENLOG_WARNING, "Unstable flags (%x) or dom (%d); expected d%d (r/w: %d)\n", scombo.flags, scombo.domid, ldomid, !readonly); + rc = GNTST_general_error; + goto done; } } else @@ -880,8 +894,9 @@ static int _set_status_v2(const grant_entry_header_t *shah, if ( unlikely(scombo.flags & GTF_readonly) ) { gnttab_clear_flags(rd, GTF_writing, status); - PIN_FAIL(done, GNTST_general_error, - "Unstable grant readonly flag\n"); + gdprintk(XENLOG_WARNING, "Unstable grant readonly flag\n"); + rc = GNTST_general_error; + goto done; } } @@ -1050,8 +1065,12 @@ map_grant_ref( /* Bounds check on the grant ref */ ref = op->ref; if ( unlikely(ref >= nr_grant_entries(rgt))) - PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref %#x for d%d\n", + { + gdprintk(XENLOG_WARNING, "Bad ref %#x for d%d\n", ref, rgt->domain->domain_id); + rc = GNTST_bad_gntref; + goto unlock_out; + } /* This call also ensures the above check cannot be passed speculatively */ shah = shared_entry_header(rgt, ref); @@ -1062,9 +1081,13 @@ map_grant_ref( ((act->domid != ld->domain_id) || (act->pin & GNTPIN_incr2oflow_mask(pin_incr)) || (act->is_sub_page)) ) - PIN_FAIL(act_release_out, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "Bad domain (%d != %d), or risk of counter overflow %08x, or subpage %d\n", act->domid, ld->domain_id, act->pin, act->is_sub_page); + rc = GNTST_general_error; + goto act_release_out; + } /* Make sure we do not access memory speculatively */ status = evaluate_nospec(rgt->gt_version == 1) ? &shah->flags @@ -1465,9 +1488,13 @@ unmap_common( if ( op->dev_bus_addr && (flags & GNTMAP_device_map) && unlikely(op->dev_bus_addr != mfn_to_maddr(act->mfn)) ) - PIN_FAIL(act_release_out, GNTST_bad_dev_addr, + { + gdprintk(XENLOG_WARNING, "Bus address doesn't match gntref (%"PRIx64" != %"PRIpaddr")\n", op->dev_bus_addr, mfn_to_maddr(act->mfn)); + rc = GNTST_bad_dev_addr; + goto act_release_out; + } if ( op->host_addr && (flags & GNTMAP_host_map) ) { @@ -2560,8 +2587,11 @@ acquire_grant_for_copy( grant_read_lock(rgt); if ( unlikely(gref >= nr_grant_entries(rgt)) ) - PIN_FAIL(gt_unlock_out, GNTST_bad_gntref, - "Bad grant reference %#x\n", gref); + { + gdprintk(XENLOG_WARNING, "Bad grant reference %#x\n", gref); + rc = GNTST_bad_gntref; + goto gt_unlock_out; + } /* This call also ensures the above check cannot be passed speculatively */ shah = shared_entry_header(rgt, gref); @@ -2571,9 +2601,13 @@ acquire_grant_for_copy( if ( act->pin && ((act->domid != ldom) || (act->pin & GNTPIN_incr2oflow_mask(pin_incr))) ) - PIN_FAIL(unlock_out, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "Bad domain (%d != %d), or risk of counter overflow %08x\n", act->domid, ldom, act->pin); + rc = GNTST_general_error; + goto unlock_out; + } if ( evaluate_nospec(rgt->gt_version == 1) ) { @@ -2596,16 +2630,24 @@ acquire_grant_for_copy( goto unlock_out; if ( !allow_transitive ) - PIN_FAIL(unlock_out_clear, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "transitive grant when transitivity not allowed\n"); + rc = GNTST_general_error; + goto unlock_out_clear; + } trans_domid = sha2->transitive.trans_domid; trans_gref = sha2->transitive.gref; barrier(); /* Stop the compiler from re-loading trans_domid from shared memory */ if ( trans_domid == rd->domain_id ) - PIN_FAIL(unlock_out_clear, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "transitive grants cannot be self-referential\n"); + rc = GNTST_general_error; + goto unlock_out_clear; + } /* * We allow the trans_domid == ldom case, which corresponds to a @@ -2618,9 +2660,13 @@ acquire_grant_for_copy( /* We need to leave the rrd locked during the grant copy. */ td = rcu_lock_domain_by_id(trans_domid); if ( td == NULL ) - PIN_FAIL(unlock_out_clear, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "transitive grant referenced bad domain %d\n", trans_domid); + rc = GNTST_general_error; + goto unlock_out_clear; + } /* * acquire_grant_for_copy() will take the lock on the remote table, @@ -2928,8 +2974,11 @@ static int gnttab_copy_claim_buf(const struct gnttab_copy *op, rc = get_paged_frame(ptr->u.gmfn, &buf->mfn, &buf->page, buf->read_only, buf->domain); if ( rc != GNTST_okay ) - PIN_FAIL(out, rc, + { + gdprintk(XENLOG_WARNING, "source frame %"PRI_xen_pfn" invalid\n", ptr->u.gmfn); + goto out; + } buf->ptr.u.gmfn = ptr->u.gmfn; buf->ptr.offset = 0; @@ -2972,25 +3021,29 @@ static int gnttab_copy_buf(const struct gnttab_copy *op, struct gnttab_copy_buf *dest, const struct gnttab_copy_buf *src) { - int rc; - if ( ((op->source.offset + op->len) > PAGE_SIZE) || ((op->dest.offset + op->len) > PAGE_SIZE) ) - PIN_FAIL(out, GNTST_bad_copy_arg, "copy beyond page area\n"); + { + gdprintk(XENLOG_WARNING, "copy beyond page area\n"); + return GNTST_bad_copy_arg; + } if ( op->source.offset < src->ptr.offset || op->source.offset + op->len > src->ptr.offset + src->len ) - PIN_FAIL(out, GNTST_general_error, + { + gdprintk(XENLOG_WARNING, "copy source out of bounds: %d < %d || %d > %d\n", - op->source.offset, src->ptr.offset, - op->len, src->len); + op->source.offset, src->ptr.offset, op->len, src->len); + return GNTST_general_error; + } if ( op->dest.offset < dest->ptr.offset || op->dest.offset + op->len > dest->ptr.offset + dest->len ) - PIN_FAIL(out, GNTST_general_error, - "copy dest out of bounds: %d < %d || %d > %d\n", - op->dest.offset, dest->ptr.offset, - op->len, dest->len); + { + gdprintk(XENLOG_WARNING, "copy dest out of bounds: %d < %d || %d > %d\n", + op->dest.offset, dest->ptr.offset, op->len, dest->len); + return GNTST_general_error; + } /* Make sure the above checks are not bypassed speculatively */ block_speculation(); @@ -2998,9 +3051,8 @@ static int gnttab_copy_buf(const struct gnttab_copy *op, memcpy(dest->virt + op->dest.offset, src->virt + op->source.offset, op->len); gnttab_mark_dirty(dest->domain, dest->mfn); - rc = GNTST_okay; - out: - return rc; + + return GNTST_okay; } static int gnttab_copy_one(const struct gnttab_copy *op, @@ -3373,9 +3425,17 @@ swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) /* Bounds check on the grant refs */ if ( unlikely(ref_a >= nr_grant_entries(d->grant_table))) - PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a %#x\n", ref_a); + { + gdprintk(XENLOG_WARNING, "Bad ref-a %#x\n", ref_a); + rc = GNTST_bad_gntref; + goto out; + } if ( unlikely(ref_b >= nr_grant_entries(d->grant_table))) - PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-b %#x\n", ref_b); + { + gdprintk(XENLOG_WARNING, "Bad ref-b %#x\n", ref_b); + rc = GNTST_bad_gntref; + goto out; + } /* Make sure the above checks are not bypassed speculatively */ block_speculation(); @@ -3386,11 +3446,19 @@ swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) act_a = active_entry_acquire(gt, ref_a); if ( act_a->pin ) - PIN_FAIL(out, GNTST_eagain, "ref a %#x busy\n", ref_a); + { + gdprintk(XENLOG_WARNING, "ref a %#x busy\n", ref_a); + rc = GNTST_eagain; + goto out; + } act_b = active_entry_acquire(gt, ref_b); if ( act_b->pin ) - PIN_FAIL(out, GNTST_eagain, "ref b %#x busy\n", ref_b); + { + gdprintk(XENLOG_WARNING, "ref b %#x busy\n", ref_b); + rc = GNTST_eagain; + goto out; + } if ( evaluate_nospec(gt->gt_version == 1) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:23:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550624.859734 (Exim 4.92) (envelope-from ) id 1qAU1I-0007yC-CD; Sat, 17 Jun 2023 11:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550624.859734; Sat, 17 Jun 2023 11:23:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1I-0007y4-9L; Sat, 17 Jun 2023 11:23:04 +0000 Received: by outflank-mailman (input) for mailman id 550624; Sat, 17 Jun 2023 11:23:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1H-0007xq-0h for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1G-0002Le-W1 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU1G-0006vd-UP for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Lf6HLzxu26ddDVEqLZiLUONZlUMOS917z/9fpW2gOM4=; b=19QjIpIUrYVv5qXkRIn+3zg7Bx p8HRTKcJwH+2u5odT8abuLV5g1ngWN2cjP+Z1keuRQ76cpD/o/kFKfZvK+xh++narOJGUizmrkeFi xTKDjg0tbP83JkPnX1vosvlp0/XzgQBERmrp+Mnz17v3LyCnKNOYap1o+/1cZsJ0/HoQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: traps: remove inlining of handle_ro_raz() Message-Id: Date: Sat, 17 Jun 2023 11:23:02 +0000 commit 4802e4a44e76788499132158fa49325916bdc598 Author: Federico Serafini AuthorDate: Thu Jun 15 15:50:16 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 15 21:19:33 2023 +0100 xen/arm: traps: remove inlining of handle_ro_raz() To comply with MISRA C:2012 Rule 8.10 ("An inline function shall be declared with the static storage class"), remove inline function specifier from handle_ro_raz() since asking the compiler to inline such function does not seem to add any kind of value. Signed-off-by: Federico Serafini Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/traps.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index f6437f6aa9..ef5c6a8195 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1677,11 +1677,11 @@ void handle_ro_read_val(struct cpu_user_regs *regs, } /* Read only as read as zero */ -inline void handle_ro_raz(struct cpu_user_regs *regs, - int regidx, - bool read, - const union hsr hsr, - int min_el) +void handle_ro_raz(struct cpu_user_regs *regs, + int regidx, + bool read, + const union hsr hsr, + int min_el) { handle_ro_read_val(regs, regidx, read, hsr, min_el, 0); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:23:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550625.859739 (Exim 4.92) (envelope-from ) id 1qAU1S-000815-Dd; Sat, 17 Jun 2023 11:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550625.859739; Sat, 17 Jun 2023 11:23:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1S-00080y-Au; Sat, 17 Jun 2023 11:23:14 +0000 Received: by outflank-mailman (input) for mailman id 550625; Sat, 17 Jun 2023 11:23:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1R-00080j-3Q for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1R-0002Ln-2f for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU1R-0006w8-1v for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iJGE3CMtC6uykP2L0u0wxA3MMKf+OR2mIVCLf16oFjw=; b=6W+rK7vnCSNm/PjUA+pBYzc//n qsk6cEoT21XtAeqMu1Yzdo17d45UHQQcArnu07QuOAGM1egFG4GbmM3onvGq1CI/fZ4bR5r528uvh /UItMVAJaY2+ECckQsa9iOgAL5ZBVfc1pHbkOV+nkwsoA8Iw8ngMCUkmhMdbWkvsV2s0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Remove stray semicolon at VREG_REG_HELPERS/TLB_HELPER* callers Message-Id: Date: Sat, 17 Jun 2023 11:23:13 +0000 commit 6044b485ba5b0e4073a773402cedc2f2fae540ad Author: Michal Orzel AuthorDate: Wed Jun 14 11:41:44 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 15 21:34:45 2023 +0100 xen/arm: Remove stray semicolon at VREG_REG_HELPERS/TLB_HELPER* callers This is inconsistent with the rest of the code where macros are used to define functions, as it results in an empty declaration (i.e. semicolon with nothing before it) after function definition. This is also not allowed by C99. Take the opportunity to undefine TLB_HELPER* macros after last use. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/arch/arm/include/asm/arm32/flushtlb.h | 12 +++++++----- xen/arch/arm/include/asm/arm64/flushtlb.h | 17 ++++++++++------- xen/arch/arm/include/asm/vreg.h | 4 ++-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/flushtlb.h b/xen/arch/arm/include/asm/arm32/flushtlb.h index 7ae6a12f81..22ee3b317b 100644 --- a/xen/arch/arm/include/asm/arm32/flushtlb.h +++ b/xen/arch/arm/include/asm/arm32/flushtlb.h @@ -29,19 +29,21 @@ static inline void name(void) \ } /* Flush local TLBs, current VMID only */ -TLB_HELPER(flush_guest_tlb_local, TLBIALL, nsh); +TLB_HELPER(flush_guest_tlb_local, TLBIALL, nsh) /* Flush inner shareable TLBs, current VMID only */ -TLB_HELPER(flush_guest_tlb, TLBIALLIS, ish); +TLB_HELPER(flush_guest_tlb, TLBIALLIS, ish) /* Flush local TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb_local, TLBIALLNSNH, nsh); +TLB_HELPER(flush_all_guests_tlb_local, TLBIALLNSNH, nsh) /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb, TLBIALLNSNHIS, ish); +TLB_HELPER(flush_all_guests_tlb, TLBIALLNSNHIS, ish) /* Flush all hypervisor mappings from the TLB of the local processor. */ -TLB_HELPER(flush_xen_tlb_local, TLBIALLH, nsh); +TLB_HELPER(flush_xen_tlb_local, TLBIALLH, nsh) + +#undef TLB_HELPER /* Flush TLB of local processor for address va. */ static inline void __flush_xen_tlb_one_local(vaddr_t va) diff --git a/xen/arch/arm/include/asm/arm64/flushtlb.h b/xen/arch/arm/include/asm/arm64/flushtlb.h index 3a9092b814..56c6fc763b 100644 --- a/xen/arch/arm/include/asm/arm64/flushtlb.h +++ b/xen/arch/arm/include/asm/arm64/flushtlb.h @@ -67,25 +67,28 @@ static inline void name(vaddr_t va) \ } /* Flush local TLBs, current VMID only. */ -TLB_HELPER(flush_guest_tlb_local, vmalls12e1, nsh); +TLB_HELPER(flush_guest_tlb_local, vmalls12e1, nsh) /* Flush innershareable TLBs, current VMID only */ -TLB_HELPER(flush_guest_tlb, vmalls12e1is, ish); +TLB_HELPER(flush_guest_tlb, vmalls12e1is, ish) /* Flush local TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb_local, alle1, nsh); +TLB_HELPER(flush_all_guests_tlb_local, alle1, nsh) /* Flush innershareable TLBs, all VMIDs, non-hypervisor mode */ -TLB_HELPER(flush_all_guests_tlb, alle1is, ish); +TLB_HELPER(flush_all_guests_tlb, alle1is, ish) /* Flush all hypervisor mappings from the TLB of the local processor. */ -TLB_HELPER(flush_xen_tlb_local, alle2, nsh); +TLB_HELPER(flush_xen_tlb_local, alle2, nsh) /* Flush TLB of local processor for address va. */ -TLB_HELPER_VA(__flush_xen_tlb_one_local, vae2); +TLB_HELPER_VA(__flush_xen_tlb_one_local, vae2) /* Flush TLB of all processors in the inner-shareable domain for address va. */ -TLB_HELPER_VA(__flush_xen_tlb_one, vae2is); +TLB_HELPER_VA(__flush_xen_tlb_one, vae2is) + +#undef TLB_HELPER +#undef TLB_HELPER_VA #endif /* __ASM_ARM_ARM64_FLUSHTLB_H__ */ /* diff --git a/xen/arch/arm/include/asm/vreg.h b/xen/arch/arm/include/asm/vreg.h index d92450017b..bf945eebbd 100644 --- a/xen/arch/arm/include/asm/vreg.h +++ b/xen/arch/arm/include/asm/vreg.h @@ -140,8 +140,8 @@ static inline void vreg_reg##sz##_clearbits(uint##sz##_t *reg, \ *reg &= ~(((uint##sz##_t)bits & mask) << shift); \ } -VREG_REG_HELPERS(64, 0x7); -VREG_REG_HELPERS(32, 0x3); +VREG_REG_HELPERS(64, 0x7) +VREG_REG_HELPERS(32, 0x3) #undef VREG_REG_HELPERS -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550626.859743 (Exim 4.92) (envelope-from ) id 1qAU1c-00083j-Fb; Sat, 17 Jun 2023 11:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550626.859743; Sat, 17 Jun 2023 11:23:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1c-00083c-Cq; Sat, 17 Jun 2023 11:23:24 +0000 Received: by outflank-mailman (input) for mailman id 550626; Sat, 17 Jun 2023 11:23:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1b-00083R-6W for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1b-0002M5-5l for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU1b-0006wX-4y for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ffONu0Rguz9CYubG3ruR8CZI8qCr8KJeSjqnT+pgQ/4=; b=k3T9JJjvns9RvP08IhtO6QgR65 z43wxdMYKY0VN5ENhUYDQNXqLZOS0lAuGsUARPM7e9lXACYVwi/oVwe8759jgJOaPxol3hbwWgF48 WEjf2Wmipqbx1WqOosVD7j2PD6Dz87cc1VXRp8jV0zaFAX/nbTSxWLK8a7zayb9kgfAk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Append a newline character to panic() where missing Message-Id: Date: Sat, 17 Jun 2023 11:23:23 +0000 commit c4e492a1399b763400daf3ca35fcef3028c7a7da Author: Michal Orzel AuthorDate: Wed Jun 14 09:30:18 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 15 21:53:03 2023 +0100 xen: Append a newline character to panic() where missing Missing newline is inconsistent with the rest of the callers, since panic() expects it. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Bertrand Marquis Acked-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/arm/bootfdt.c | 2 +- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/x86/cpu/microcode/core.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index b6f92a174f..2673ad17a1 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -225,7 +225,7 @@ static int __init process_reserved_memory_node(const void *fdt, int node, size_cells, data); if ( rc == -ENOSPC ) - panic("Max number of supported reserved-memory regions reached."); + panic("Max number of supported reserved-memory regions reached.\n"); else if ( rc != -ENOENT ) return rc; return 0; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 579bc8194f..d0d6be922d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -74,7 +74,7 @@ int __init parse_arch_dom0_param(const char *s, const char *e) return 0; #else - panic("'sve' property found, but CONFIG_ARM64_SVE not selected"); + panic("'sve' property found, but CONFIG_ARM64_SVE not selected\n"); #endif } @@ -697,7 +697,7 @@ static void __init allocate_static_memory(struct domain *d, return; fail: - panic("Failed to allocate requested static memory for domain %pd.", d); + panic("Failed to allocate requested static memory for domain %pd.\n", d); } /* @@ -769,7 +769,7 @@ static void __init assign_static_memory_11(struct domain *d, return; fail: - panic("Failed to assign requested static memory for direct-map domain %pd.", + panic("Failed to assign requested static memory for direct-map domain %pd.\n", d); } diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index e65af4b82e..c3fee62906 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -524,7 +524,7 @@ static int control_thread_fn(const struct microcode_patch *patch) */ if ( wait_for_condition(wait_cpu_callout, (done + 1), MICROCODE_UPDATE_TIMEOUT_US) ) - panic("Timeout when finished updating microcode (finished %u/%u)", + panic("Timeout when finished updating microcode (finished %u/%u)\n", done, nr_cores); /* Print warning message once if long time is spent here */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550627.859747 (Exim 4.92) (envelope-from ) id 1qAU1m-00086f-HH; Sat, 17 Jun 2023 11:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550627.859747; Sat, 17 Jun 2023 11:23:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1m-00086X-EW; Sat, 17 Jun 2023 11:23:34 +0000 Received: by outflank-mailman (input) for mailman id 550627; Sat, 17 Jun 2023 11:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1l-00086M-9i for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1l-0002MX-8s for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU1l-0006wy-7t for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zvHmQgCVi6XQlljx8s3/SLfPnmcnbuxKIK/c5hSvvRU=; b=SQChM6v3YVU25qD/YmqFhWU/wK KhEjkJusdWmyI5zdi++ZgC5W/AVF5odu5bmOtx2XMtEWnJksovnVNsLDW+OeoPIvMfHLuVfUaVRPt AqVRrv4ZZI5GSqUBsuZNk4rrJZQAv4kVA185LUFt/C5EEYi6JHc8o9B0nKhLYtQH9emw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Fix the rendering of FB_CLEAR Message-Id: Date: Sat, 17 Jun 2023 11:23:33 +0000 commit 921afcbae843bb3f575a8f4a270b8e6cf471f4ca Author: Andrew Cooper AuthorDate: Mon Jun 12 20:24:00 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 16 14:23:38 2023 +0100 x86/spec-ctrl: Fix the rendering of FB_CLEAR FB_CLEAR is a read-only status bit, not a read-write control. Move it from "Hardware features" into "Hardware hints". Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/spec_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index cd5ea6aa52..ec4bcdd97e 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -409,7 +409,7 @@ static void __init print_details(enum ind_thunk thunk) * Hardware read-only information, stating immunity to certain issues, or * suggestions of which mitigation to use. */ - printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware hints:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", (caps & ARCH_CAPS_EIBRS) ? " EIBRS" : "", (caps & ARCH_CAPS_RSBA) ? " RSBA" : "", @@ -422,6 +422,7 @@ static void __init print_details(enum ind_thunk thunk) (caps & ARCH_CAPS_SBDR_SSDP_NO) ? " SBDR_SSDP_NO" : "", (caps & ARCH_CAPS_FBSDP_NO) ? " FBSDP_NO" : "", (caps & ARCH_CAPS_PSDP_NO) ? " PSDP_NO" : "", + (caps & ARCH_CAPS_FB_CLEAR) ? " FB_CLEAR" : "", (caps & ARCH_CAPS_PBRSB_NO) ? " PBRSB_NO" : "", (e8b & cpufeat_mask(X86_FEATURE_IBRS_ALWAYS)) ? " IBRS_ALWAYS" : "", (e8b & cpufeat_mask(X86_FEATURE_STIBP_ALWAYS)) ? " STIBP_ALWAYS" : "", @@ -431,7 +432,7 @@ static void __init print_details(enum ind_thunk thunk) (e8b & cpufeat_mask(X86_FEATURE_IBPB_RET)) ? " IBPB_RET" : ""); /* Hardware features which need driving to mitigate issues. */ - printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s\n", + printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s\n", (e8b & cpufeat_mask(X86_FEATURE_IBPB)) || (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBPB" : "", (e8b & cpufeat_mask(X86_FEATURE_IBRS)) || @@ -447,7 +448,6 @@ static void __init print_details(enum ind_thunk thunk) (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", (e8b & cpufeat_mask(X86_FEATURE_VIRT_SSBD)) ? " VIRT_SSBD" : "", (caps & ARCH_CAPS_TSX_CTRL) ? " TSX_CTRL" : "", - (caps & ARCH_CAPS_FB_CLEAR) ? " FB_CLEAR" : "", (caps & ARCH_CAPS_FB_CLEAR_CTRL) ? " FB_CLEAR_CTRL" : ""); /* Compiled-in support which pertains to mitigations. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:23:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:23:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550628.859751 (Exim 4.92) (envelope-from ) id 1qAU1w-00089L-Iv; Sat, 17 Jun 2023 11:23:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550628.859751; Sat, 17 Jun 2023 11:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1w-00089B-G5; Sat, 17 Jun 2023 11:23:44 +0000 Received: by outflank-mailman (input) for mailman id 550628; Sat, 17 Jun 2023 11:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1v-00088x-D5 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU1v-0002Mf-CH for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU1v-0006xT-B4 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=CXxt1fFQdWDzZ1XcesmQq0y0b/L8BnFkCnqQ319Q7XE=; b=ayzd9Bi9oUHUiUxDvzOl0ubMzf AocrF08SF3aBPzpYStuIjdWF5xcMMUazDC+PTERjtzdvv35Aiz23DPyvCx/KnkgsyE/auNCk0+n3A bLbyDfocAzMZnO80NV6zAU7WiSULdkLKa3Tl0/+y0tlTZBrT82lgqsOYNCCKxL4slW18=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Use a taint for CET without MSR_SPEC_CTRL Message-Id: Date: Sat, 17 Jun 2023 11:23:43 +0000 commit 3f63f4510422c29fda7ba238b880cbb53eca34fe Author: Andrew Cooper AuthorDate: Mon Jun 5 11:09:11 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 16 14:23:38 2023 +0100 x86/spec-ctrl: Use a taint for CET without MSR_SPEC_CTRL Reword the comment for 'S' to include an incompatible set of features on the same core. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/spec_ctrl.c | 3 +++ xen/common/kernel.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index ec4bcdd97e..7ad7494105 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -1132,7 +1132,10 @@ void __init init_speculation_mitigations(void) if ( read_cr4() & X86_CR4_CET ) { if ( !has_spec_ctrl ) + { printk(XENLOG_WARNING "?!? CET active, but no MSR_SPEC_CTRL?\n"); + add_taint(TAINT_CPU_OUT_OF_SPEC); + } else if ( opt_ibrs == -1 ) opt_ibrs = ibrs = true; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index fd975ae21e..719b08d6c7 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -373,7 +373,7 @@ unsigned int tainted; * 'H' - HVM forced emulation prefix is permitted. * 'I' - Platform is insecure (usually due to an errata on the platform). * 'M' - Machine had a machine check experience. - * 'S' - Out of spec CPU (One core has a feature incompatible with others). + * 'S' - Out of spec CPU (Incompatible features on one or more cores). * * The string is overwritten by the next call to print_taint(). */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:23:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550629.859755 (Exim 4.92) (envelope-from ) id 1qAU26-0008By-KK; Sat, 17 Jun 2023 11:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550629.859755; Sat, 17 Jun 2023 11:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU26-0008Bq-HR; Sat, 17 Jun 2023 11:23:54 +0000 Received: by outflank-mailman (input) for mailman id 550629; Sat, 17 Jun 2023 11:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU25-0008Bd-Ft for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU25-0002Ms-FD for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU25-0006xs-EO for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:23:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3jkZvDGd0lRDV9SjvzfjwRYPv3orZzkqEJz2nrbaJzc=; b=BlCW/qm/RyDpel1L5+s9aAA+m+ mQAN4LlwQs9H7Q618pqUdFnedZle1UZHxKXVFKogjFB+Im5n9d/26Izhmqk8Mhi0MINQudgG4/XIl I0iKD/EIIvgFsCzYR4s0VkyyFw8w/dZgyyTzDnW9C7DSvd4a2EuOBiiPF9cC0IXh+T4Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Rename retpoline_safe() to retpoline_calculations() Message-Id: Date: Sat, 17 Jun 2023 11:23:53 +0000 commit 724c0d94ff79b208312d30676392bfdd693403be Author: Andrew Cooper AuthorDate: Fri May 26 10:35:47 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 16 14:23:38 2023 +0100 x86/spec-ctrl: Rename retpoline_safe() to retpoline_calculations() This is prep work, split out to simply the diff on the following change. * Rename to retpoline_calculations(), and call unconditionally. It is shortly going to synthesise missing enumerations required for guest safety. * For the model check switch statement, store the result in a variable and break rather than returning directly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/spec_ctrl.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 7ad7494105..bca3d3ff3f 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -580,9 +580,10 @@ static bool __init check_smt_enabled(void) } /* Calculate whether Retpoline is known-safe on this CPU. */ -static bool __init retpoline_safe(void) +static bool __init retpoline_calculations(void) { unsigned int ucode_rev = this_cpu(cpu_sig).rev; + bool safe = false; if ( boot_cpu_data.x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON) ) return true; @@ -620,29 +621,31 @@ static bool __init retpoline_safe(void) case 0x3f: /* Haswell EX/EP */ case 0x45: /* Haswell D */ case 0x46: /* Haswell H */ - return true; + safe = true; + break; /* * Broadwell processors are retpoline-safe after specific microcode * versions. */ case 0x3d: /* Broadwell */ - return ucode_rev >= 0x2a; + safe = ucode_rev >= 0x2a; break; case 0x47: /* Broadwell H */ - return ucode_rev >= 0x1d; + safe = ucode_rev >= 0x1d; break; case 0x4f: /* Broadwell EP/EX */ - return ucode_rev >= 0xb000021; + safe = ucode_rev >= 0xb000021; break; case 0x56: /* Broadwell D */ switch ( boot_cpu_data.x86_mask ) { - case 2: return ucode_rev >= 0x15; - case 3: return ucode_rev >= 0x7000012; - case 4: return ucode_rev >= 0xf000011; - case 5: return ucode_rev >= 0xe000009; + case 2: safe = ucode_rev >= 0x15; break; + case 3: safe = ucode_rev >= 0x7000012; break; + case 4: safe = ucode_rev >= 0xf000011; break; + case 5: safe = ucode_rev >= 0xe000009; break; default: printk("Unrecognised CPU stepping %#x - assuming not reptpoline safe\n", boot_cpu_data.x86_mask); - return false; + safe = false; + break; } break; @@ -656,7 +659,8 @@ static bool __init retpoline_safe(void) case 0x67: /* Cannonlake? */ case 0x8e: /* Kabylake M */ case 0x9e: /* Kabylake D */ - return false; + safe = false; + break; /* * Atom processors before Goldmont Plus/Gemini Lake are retpoline-safe. @@ -675,13 +679,17 @@ static bool __init retpoline_safe(void) case 0x5c: /* Goldmont */ case 0x5f: /* Denverton */ case 0x85: /* Knights Mill */ - return true; + safe = true; + break; default: printk("Unrecognised CPU model %#x - assuming not reptpoline safe\n", boot_cpu_data.x86_model); - return false; + safe = false; + break; } + + return safe; } /* @@ -1114,7 +1122,7 @@ void __init init_speculation_mitigations(void) { enum ind_thunk thunk = THUNK_DEFAULT; bool has_spec_ctrl, ibrs = false, hw_smt_enabled; - bool cpu_has_bug_taa; + bool cpu_has_bug_taa, retpoline_safe; hw_smt_enabled = check_smt_enabled(); @@ -1143,6 +1151,9 @@ void __init init_speculation_mitigations(void) thunk = THUNK_JMP; } + /* Determine if retpoline is safe on this CPU. */ + retpoline_safe = retpoline_calculations(); + /* * Has the user specified any custom BTI mitigations? If so, follow their * instructions exactly and disable all heuristics. @@ -1164,7 +1175,7 @@ void __init init_speculation_mitigations(void) * On all hardware, we'd like to use retpoline in preference to * IBRS, but only if it is safe on this hardware. */ - if ( retpoline_safe() ) + if ( retpoline_safe ) thunk = THUNK_RETPOLINE; else if ( has_spec_ctrl ) ibrs = true; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:24:05 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:24:05 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550630.859759 (Exim 4.92) (envelope-from ) id 1qAU2H-0008FV-Nl; Sat, 17 Jun 2023 11:24:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550630.859759; Sat, 17 Jun 2023 11:24:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2H-0008FN-Kl; Sat, 17 Jun 2023 11:24:05 +0000 Received: by outflank-mailman (input) for mailman id 550630; Sat, 17 Jun 2023 11:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2F-0008F9-J2 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2F-0002NF-IJ for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU2F-0006yS-HX for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DoJcHk4HOblyjGuoVQREFEN8W0IVDM/AnbnS9Ng5qTA=; b=k/imzUPUInuZDp5iS6IwCRRJR1 tq9O5tFwqkh7vaFb381fpYXvaY8AxORrYtvI7OIe6fk+TA90GoHGcnTh9l6Xh1WOcO4FAJYwf+TX2 0CAITgZtEj7UPlFucC1OobMWydgQN+nS2uYDrFYFYhismoU5Wtvv/rILVZ/06mhScXxQ=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/spec-ctrl: Fix up the RSBA/RRSBA bits as appropriate Message-Id: Date: Sat, 17 Jun 2023 11:24:03 +0000 commit 36525a964fb629d0bd26e5a1c42de467af7a42a7 Author: Andrew Cooper AuthorDate: Thu May 25 20:31:22 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 16 14:23:38 2023 +0100 x86/spec-ctrl: Fix up the RSBA/RRSBA bits as appropriate In order to level a VM safely for migration, the toolstack needs to know the RSBA/RRSBA properties of the CPU, whether or not they happen to be enumerated. See the code comment for details. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/cpufeature.h | 1 + xen/arch/x86/spec_ctrl.c | 100 ++++++++++++++++++++++++++++++++-- 2 files changed, 96 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/cpufeature.h b/xen/arch/x86/include/asm/cpufeature.h index ace31e3b1f..e2cb8f3cc7 100644 --- a/xen/arch/x86/include/asm/cpufeature.h +++ b/xen/arch/x86/include/asm/cpufeature.h @@ -193,6 +193,7 @@ static inline bool boot_cpu_has(unsigned int feat) #define cpu_has_tsx_ctrl boot_cpu_has(X86_FEATURE_TSX_CTRL) #define cpu_has_taa_no boot_cpu_has(X86_FEATURE_TAA_NO) #define cpu_has_fb_clear boot_cpu_has(X86_FEATURE_FB_CLEAR) +#define cpu_has_rrsba boot_cpu_has(X86_FEATURE_RRSBA) /* Synthesized. */ #define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index bca3d3ff3f..4081cef200 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -579,7 +579,10 @@ static bool __init check_smt_enabled(void) return false; } -/* Calculate whether Retpoline is known-safe on this CPU. */ +/* + * Calculate whether Retpoline is known-safe on this CPU. Fix up the + * RSBA/RRSBA bits as necessary. + */ static bool __init retpoline_calculations(void) { unsigned int ucode_rev = this_cpu(cpu_sig).rev; @@ -593,15 +596,93 @@ static bool __init retpoline_calculations(void) return false; /* - * RSBA may be set by a hypervisor to indicate that we may move to a - * processor which isn't retpoline-safe. + * The meaning of the RSBA and RRSBA bits have evolved over time. The + * agreed upon meaning at the time of writing (May 2023) is thus: + * + * - RSBA (RSB Alternative) means that an RSB may fall back to an + * alternative predictor on underflow. Skylake uarch and later all have + * this property. Broadwell too, when running microcode versions prior + * to Jan 2018. + * + * - All eIBRS-capable processors suffer RSBA, but eIBRS also introduces + * tagging of predictions with the mode in which they were learned. So + * when eIBRS is active, RSBA becomes RRSBA (Restricted RSBA). + * + * - CPUs are not expected to enumerate both RSBA and RRSBA. + * + * Some parts (Broadwell) are not expected to ever enumerate this + * behaviour directly. Other parts have differing enumeration with + * microcode version. Fix up Xen's idea, so we can advertise them safely + * to guests, and so toolstacks can level a VM safety for migration. + * + * The following states exist: + * + * | | RSBA | EIBRS | RRSBA | Notes | Action (in principle) | + * |---+------+-------+-------+--------------------+-----------------------| + * | 1 | 0 | 0 | 0 | OK (older parts) | Maybe +RSBA | + * | 2 | 0 | 0 | 1 | Broken | (+RSBA, -RRSBA) | + * | 3 | 0 | 1 | 0 | OK (pre-Aug ucode) | +RRSBA | + * | 4 | 0 | 1 | 1 | OK | | + * | 5 | 1 | 0 | 0 | OK | | + * | 6 | 1 | 0 | 1 | Broken | (-RRSBA) | + * | 7 | 1 | 1 | 0 | Broken | (-RSBA, +RRSBA) | + * | 8 | 1 | 1 | 1 | Broken | (-RSBA) | + * + * However, we don't need perfect adherence to the spec. We only need + * RSBA || RRSBA to indicate "alternative predictors potentially in use". + * Rows 1 & 3 are fixed up by later logic, as they're known configurations + * which exist in the world. * + * Complain loudly at the broken cases. They're safe for Xen to use (so we + * don't attempt to correct), and may or may not exist in reality, but if + * we ever encounter them in practice, something is wrong and needs + * further investigation. + */ + if ( cpu_has_eibrs ? cpu_has_rsba /* Rows 7, 8 */ + : cpu_has_rrsba /* Rows 2, 6 */ ) + { + printk(XENLOG_ERR + "FIRMWARE BUG: CPU %02x-%02x-%02x, ucode 0x%08x: RSBA %u, EIBRS %u, RRSBA %u\n", + boot_cpu_data.x86, boot_cpu_data.x86_model, + boot_cpu_data.x86_mask, ucode_rev, + cpu_has_rsba, cpu_has_eibrs, cpu_has_rrsba); + add_taint(TAINT_CPU_OUT_OF_SPEC); + } + + /* * Processors offering Enhanced IBRS are not guarenteed to be * repoline-safe. */ - if ( cpu_has_rsba || cpu_has_eibrs ) + if ( cpu_has_eibrs ) + { + /* + * Prior to the August 2023 microcode, many eIBRS-capable parts did + * not enumerate RRSBA. + */ + if ( !cpu_has_rrsba ) + setup_force_cpu_cap(X86_FEATURE_RRSBA); + + return false; + } + + /* + * RSBA is explicitly enumerated in some cases, but may also be set by a + * hypervisor to indicate that we may move to a processor which isn't + * retpoline-safe. + */ + if ( cpu_has_rsba ) return false; + /* + * At this point, we've filtered all the legal RSBA || RRSBA cases (or the + * known non-ideal cases). If ARCH_CAPS is visible, trust the absence of + * RSBA || RRSBA. There's no known microcode which advertises ARCH_CAPS + * without RSBA or EIBRS, and if we're virtualised we can't rely the model + * check anyway. + */ + if ( cpu_has_arch_caps ) + return true; + switch ( boot_cpu_data.x86_model ) { case 0x17: /* Penryn */ @@ -689,6 +770,15 @@ static bool __init retpoline_calculations(void) break; } + if ( !safe ) + { + /* + * Note: the eIBRS-capable parts are filtered out earlier, so the + * remainder here are the ones which suffer RSBA behaviour. + */ + setup_force_cpu_cap(X86_FEATURE_RSBA); + } + return safe; } @@ -1151,7 +1241,7 @@ void __init init_speculation_mitigations(void) thunk = THUNK_JMP; } - /* Determine if retpoline is safe on this CPU. */ + /* Determine if retpoline is safe on this CPU. Fix up RSBA/RRSBA enumerations. */ retpoline_safe = retpoline_calculations(); /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:24:15 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:24:15 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550631.859764 (Exim 4.92) (envelope-from ) id 1qAU2R-0008IC-Pl; Sat, 17 Jun 2023 11:24:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550631.859764; Sat, 17 Jun 2023 11:24:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2R-0008I0-MY; Sat, 17 Jun 2023 11:24:15 +0000 Received: by outflank-mailman (input) for mailman id 550631; Sat, 17 Jun 2023 11:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2P-0008Hm-MJ for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2P-0002NM-Lb for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU2P-0006z1-KW for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hc/Y/cUj7rX/ZuaYZEUPmPmQgHj1SOoyY6yu4QwkEmg=; b=R9FMLydP5qA81IXyy3vnx5rzpa milwYgs50IPgDa+zbkfSYPwy65qhnI+VhnQIu/uAQ17RvAUT9fE4h4LWoVC7sgIK1RTXAs8HbZQHt YmTPXxD9QoR5OH8iwLv34o8Ijb+mwcfdT09SIn9166H8wDj+ymaYStFGtEe2K7EbnUec=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/cpu-policy: Derive RSBA/RRSBA for guest policies Message-Id: Date: Sat, 17 Jun 2023 11:24:13 +0000 commit e0586a4ff514590eec50185e2440b97f9a31cb7f Author: Andrew Cooper AuthorDate: Wed May 24 15:41:21 2023 +0100 Commit: Andrew Cooper CommitDate: Fri Jun 16 14:23:38 2023 +0100 x86/cpu-policy: Derive RSBA/RRSBA for guest policies The RSBA bit, "RSB Alternative", means that the RSB may use alternative predictors when empty. From a practical point of view, this mean "Retpoline not safe". Enhanced IBRS (officially IBRS_ALL in Intel's docs, previously IBRS_ATT) is a statement that IBRS is implemented in hardware (as opposed to the form retrofitted to existing CPUs in microcode). The RRSBA bit, "Restricted-RSBA", is a combination of RSBA, and the eIBRS property that predictions are tagged with the mode in which they were learnt. Therefore, it means "when eIBRS is active, the RSB may fall back to alternative predictors but restricted to the current prediction mode". As such, it's stronger statement than RSBA, but still means "Retpoline not safe". CPUs are not expected to enumerate both RSBA and RRSBA. Add feature dependencies for EIBRS and RRSBA. While technically they're not linked, absolutely nothing good can come of letting the guest see RRSBA without EIBRS. Nor a guest seeing EIBRS without IBRSB. Furthermore, we use this dependency to simplify the max derivation logic. The max policies gets RSBA and RRSBA unconditionally set (with the EIBRS dependency maybe hiding RRSBA). We can run any VM, even if it has been told "somewhere you might run, Retpoline isn't safe". The default policies are more complicated. A guest shouldn't see both bits, but it needs to see one if the current host suffers from any form of RSBA, and which bit it needs to see depends on whether eIBRS is visible or not. Therefore, the calculation must be performed after sanitise_featureset(). Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu-policy.c | 39 +++++++++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 4 +-- xen/tools/gen-cpuid.py | 5 +++- 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c index ee256ff5a1..f40eeb8be8 100644 --- a/xen/arch/x86/cpu-policy.c +++ b/xen/arch/x86/cpu-policy.c @@ -423,8 +423,17 @@ static void __init guest_common_max_feature_adjustments(uint32_t *fs) * Retpoline not safe)", so these need to be visible to a guest in all * cases, even when it's only some other server in the pool which * suffers the identified behaviour. + * + * We can always run any VM which has previously (or will + * subsequently) run on hardware where Retpoline is not safe. + * Note: + * - The dependency logic may hide RRSBA for other reasons. + * - The max policy does not constitute a sensible configuration to + * run a guest in. */ __set_bit(X86_FEATURE_ARCH_CAPS, fs); + __set_bit(X86_FEATURE_RSBA, fs); + __set_bit(X86_FEATURE_RRSBA, fs); } } @@ -532,6 +541,21 @@ static void __init calculate_pv_def_policy(void) guest_common_default_feature_adjustments(fs); sanitise_featureset(fs); + + /* + * If the host suffers from RSBA of any form, and the guest can see + * MSR_ARCH_CAPS, reflect the appropriate RSBA/RRSBA property to the guest + * depending on the visibility of eIBRS. + */ + if ( test_bit(X86_FEATURE_ARCH_CAPS, fs) && + (cpu_has_rsba || cpu_has_rrsba) ) + { + bool eibrs = test_bit(X86_FEATURE_EIBRS, fs); + + __set_bit(eibrs ? X86_FEATURE_RRSBA + : X86_FEATURE_RSBA, fs); + } + x86_cpu_featureset_to_policy(fs, p); recalculate_xstate(p); } @@ -664,6 +688,21 @@ static void __init calculate_hvm_def_policy(void) __set_bit(X86_FEATURE_VIRT_SSBD, fs); sanitise_featureset(fs); + + /* + * If the host suffers from RSBA of any form, and the guest can see + * MSR_ARCH_CAPS, reflect the appropriate RSBA/RRSBA property to the guest + * depending on the visibility of eIBRS. + */ + if ( test_bit(X86_FEATURE_ARCH_CAPS, fs) && + (cpu_has_rsba || cpu_has_rrsba) ) + { + bool eibrs = test_bit(X86_FEATURE_EIBRS, fs); + + __set_bit(eibrs ? X86_FEATURE_RRSBA + : X86_FEATURE_RSBA, fs); + } + x86_cpu_featureset_to_policy(fs, p); recalculate_xstate(p); } diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index ea779c2987..ce7407d6a1 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -311,7 +311,7 @@ XEN_CPUFEATURE(CET_SSS, 15*32+18) /* CET Supervisor Shadow Stacks s /* Intel-defined CPU features, MSR_ARCH_CAPS 0x10a.eax, word 16 */ XEN_CPUFEATURE(RDCL_NO, 16*32+ 0) /*A No Rogue Data Cache Load (Meltdown) */ XEN_CPUFEATURE(EIBRS, 16*32+ 1) /*A Enhanced IBRS */ -XEN_CPUFEATURE(RSBA, 16*32+ 2) /*!A RSB Alternative (Retpoline not safe) */ +XEN_CPUFEATURE(RSBA, 16*32+ 2) /*! RSB Alternative (Retpoline not safe) */ XEN_CPUFEATURE(SKIP_L1DFL, 16*32+ 3) /* Don't need to flush L1D on VMEntry */ XEN_CPUFEATURE(INTEL_SSB_NO, 16*32+ 4) /*A No Speculative Store Bypass */ XEN_CPUFEATURE(MDS_NO, 16*32+ 5) /*A No Microarchitectural Data Sampling */ @@ -327,7 +327,7 @@ XEN_CPUFEATURE(FBSDP_NO, 16*32+14) /*A No Fill Buffer Stale Data Prop XEN_CPUFEATURE(PSDP_NO, 16*32+15) /*A No Primary Stale Data Propagation */ XEN_CPUFEATURE(FB_CLEAR, 16*32+17) /*A Fill Buffers cleared by VERW */ XEN_CPUFEATURE(FB_CLEAR_CTRL, 16*32+18) /* MSR_OPT_CPU_CTRL.FB_CLEAR_DIS */ -XEN_CPUFEATURE(RRSBA, 16*32+19) /*!A Restricted RSB Alternative */ +XEN_CPUFEATURE(RRSBA, 16*32+19) /*! Restricted RSB Alternative */ XEN_CPUFEATURE(BHI_NO, 16*32+20) /*A No Branch History Injection */ XEN_CPUFEATURE(XAPIC_STATUS, 16*32+21) /* MSR_XAPIC_DISABLE_STATUS */ XEN_CPUFEATURE(OVRCLK_STATUS, 16*32+23) /* MSR_OVERCLOCKING_STATUS */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 973fcc1c64..72cf11654b 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -318,7 +318,7 @@ def crunch_numbers(state): # IBRSB/IBRS, and we pass this MSR directly to guests. Treating them # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. - IBRSB: [STIBP, SSBD, INTEL_PSFD], + IBRSB: [STIBP, SSBD, INTEL_PSFD, EIBRS], IBRS: [AMD_STIBP, AMD_SSBD, PSFD, AUTO_IBRS, IBRS_ALWAYS, IBRS_FAST, IBRS_SAME_MODE], AMD_STIBP: [STIBP_ALWAYS], @@ -328,6 +328,9 @@ def crunch_numbers(state): # The ARCH_CAPS CPUID bit enumerates the availability of the whole register. ARCH_CAPS: list(range(RDCL_NO, RDCL_NO + 64)), + + # The behaviour described by RRSBA depend on eIBRS being active. + EIBRS: [RRSBA], } deep_features = tuple(sorted(deps.keys())) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 11:24:25 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 11:24:25 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550632.859767 (Exim 4.92) (envelope-from ) id 1qAU2b-0008KY-Qk; Sat, 17 Jun 2023 11:24:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550632.859767; Sat, 17 Jun 2023 11:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2b-0008KP-O5; Sat, 17 Jun 2023 11:24:25 +0000 Received: by outflank-mailman (input) for mailman id 550632; Sat, 17 Jun 2023 11:24:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2Z-0008K5-PO for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAU2Z-0002Na-Oc for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAU2Z-0006zX-Ns for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 11:24:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=zE3xoyj28xLm14a5EF+2GP47L+haquj3Exx0A6kINho=; b=d27lSZVgPnehvXa53tpAJLRtWB WyPI6xs0MS1nVuPy2Ftq8l31ZBjWOmCJxE7B+UmYJ4Krw9GbTUYgpbC/WUgx1MRVjCAsJLz7CK4qa xuxsRZexD3dnQ2llF3JjOpxnQ2nXBCA1G8JTLX8fTAbA3yW/kslr9Ed70gfPSH0XnT3s=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add container for ppc64le builds Message-Id: Date: Sat, 17 Jun 2023 11:24:23 +0000 commit e533438e3d28158602dce051b032811bdd26377d Author: Shawn Anastasio AuthorDate: Tue Jun 13 09:49:59 2023 -0500 Commit: Andrew Cooper CommitDate: Fri Jun 16 16:29:35 2023 +0100 automation: Add container for ppc64le builds Add a container for cross-compiling xen for ppc64le. Signed-off-by: Shawn Anastasio Acked-by: Andrew Cooper --- .../build/debian/bullseye-ppc64le.dockerfile | 28 ++++++++++++++++++++++ automation/scripts/containerize | 1 + 2 files changed, 29 insertions(+) diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile new file mode 100644 index 0000000000..8a87631b52 --- /dev/null +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -0,0 +1,28 @@ +FROM debian:bullseye-slim +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV USER root + +# Add compiler path +ENV CROSS_COMPILE powerpc64le-linux-gnu- + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes --no-install-recommends install \ + bison \ + build-essential \ + checkpolicy \ + flex \ + gawk \ + gcc-powerpc64le-linux-gnu \ + make \ + python3-minimal \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 5476ff0ea1..6d46f63665 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -33,6 +33,7 @@ case "_${CONTAINER}" in _focal) CONTAINER="${BASE}/ubuntu:focal" ;; _jessie) CONTAINER="${BASE}/debian:jessie" ;; _jessie-i386) CONTAINER="${BASE}/debian:jessie-i386" ;; + _bullseye-ppc64le) CONTAINER="${BASE}/debian:bullseye-ppc64le" ;; _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; _stretch-i386) CONTAINER="${BASE}/debian:stretch-i386" ;; _buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 21:22:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 21:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550682.859821 (Exim 4.92) (envelope-from ) id 1qAdMx-0002OM-5T; Sat, 17 Jun 2023 21:22:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550682.859821; Sat, 17 Jun 2023 21:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdMx-0002OF-2h; Sat, 17 Jun 2023 21:22:03 +0000 Received: by outflank-mailman (input) for mailman id 550682; Sat, 17 Jun 2023 21:22:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdMv-0002O9-Qp for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdMv-0000CB-N5 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAdMv-0001Mx-LR for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u8u+P9Un49+cV4h92Yn/m4m+dtLedPjMpGxu3pLHJg8=; b=quCbE6/sHfIuxALJmBzADn0HiN 33MadLneFBYHCc14Uaxvg1+JNEmJRLGeQXo1jbwEE4iDhrGS58TniviwhWXF4SZuV0jrrgl55jWfW hkFOMFcXWsvl3XB94YyflcakHatdmr8smKtUif37+r5+iDPNuUPxfJp7tusSYhR5xodk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: p2m: Use the pa_range_info table to support arm32 and arm64 Message-Id: Date: Sat, 17 Jun 2023 21:22:01 +0000 commit 6d44fb48bd19c140f8601b645ea2a92895ce4ca9 Author: Ayan Kumar Halder AuthorDate: Fri Jun 2 13:07:50 2023 +0100 Commit: Julien Grall CommitDate: Fri Jun 16 21:36:35 2023 +0100 xen/arm: p2m: Use the pa_range_info table to support arm32 and arm64 Restructure the code so that one can use pa_range_info[] table for both arm32 as well as arm64. Also, removed the hardcoding for P2M_ROOT_ORDER and P2M_ROOT_LEVEL as p2m_root_order can be obtained from the pa_range_info[].root_order and p2m_root_level can be obtained from pa_range_info[].sl0. Refer ARM DDI 0406C.d ID040418, B3-1345, "Use of concatenated first-level translation tables ...However, a 40-bit input address range with a translation granularity of 4KB requires a total of 28 bits of address resolution. Therefore, a stage 2 translation that supports a 40-bit input address range requires two concatenated first-level translation tables,..." Thus, root-order is 1 for 40-bit IPA on arm32. Refer ARM DDI 0406C.d ID040418, B3-1348, "Determining the required first lookup level for stage 2 translations For a stage 2 translation, the output address range from the stage 1 translations determines the required input address range for the stage 2 translation. The permitted values of VTCR.SL0 are: 0b00 Stage 2 translation lookup must start at the second level. 0b01 Stage 2 translation lookup must start at the first level. VTCR.T0SZ must indicate the required input address range. The size of the input address region is 2^(32-T0SZ) bytes." Thus VTCR.SL0 = 1 (maximum value) and VTCR.T0SZ = -8 when the size of input address region is 2^40 bytes. Thus, pa_range_info[].t0sz = 1 (VTCR.S) | 8 (VTCR.T0SZ) ie 11000b which is 24. VTCR.T0SZ, is bits [5:0] for arm64. VTCR.T0SZ is bits [3:0] and S(sign extension), bit[4] for arm32. For this, we have used struct bitfields to convert pa_range_info[].t0sz to its arm32 variant. pa_range_info[] is indexed by ID_AA64MMFR0_EL1.PARange which is present in Arm64 only. This is the reason we do not specify the indices for arm32. Also, we duplicated the entry "{ 40, 24/*24*/, 1, 1 }" between arm64 and arm32. This is done to avoid introducing extra #if-defs. Signed-off-by: Ayan Kumar Halder Reviewed-by: Michal Orzel [julien: Tweak some comments and one check] Acked-by: Julien Grall --- xen/arch/arm/include/asm/p2m.h | 6 ------ xen/arch/arm/p2m.c | 45 +++++++++++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/include/asm/p2m.h b/xen/arch/arm/include/asm/p2m.h index f67e9ddc72..940495d42b 100644 --- a/xen/arch/arm/include/asm/p2m.h +++ b/xen/arch/arm/include/asm/p2m.h @@ -14,16 +14,10 @@ /* Holds the bit size of IPAs in p2m tables. */ extern unsigned int p2m_ipa_bits; -#ifdef CONFIG_ARM_64 extern unsigned int p2m_root_order; extern unsigned int p2m_root_level; #define P2M_ROOT_ORDER p2m_root_order #define P2M_ROOT_LEVEL p2m_root_level -#else -/* First level P2M is always 2 consecutive pages */ -#define P2M_ROOT_ORDER 1 -#define P2M_ROOT_LEVEL 1 -#endif struct domain; diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 418997843d..d671a39457 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -19,9 +19,9 @@ #define INVALID_VMID 0 /* VMID 0 is reserved */ -#ifdef CONFIG_ARM_64 unsigned int __read_mostly p2m_root_order; unsigned int __read_mostly p2m_root_level; +#ifdef CONFIG_ARM_64 static unsigned int __read_mostly max_vmid = MAX_VMID_8_BIT; /* VMID is by default 8 bit width on AArch64 */ #define MAX_VMID max_vmid @@ -2247,16 +2247,6 @@ void __init setup_virt_paging(void) /* Setup Stage 2 address translation */ register_t val = VTCR_RES1|VTCR_SH0_IS|VTCR_ORGN0_WBWA|VTCR_IRGN0_WBWA; -#ifdef CONFIG_ARM_32 - if ( p2m_ipa_bits < 40 ) - panic("P2M: Not able to support %u-bit IPA at the moment\n", - p2m_ipa_bits); - - printk("P2M: 40-bit IPA\n"); - p2m_ipa_bits = 40; - val |= VTCR_T0SZ(0x18); /* 40 bit IPA */ - val |= VTCR_SL0(0x1); /* P2M starts at first level */ -#else /* CONFIG_ARM_64 */ static const struct { unsigned int pabits; /* Physical Address Size */ unsigned int t0sz; /* Desired T0SZ, minimum in comment */ @@ -2265,6 +2255,7 @@ void __init setup_virt_paging(void) } pa_range_info[] __initconst = { /* T0SZ minimum and SL0 maximum from ARM DDI 0487H.a Table D5-6 */ /* PA size, t0sz(min), root-order, sl0(max) */ +#ifdef CONFIG_ARM_64 [0] = { 32, 32/*32*/, 0, 1 }, [1] = { 36, 28/*28*/, 0, 1 }, [2] = { 40, 24/*24*/, 1, 1 }, @@ -2273,11 +2264,27 @@ void __init setup_virt_paging(void) [5] = { 48, 16/*16*/, 0, 2 }, [6] = { 52, 12/*12*/, 4, 2 }, [7] = { 0 } /* Invalid */ +#else + { 40, 24/*24*/, 1, 1 } +#endif }; unsigned int i; unsigned int pa_range = 0x10; /* Larger than any possible value */ +#ifdef CONFIG_ARM_32 + /* + * Typecast pa_range_info[].t0sz into arm32 bit variant. + * + * VTCR.T0SZ is bits [3:0] and S(sign extension), bit[4] for arm322. + * Thus, pa_range_info[].t0sz is translated to its arm32 variant using + * struct bitfields. + */ + struct + { + signed int val:5; + } t0sz_32; +#else /* * Restrict "p2m_ipa_bits" if needed. As P2M table is always configured * with IPA bits == PA bits, compare against "pabits". @@ -2291,6 +2298,7 @@ void __init setup_virt_paging(void) */ if ( system_cpuinfo.mm64.vmid_bits == MM64_VMID_16_BITS_SUPPORT ) max_vmid = MAX_VMID_16_BIT; +#endif /* Choose suitable "pa_range" according to the resulted "p2m_ipa_bits". */ for ( i = 0; i < ARRAY_SIZE(pa_range_info); i++ ) @@ -2302,28 +2310,37 @@ void __init setup_virt_paging(void) } } - /* pa_range is 4 bits but we don't support all modes */ + /* Check if we found the associated entry in the array */ if ( pa_range >= ARRAY_SIZE(pa_range_info) || !pa_range_info[pa_range].pabits ) - panic("Unknown encoding of ID_AA64MMFR0_EL1.PARange %x\n", pa_range); + panic("%u-bit P2M is not supported\n", p2m_ipa_bits); +#ifdef CONFIG_ARM_64 val |= VTCR_PS(pa_range); val |= VTCR_TG0_4K; /* Set the VS bit only if 16 bit VMID is supported. */ if ( MAX_VMID == MAX_VMID_16_BIT ) val |= VTCR_VS; +#endif + val |= VTCR_SL0(pa_range_info[pa_range].sl0); val |= VTCR_T0SZ(pa_range_info[pa_range].t0sz); p2m_root_order = pa_range_info[pa_range].root_order; p2m_root_level = 2 - pa_range_info[pa_range].sl0; + +#ifdef CONFIG_ARM_64 p2m_ipa_bits = 64 - pa_range_info[pa_range].t0sz; +#else + t0sz_32.val = pa_range_info[pa_range].t0sz; + p2m_ipa_bits = 32 - t0sz_32.val; +#endif printk("P2M: %d-bit IPA with %d-bit PA and %d-bit VMID\n", p2m_ipa_bits, pa_range_info[pa_range].pabits, ( MAX_VMID == MAX_VMID_16_BIT ) ? 16 : 8); -#endif + printk("P2M: %d levels with order-%d root, VTCR 0x%"PRIregister"\n", 4 - P2M_ROOT_LEVEL, P2M_ROOT_ORDER, val); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 21:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 21:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550683.859825 (Exim 4.92) (envelope-from ) id 1qAdN7-0002Ps-7B; Sat, 17 Jun 2023 21:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550683.859825; Sat, 17 Jun 2023 21:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdN7-0002Pk-4R; Sat, 17 Jun 2023 21:22:13 +0000 Received: by outflank-mailman (input) for mailman id 550683; Sat, 17 Jun 2023 21:22:11 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdN5-0002Pa-RV for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:11 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdN5-0000CF-Qc for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:11 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAdN5-0001NS-PV for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u4wlhx+MWgXgZRE0w1zRR0jaZ34dLP5JHAnukFql16U=; b=LbahBGGphLIurC+oQisB5F5fTf 6xh17FUGEmsx/HIgGDEfB22mqqUA8x6Ocv0PyGcwKvskwtz0hDkfTDkAHN/JW/yvjZhGP0cgkzTDR jeZ1aDeI1GQ0qTE0ZlXtv8XTBpzwRtTbXb2+u8H0Vc3vAcRRsX7sC1XWiWLgtohS3l5k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Introduce choice to enable 64/32 bit physical addressing Message-Id: Date: Sat, 17 Jun 2023 21:22:11 +0000 commit b6733ed0cb1d3a8c030cd46c93fce46a65255c35 Author: Ayan Kumar Halder AuthorDate: Fri Jun 2 13:07:51 2023 +0100 Commit: Julien Grall CommitDate: Fri Jun 16 21:36:35 2023 +0100 xen/arm: Introduce choice to enable 64/32 bit physical addressing Some Arm based hardware platforms which does not support LPAE (eg Cortex-R52), uses 32 bit physical addresses. Also, users may choose to use 32 bits to represent physical addresses for optimization. To support the above use cases, we have introduced arch independent config to choose if the physical address can be represented using 32 bits (PHYS_ADDR_T_32) or 64 bits (!PHYS_ADDR_T_32). For now only ARM_32 provides support to enable 32 bit physical addressing. When PHYS_ADDR_T_32 is defined, PADDR_BITS is set to 32. Note that we use "unsigned long" (not "uint32_t") to denote the datatype of physical address. This is done to avoid using a cast each time PAGE_* macros are used on paddr_t. For eg PAGE_SIZE is defined as unsigned long. Thus, each time PAGE_SIZE is used with paddr_t, the result will be "unsigned long". On 32-bit architecture, "unsigned long" is 32-bit wide. Thus, it can be used to denote physical address. When PHYS_ADDR_T_32 is not defined for ARM_32, PADDR_BITS is set to 40. For ARM_64, PADDR_BITS is set to 48. The last two are same as the current configuration used today on Xen. Signed-off-by: Ayan Kumar Halder Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/Kconfig | 3 +++ xen/arch/arm/Kconfig | 33 +++++++++++++++++++++++++++++++++ xen/arch/arm/include/asm/page-bits.h | 6 +----- xen/arch/arm/include/asm/types.h | 14 ++++++++++++++ xen/arch/arm/mm.c | 5 +++++ 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/xen/arch/Kconfig b/xen/arch/Kconfig index 7028f7b74f..67ba38f32f 100644 --- a/xen/arch/Kconfig +++ b/xen/arch/Kconfig @@ -1,6 +1,9 @@ config 64BIT bool +config PHYS_ADDR_T_32 + bool + config NR_CPUS int "Maximum number of CPUs" range 1 4095 diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 41f45d8d12..61e581b8c2 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -26,6 +26,39 @@ config ARCH_DEFCONFIG menu "Architecture Features" +choice + prompt "Physical address space size" if ARM_32 + default ARM_PA_BITS_40 if ARM_32 + help + User can choose to represent the width of physical address. This can + sometimes help in optimizing the size of image when user chooses a + smaller size to represent physical address. + +config ARM_PA_BITS_32 + bool "32-bit" + depends on ARM_32 + select PHYS_ADDR_T_32 + help + On platforms where any physical address can be represented within 32 bits, + user should choose this option. This will help in reduced size of the + binary. + Xen uses "unsigned long" and not "uint32_t" to denote the datatype of + physical address. This is done to avoid using a cast each time PAGE_* + macros are used on paddr_t. For eg PAGE_SIZE is defined as unsigned long. + On 32-bit architecture, "unsigned long" is 32-bit wide. Thus, it can be + used to denote physical address. + +config ARM_PA_BITS_40 + bool "40-bit" + depends on ARM_32 +endchoice + +config PADDR_BITS + int + default 32 if ARM_PA_BITS_32 + default 40 if ARM_PA_BITS_40 + default 48 if ARM_64 + source "arch/Kconfig" config ACPI diff --git a/xen/arch/arm/include/asm/page-bits.h b/xen/arch/arm/include/asm/page-bits.h index 5d6477e599..deb381ceeb 100644 --- a/xen/arch/arm/include/asm/page-bits.h +++ b/xen/arch/arm/include/asm/page-bits.h @@ -3,10 +3,6 @@ #define PAGE_SHIFT 12 -#ifdef CONFIG_ARM_64 -#define PADDR_BITS 48 -#else -#define PADDR_BITS 40 -#endif +#define PADDR_BITS CONFIG_PADDR_BITS #endif /* __ARM_PAGE_SHIFT_H__ */ diff --git a/xen/arch/arm/include/asm/types.h b/xen/arch/arm/include/asm/types.h index e218ed77bd..fb6618ef24 100644 --- a/xen/arch/arm/include/asm/types.h +++ b/xen/arch/arm/include/asm/types.h @@ -34,9 +34,23 @@ typedef signed long long s64; typedef unsigned long long u64; typedef u32 vaddr_t; #define PRIvaddr PRIx32 +#if defined(CONFIG_PHYS_ADDR_T_32) + +/* + * We use "unsigned long" and not "uint32_t" to denote the type. This is done + * to avoid having a cast each time PAGE_* macros are used on paddr_t. For eg + * PAGE_SIZE is defined as unsigned long. + * On 32-bit architecture, "unsigned long" is 32-bit wide. Thus, we can use it + * to denote physical address. + */ +typedef unsigned long paddr_t; +#define INVALID_PADDR (~0UL) +#define PRIpaddr "08lx" +#else typedef u64 paddr_t; #define INVALID_PADDR (~0ULL) #define PRIpaddr "016llx" +#endif typedef u32 register_t; #define PRIregister "08x" #elif defined (CONFIG_ARM_64) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 74f6ff2c6f..5ef5fd8c49 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -703,6 +703,11 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) : MB(32); int rc; + /* + * The size of paddr_t should be sufficient for the complete range of + * physical address. + */ + BUILD_BUG_ON((sizeof(paddr_t) * BITS_PER_BYTE) < PADDR_BITS); BUILD_BUG_ON(sizeof(struct page_info) != PAGE_INFO_SIZE); if ( frametable_size > FRAMETABLE_SIZE ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 21:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 21:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550684.859828 (Exim 4.92) (envelope-from ) id 1qAdNH-0002SJ-8N; Sat, 17 Jun 2023 21:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550684.859828; Sat, 17 Jun 2023 21:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNH-0002SC-5t; Sat, 17 Jun 2023 21:22:23 +0000 Received: by outflank-mailman (input) for mailman id 550684; Sat, 17 Jun 2023 21:22:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNF-0002S2-UT for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNF-0000CR-TT for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:21 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAdNF-0001Nr-Se for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:21 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qL1FQxppwEdUyNGHOActrKvCtUvRB0jsSZB8szi6duA=; b=tYRce5oDXuBlmvdnhoUUuHqMcQ MeGWFzVizr1cp+gOFS4YQ9wbC09uyD5nmFHoiYRXMjKrPu/knazSk6aYed52k3AiVzv2HYwLZvU2w PTMGDDMNWT6bHUNnfBarc16L7u09euFR+uY1nEyQilZyiG73wT/Fhy7OOhkOojFajpxo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: guest_walk: LPAE specific bits should be enclosed within "ifndef CONFIG_PHYS_ADDR_T_32" Message-Id: Date: Sat, 17 Jun 2023 21:22:21 +0000 commit c3aabf7bd20eefa2c0fa297e53e087126ed9a06a Author: Ayan Kumar Halder AuthorDate: Fri Jun 2 13:07:52 2023 +0100 Commit: Julien Grall CommitDate: Fri Jun 16 21:36:35 2023 +0100 xen/arm: guest_walk: LPAE specific bits should be enclosed within "ifndef CONFIG_PHYS_ADDR_T_32" As the previous patch introduces CONFIG_PHYS_ADDR_T_32 to support 32 bit physical addresses, the code specific to "Large Physical Address Extension" (ie LPAE) should be enclosed within "ifndef CONFIG_PHYS_ADDR_T_32". Refer xen/arch/arm/include/asm/short-desc.h, "short_desc_l1_supersec_t" unsigned int extbase1:4; /* Extended base address, PA[35:32] */ unsigned int extbase2:4; /* Extended base address, PA[39:36] */ Thus, extbase1 and extbase2 are not valid when 32 bit physical addresses are supported. Signed-off-by: Ayan Kumar Halder Acked-by: Stefano Stabellini --- xen/arch/arm/guest_walk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/arm/guest_walk.c b/xen/arch/arm/guest_walk.c index 43d3215304..c80a0ce55b 100644 --- a/xen/arch/arm/guest_walk.c +++ b/xen/arch/arm/guest_walk.c @@ -154,8 +154,10 @@ static bool guest_walk_sd(const struct vcpu *v, mask = (1ULL << L1DESC_SUPERSECTION_SHIFT) - 1; *ipa = gva & mask; *ipa |= (paddr_t)(pte.supersec.base) << L1DESC_SUPERSECTION_SHIFT; +#ifndef CONFIG_PHYS_ADDR_T_32 *ipa |= (paddr_t)(pte.supersec.extbase1) << L1DESC_SUPERSECTION_EXT_BASE1_SHIFT; *ipa |= (paddr_t)(pte.supersec.extbase2) << L1DESC_SUPERSECTION_EXT_BASE2_SHIFT; +#endif /* CONFIG_PHYS_ADDR_T_32 */ } /* Set permissions so that the caller can check the flags by herself. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 21:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 21:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550685.859833 (Exim 4.92) (envelope-from ) id 1qAdNR-0002Us-9r; Sat, 17 Jun 2023 21:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550685.859833; Sat, 17 Jun 2023 21:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNR-0002Ul-7M; Sat, 17 Jun 2023 21:22:33 +0000 Received: by outflank-mailman (input) for mailman id 550685; Sat, 17 Jun 2023 21:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNQ-0002UX-14 for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNQ-0000Cd-0K for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAdNP-0001OK-Vd for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:31 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=LnNnkuOYkZW9992iDaRJ5gChPQhemhDnG14kaS7zThY=; b=EQG3a2P5S2uqmNEObhFVU5JFoV YCAb4r1Jc1jGf42gYIEgPe97IEG4xciRMPLhe1VCsu2uaIUVa6RJOvQhFExwGkhvLZTWoq/zcSIUS w7oVsWQHoEFnxdzN9fSgaDwwwPQtjqqxyUKEhARfnJPqAMqhzZzVS5ooo+lnPW+jB9nw=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Restrict zeroeth_table_offset for ARM_64 Message-Id: Date: Sat, 17 Jun 2023 21:22:31 +0000 commit 7c72147baa221cb49da80498bb0360c4d24a759f Author: Ayan Kumar Halder AuthorDate: Fri Jun 2 13:07:53 2023 +0100 Commit: Julien Grall CommitDate: Fri Jun 16 21:36:35 2023 +0100 xen/arm: Restrict zeroeth_table_offset for ARM_64 When 32 bit physical addresses are used (ie PHYS_ADDR_T_32=y), "va >> ZEROETH_SHIFT" causes an overflow. Also, there is no zeroeth level page table on Arm32. Also took the opportunity to clean up dump_pt_walk(). One could use DECLARE_OFFSETS() macro instead of declaring an array of page table offsets. Signed-off-by: Ayan Kumar Halder Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/include/asm/lpae.h | 4 ++++ xen/arch/arm/mm.c | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/lpae.h b/xen/arch/arm/include/asm/lpae.h index 3fdd5d0de2..7d2f6fd1bd 100644 --- a/xen/arch/arm/include/asm/lpae.h +++ b/xen/arch/arm/include/asm/lpae.h @@ -259,7 +259,11 @@ lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned int attr); #define first_table_offset(va) TABLE_OFFSET(first_linear_offset(va)) #define second_table_offset(va) TABLE_OFFSET(second_linear_offset(va)) #define third_table_offset(va) TABLE_OFFSET(third_linear_offset(va)) +#ifdef CONFIG_PHYS_ADDR_T_32 +#define zeroeth_table_offset(va) 0 +#else #define zeroeth_table_offset(va) TABLE_OFFSET(zeroeth_linear_offset(va)) +#endif /* * Macros to define page-tables: diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 5ef5fd8c49..e460249736 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -233,12 +233,7 @@ void dump_pt_walk(paddr_t ttbr, paddr_t addr, { static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" }; const mfn_t root_mfn = maddr_to_mfn(ttbr); - const unsigned int offsets[4] = { - zeroeth_table_offset(addr), - first_table_offset(addr), - second_table_offset(addr), - third_table_offset(addr) - }; + DECLARE_OFFSETS(offsets, addr); lpae_t pte, *mapping; unsigned int level, root_table; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 17 21:22:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 17 Jun 2023 21:22:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.550686.859838 (Exim 4.92) (envelope-from ) id 1qAdNb-0002YC-Cm; Sat, 17 Jun 2023 21:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 550686.859838; Sat, 17 Jun 2023 21:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNb-0002Y4-8s; Sat, 17 Jun 2023 21:22:43 +0000 Received: by outflank-mailman (input) for mailman id 550686; Sat, 17 Jun 2023 21:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNa-0002Xq-4D for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qAdNa-0000D1-3R for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qAdNa-0001Oq-2R for xen-changelog@lists.xenproject.org; Sat, 17 Jun 2023 21:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=cPOF/VF+xIlcPHQ7ZxbUwMq5ttMv6W3gfyZmjI0AKn8=; b=tqD03JOY7zfmuIOETCIQm8+8ep Kpm2FKJPhNp8RsDmn9P4Gzj3xZoA2FO/aB41Rn4XK/XXtD9g6PJoS1Flj+PEVDh9/YNDyoiM9gvCt JWQlj6Xy+T6E/Bxo0CrB7JT3fiC1DlmrXcPipzoHW7NMT470hIME9QpuHDTlNR8dLbN8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: p2m: Enable support for 32bit IPA for ARM_32 Message-Id: Date: Sat, 17 Jun 2023 21:22:42 +0000 commit 7a25a1501ca941c3e01b0c4e624ace05417f1587 Author: Ayan Kumar Halder AuthorDate: Fri Jun 2 13:07:54 2023 +0100 Commit: Julien Grall CommitDate: Fri Jun 16 21:36:35 2023 +0100 xen/arm: p2m: Enable support for 32bit IPA for ARM_32 Refer ARM DDI 0406C.d ID040418, B3-1345, "A stage 2 translation with an input address range of 31-34 bits can start the translation either: - With a first-level lookup, accessing a first-level translation table with 2-16 entries. - With a second-level lookup, accessing a set of concatenated second-level translation tables" Thus, for 32 bit IPA, there will be no concatenated root level tables. So, the root-order is 0. Also, Refer ARM DDI 0406C.d ID040418, B3-1348 "Determining the required first lookup level for stage 2 translations For a stage 2 translation, the output address range from the stage 1 translations determines the required input address range for the stage 2 translation. The permitted values of VTCR.SL0 are: 0b00 Stage 2 translation lookup must start at the second level. 0b01 Stage 2 translation lookup must start at the first level. VTCR.T0SZ must indicate the required input address range. The size of the input address region is 2^(32-T0SZ) bytes." Thus VTCR.SL0 = 1 (maximum value) and VTCR.T0SZ = 0 when the size of input address region is 2^32 bytes. Signed-off-by: Ayan Kumar Halder Reviewed-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index d671a39457..de32a2d638 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -2265,6 +2265,7 @@ void __init setup_virt_paging(void) [6] = { 52, 12/*12*/, 4, 2 }, [7] = { 0 } /* Invalid */ #else + { 32, 0/*0*/, 0, 1 }, { 40, 24/*24*/, 1, 1 } #endif }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:55:11 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:55:11 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554465.865647 (Exim 4.92) (envelope-from ) id 1qCxAl-0008Hf-S6; Sat, 24 Jun 2023 06:55:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554465.865647; Sat, 24 Jun 2023 06:55:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxAl-0008HV-Ob; Sat, 24 Jun 2023 06:55:03 +0000 Received: by outflank-mailman (input) for mailman id 554465; Sat, 24 Jun 2023 06:55:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxAk-0008HP-CZ for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxAk-00085N-7O for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxAk-0006rx-5V for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=PR+C8v8y90nqBjNONgnaw1TcvfDbMzUYr8S3JPQ6Ao8=; b=j3cPBr7i5sMMdooPv/fpTZDZDd L7ycp3U9kvsl+7yJkKkSVTqXg8o0jH5UQDBXolPdiX+uNYGmnDxYX33Z4jqPpqsTxmzmWu5KS8xpW wicA1gNWi8JdHzojk8ieOrd/0O/NUJ5Y84zhL5SfvN+nTakP73Cqr01JuHiB76inTXqs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Disable QEMU build with Clang older than 10.0 Message-Id: Date: Sat, 24 Jun 2023 06:55:02 +0000 commit a17fd0feb6b6bbe82550f43d70654d894ed377ec Author: Anthony PERARD AuthorDate: Mon Jun 19 10:09:32 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 19 11:59:09 2023 +0100 automation: Disable QEMU build with Clang older than 10.0 Since QEMU commit 74a1b256d775 ("configure: Bump minimum Clang version to 10.0"), or QEMU v8.0, Clang 10.0 is now the minimum to build QEMU. QEMU 8.0 fails to build on Ubuntu Bionic. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- automation/scripts/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/build b/automation/scripts/build index 38c48ae6d8..b4edcf010e 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -78,7 +78,9 @@ else fi # Qemu requires Python 3.5 or later, and ninja + # and Clang 10 or later if ! type python3 || python3 -c "import sys; res = sys.version_info < (3, 5); exit(not(res))" \ + || [[ "$cc_is_clang" == y && "$cc_ver" -lt 0x0a0000 ]] \ || ! type ninja; then cfgargs+=("--with-system-qemu=/bin/false") fi -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:55:12 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:55:12 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554466.865651 (Exim 4.92) (envelope-from ) id 1qCxAu-0008Kn-T4; Sat, 24 Jun 2023 06:55:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554466.865651; Sat, 24 Jun 2023 06:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxAu-0008Kg-QF; Sat, 24 Jun 2023 06:55:12 +0000 Received: by outflank-mailman (input) for mailman id 554466; Sat, 24 Jun 2023 06:55:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxAu-0008KY-C7 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxAu-00085S-Af for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxAu-0006sM-9e for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ruh+uO61ZA/obae2CHY7jxyM1sgnm0JIrtRqP16JLVM=; b=sjVLBW3LDUPHr8yuZqypcJdm9C 6pzHV2JDc1bTYfpJGlHLmHb8/vCzE5ceVGu3ZG7BJTc6RqFP62pHF1EX4K96IrV7Vuv/gy2+3AjnA 23EZx7KHDqIdwZDKFDGQ/j0YJr6RpQ7bIhQCc2yDOYPniUL5twgZ+RVWu9v+vJyj6K6k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] SUPPORT.md: write down restriction of 32-bit tool stacks Message-Id: Date: Sat, 24 Jun 2023 06:55:12 +0000 commit ea613d2367ac9dca3875997034e8f4aff74ab635 Author: Jan Beulich AuthorDate: Mon Jun 19 15:45:07 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 19 15:45:07 2023 +0200 SUPPORT.md: write down restriction of 32-bit tool stacks Let's try to avoid giving the impression that 32-bit tool stacks are as capable as 64-bit ones. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- SUPPORT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index c0aeb1f3f5..35a6249e03 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -168,6 +168,12 @@ ARM only has one guest type at the moment ## Toolstack +While 32-bit builds of the tool stack are generally supported, restrictions +apply in particular when running on top of a 64-bit hypervisor. For example, +very large guests aren't expected to be manageable in this case. This includes +guests giving the appearance of being large, by altering their own memory +layouts. + ### xl Status: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:55:22 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:55:22 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554467.865655 (Exim 4.92) (envelope-from ) id 1qCxB4-0008NB-Ue; Sat, 24 Jun 2023 06:55:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554467.865655; Sat, 24 Jun 2023 06:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxB4-0008N3-Rz; Sat, 24 Jun 2023 06:55:22 +0000 Received: by outflank-mailman (input) for mailman id 554467; Sat, 24 Jun 2023 06:55:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxB4-0008Mt-Ei for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxB4-00085e-Dp for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxB4-0006tZ-Cx for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=hQ8SrzDzMnCGUGYFdYEJywke5X1W9sVJ5SvCrkPerW4=; b=rahOytEnyGXKvasBZISMVnoYXN jPAFnTB+iB+WC8v7cJAGLL7T6UB3g0wzmYF0EbghqgBzzChEt+TKBeVX3W/z7/Xu00VkyafH9ONqi JTzEtT9ZKjvdi/JIiFUwzFR8ZonFfaPQtSyPzjZfpCw+dsBQh614YMfGRYH5VQgDLxWI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] iommu/vtd: fix address translation for leaf entries Message-Id: Date: Sat, 24 Jun 2023 06:55:22 +0000 commit 82b28deb25f37e8422b14493a2efa2852638206d Author: Roger Pau Monné AuthorDate: Mon Jun 19 15:46:03 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 19 15:46:03 2023 +0200 iommu/vtd: fix address translation for leaf entries Fix two issues related to leaf address lookups in VT-d: * When translating an address that falls inside of a superpage in the IOMMU page tables the fetching of the PTE value wasn't masking of the contiguous related data, which caused the returned data to be corrupt as it would contain bits that the caller would interpret as part of the address. * When the requested leaf address wasn't mapped by a superpage the returned value wouldn't have any of the low 12 bits set, thus missing the permission bits expected by the caller. Take the opportunity to also adjust the function comment to note that when returning the full PTE the bits above PADDR_BITS are removed. Fixes: c71e55501a61 ('VT-d: have callers specify the target level for page table walks') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 130a159cde..0e3062c820 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -310,7 +310,7 @@ static u64 bus_to_context_maddr(struct vtd_iommu *iommu, u8 bus) * failure, * - for target > 0 the physical address of the page table holding the leaf * PTE for the requested address, - * - for target == 0 the full PTE. + * - for target == 0 the full PTE contents below PADDR_BITS limit. */ static uint64_t addr_to_dma_page_maddr(struct domain *domain, daddr_t addr, unsigned int target, @@ -368,7 +368,7 @@ static uint64_t addr_to_dma_page_maddr(struct domain *domain, daddr_t addr, * with the address adjusted to account for the residual of * the walk. */ - pte_maddr = pte->val + + pte_maddr = (pte->val & PADDR_MASK) + (addr & ((1UL << level_to_offset_bits(level)) - 1) & PAGE_MASK); if ( !target ) @@ -413,7 +413,11 @@ static uint64_t addr_to_dma_page_maddr(struct domain *domain, daddr_t addr, } if ( --level == target ) + { + if ( !target ) + pte_maddr = pte->val & PADDR_MASK; break; + } unmap_vtd_domain_page(parent); parent = map_vtd_domain_page(pte_maddr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:55:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:55:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554468.865659 (Exim 4.92) (envelope-from ) id 1qCxBF-0008Qv-0S; Sat, 24 Jun 2023 06:55:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554468.865659; Sat, 24 Jun 2023 06:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBE-0008Qn-Tt; Sat, 24 Jun 2023 06:55:32 +0000 Received: by outflank-mailman (input) for mailman id 554468; Sat, 24 Jun 2023 06:55:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBE-0008Qe-IB for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBE-00087e-HH for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxBE-0006um-G7 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=MCPhci0lLDyHub489lqcX35kBG7BSAsnpV4CAZ6vRC0=; b=tw3E4q5OkMWZ5oozUYKTGxx7gn EpPK+LxSoPGHtlpSvB771F0g4+ZAjKGezUN7ZYvVPy+rqflyON4WwciIY70nx9qDTdlIUUk7oadGI feGepSParVt3ngNWg21UAqJQ5w7ZFqA7+H4RFbsVd4snNBq89kugBvSA0D9THW2aKXag=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] Config.mk: update OVMF to edk2-stable202305 Message-Id: Date: Sat, 24 Jun 2023 06:55:32 +0000 commit c6df21062beb9a9bc29a3a2ffb652e0bfa185c3a Author: Anthony PERARD AuthorDate: Mon Jun 19 15:47:05 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 19 15:47:05 2023 +0200 Config.mk: update OVMF to edk2-stable202305 Update to OVMF's latest stable tag. This is been prompt by trying to build Xen on Debian Bookworm, where edk2-stable202108 doesn't build. Also, it's been too long since the last update. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index d12d4c2b8f..c529b1ba19 100644 --- a/Config.mk +++ b/Config.mk @@ -216,7 +216,7 @@ QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) endif OVMF_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/ovmf.git -OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5 +OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16 QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git QEMU_UPSTREAM_REVISION ?= master -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:55:43 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:55:43 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554469.865663 (Exim 4.92) (envelope-from ) id 1qCxBP-0008Tn-2P; Sat, 24 Jun 2023 06:55:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554469.865663; Sat, 24 Jun 2023 06:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBO-0008Tf-Vk; Sat, 24 Jun 2023 06:55:42 +0000 Received: by outflank-mailman (input) for mailman id 554469; Sat, 24 Jun 2023 06:55:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBO-0008TX-L1 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBO-00087l-KD for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxBO-0006vB-JO for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EbFlsw+Vjv3Ofp/OwFpJBUMNhvw9WnQvX6JrqM5tSz4=; b=whURXQnpDliOkfqIVr8C1+WIYy rBzZlbWqLpVxLkRse63G5w8pYYRRs+OWsu1ZjfMTFZ5A5ElR/75rnXudjg3hTz5AEZ7b649Epf8TY Q5SkD6SE+/5NYc2j/akQgkKsW5ftnn7W8XYBKTGiApguSHFOYYmmDri4uD1S49y4s2DA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: add .sbss section to .bss Message-Id: Date: Sat, 24 Jun 2023 06:55:42 +0000 commit 652ccd1f4afa56b15cb4863d545deac7d1effb30 Author: Oleksii Kurochko AuthorDate: Mon Jun 19 15:47:23 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 19 15:47:23 2023 +0200 xen/riscv: add .sbss section to .bss Sometimes variables are located in .sbss section but it won't be mapped after MMU will be enabled. To avoid MMU failures .sbss should be mapped Signed-off-by: Oleksii Kurochko Acked-by: Alistair Francis --- xen/arch/riscv/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/riscv/xen.lds.S b/xen/arch/riscv/xen.lds.S index 878130f313..9064852173 100644 --- a/xen/arch/riscv/xen.lds.S +++ b/xen/arch/riscv/xen.lds.S @@ -149,7 +149,7 @@ SECTIONS *(.bss.percpu.read_mostly) . = ALIGN(SMP_CACHE_BYTES); __per_cpu_data_end = .; - *(.bss .bss.*) + *(.sbss .sbss.* .bss .bss.*) . = ALIGN(POINTER_ALIGN); __bss_end = .; } :text -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:55:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:55:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554470.865667 (Exim 4.92) (envelope-from ) id 1qCxBa-00005J-3s; Sat, 24 Jun 2023 06:55:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554470.865667; Sat, 24 Jun 2023 06:55:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBa-00005B-13; Sat, 24 Jun 2023 06:55:54 +0000 Received: by outflank-mailman (input) for mailman id 554470; Sat, 24 Jun 2023 06:55:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBY-00004w-Oq for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBY-00087t-O3 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxBY-0006va-MR for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YCQCOuLemYYA3gAFeVRFY3pziijnfkmEy0SgQBYXWf4=; b=T5YxBukzsqwJfDnPA1hB4niJea FsNWr2iGbRt1MFGhUs2eU4dol5UxF3EFZw6Ej+YNnmQpebFyIcCQohHCRERTEU5//IynJAFB7uom0 9yxiwglwkN3AqBh1EfO41DKCewmwBIP0+DGC7G91cUjEvD5BGvmzyuq2ZX/ai5/3upjo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/riscv: introduce reset_stack() function Message-Id: Date: Sat, 24 Jun 2023 06:55:52 +0000 commit 3a07da55e63d110851c36b0dae32a5dcf00c54b9 Author: Oleksii Kurochko AuthorDate: Mon Jun 19 15:47:37 2023 +0200 Commit: Jan Beulich CommitDate: Mon Jun 19 15:47:37 2023 +0200 xen/riscv: introduce reset_stack() function The reason for reset_stack() introduction is that stack should be reset twice: 1. Before jumping to C world at the start of _start() function. 2. After jumping from 1:1 mapping world. Signed-off-by: Oleksii Kurochko Reviewed-by: Alistair Francis --- xen/arch/riscv/riscv64/head.S | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/arch/riscv/riscv64/head.S b/xen/arch/riscv/riscv64/head.S index 8887f0cbd4..2c0304646a 100644 --- a/xen/arch/riscv/riscv64/head.S +++ b/xen/arch/riscv/riscv64/head.S @@ -27,8 +27,16 @@ ENTRY(start) add t3, t3, __SIZEOF_POINTER__ bltu t3, t4, .L_clear_bss + jal reset_stack + + tail start_xen + + .section .text, "ax", %progbits + +ENTRY(reset_stack) la sp, cpu0_boot_stack li t0, STACK_SIZE add sp, sp, t0 - tail start_xen + ret + -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:56:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:56:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554471.865671 (Exim 4.92) (envelope-from ) id 1qCxBk-000087-64; Sat, 24 Jun 2023 06:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554471.865671; Sat, 24 Jun 2023 06:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBk-00007z-32; Sat, 24 Jun 2023 06:56:04 +0000 Received: by outflank-mailman (input) for mailman id 554471; Sat, 24 Jun 2023 06:56:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBi-00007n-Rr for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBi-00088D-R2 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxBi-0006wJ-QG for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=6CpwO8/jEBG0WBSrA7+GPfvSRlcedMIG8rLDfdKN4zU=; b=vHwlOeVVGeXeXYKyxBqfl37y/L jUlDdLYL12nzt5j17HSPn3ijnyNpUMvj8kwNysyy4TPg2fKJ4fcLhF7D4IbazSnIQaepUvsCi13Cn P6Cv6pqjFG55c+4bsWVoXv6wo2ZXRf4DRX2JLsMqb/JPAqBdsfAK4YdhiryjVH9ld/Lg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/boot: Clean up early error asm Message-Id: Date: Sat, 24 Jun 2023 06:56:02 +0000 commit 43e863a02d81f5fff32763b23d2a39f041f7e62b Author: Andrew Cooper AuthorDate: Fri Jun 16 17:28:21 2023 +0100 Commit: Andrew Cooper CommitDate: Mon Jun 19 15:38:37 2023 +0100 x86/boot: Clean up early error asm The asm forming early error handling is a mix of local and non-local symbols, and has some pointless comments. Drop the "# Error message" comments, tweaking the style on modified lines, and make the symbols local. However, leave behind one real symbol so this logic disassembles nicely without merging in to acpi_boot_init(), which is the thing that happens to be immediately prior in my build. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/boot/head.S | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 09bebf8635..9fbd602ea5 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -142,25 +142,27 @@ efi_platform: .section .init.text, "ax", @progbits -bad_cpu: - add $sym_offs(.Lbad_cpu_msg),%esi # Error message +early_error: /* Here to improve the disassembly. */ + +.Lbad_cpu: + add $sym_offs(.Lbad_cpu_msg), %esi jmp .Lget_vtb -not_multiboot: - add $sym_offs(.Lbad_ldr_msg),%esi # Error message +.Lnot_multiboot: + add $sym_offs(.Lbad_ldr_msg), %esi jmp .Lget_vtb .Lnot_aligned: - add $sym_offs(.Lbag_alg_msg),%esi # Error message + add $sym_offs(.Lbag_alg_msg), %esi jmp .Lget_vtb .Lmb2_no_st: /* * Here we are on EFI platform. vga_text_buffer was zapped earlier * because there is pretty good chance that VGA is unavailable. */ - add $sym_offs(.Lbad_ldr_nst),%esi # Error message + add $sym_offs(.Lbad_ldr_nst), %esi jmp .Lget_vtb .Lmb2_no_ih: /* Ditto. */ - add $sym_offs(.Lbad_ldr_nih),%esi # Error message + add $sym_offs(.Lbad_ldr_nih), %esi jmp .Lget_vtb .Lmb2_no_bs: /* @@ -168,7 +170,7 @@ not_multiboot: * via start label. Then reliable vga_text_buffer zap is impossible * in Multiboot2 scanning loop and we have to zero %edi below. */ - add $sym_offs(.Lbad_ldr_nbs),%esi # Error message + add $sym_offs(.Lbad_ldr_nbs), %esi xor %edi,%edi # No VGA text buffer jmp .Lprint_err .Lmb2_efi_ia_32: @@ -176,11 +178,11 @@ not_multiboot: * Here we are on EFI IA-32 platform. Then reliable vga_text_buffer zap is * impossible in Multiboot2 scanning loop and we have to zero %edi below. */ - add $sym_offs(.Lbad_efi_msg),%esi # Error message + add $sym_offs(.Lbad_efi_msg), %esi xor %edi,%edi # No VGA text buffer jmp .Lprint_err .Lget_vtb: - mov sym_esi(vga_text_buffer),%edi + mov sym_esi(vga_text_buffer), %edi .Lprint_err: lodsb test %al,%al # Terminate on '\0' sentinel @@ -202,6 +204,9 @@ not_multiboot: .Lhalt: hlt jmp .Lhalt + .size early_error, . - early_error + .type early_error, @function + .code64 __efi64_mb2_start: @@ -221,8 +226,8 @@ __efi64_mb2_start: cmp $MULTIBOOT2_BOOTLOADER_MAGIC,%eax je .Lefi_multiboot2_proto - /* Jump to not_multiboot after switching CPU to x86_32 mode. */ - lea not_multiboot(%rip),%r15 + /* Jump to .Lnot_multiboot after switching CPU to x86_32 mode. */ + lea .Lnot_multiboot(%rip), %r15 jmp x86_32_switch .Lefi_multiboot2_proto: @@ -464,7 +469,7 @@ __start: /* Check for Multiboot bootloader. */ cmp $MULTIBOOT_BOOTLOADER_MAGIC,%eax - jne not_multiboot + jne .Lnot_multiboot /* Get mem_lower from Multiboot information. */ testb $MBI_MEMLIMITS,MB_flags(%ebx) @@ -655,7 +660,7 @@ trampoline_setup: /* Check for availability of long mode. */ bt $cpufeat_bit(X86_FEATURE_LM),%edx - jnc bad_cpu + jnc .Lbad_cpu /* Stash TSC to calculate a good approximation of time-since-boot */ rdtsc -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:56:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:56:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554472.865674 (Exim 4.92) (envelope-from ) id 1qCxBu-0000Ax-7z; Sat, 24 Jun 2023 06:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554472.865674; Sat, 24 Jun 2023 06:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBu-0000Ap-53; Sat, 24 Jun 2023 06:56:14 +0000 Received: by outflank-mailman (input) for mailman id 554472; Sat, 24 Jun 2023 06:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBt-0000AS-0U for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxBs-00088L-W6 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxBs-0006wv-Tb for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Om5DJS3I8RuzSr0rCaqIB2My992gfQ4/XvpvrHLWY7g=; b=GpAQhlOhvzKHgIwZQcxcyBIMd1 IkhZpaO6xDcSvq0YgfbpAzpy9iJn94EBVVVgx1Vc3d+IbMcQG2t4NExS5zK7Mj2/SHSFU4kzJDnqQ aFQ6Tr+ctEyL8EG34fY5reUzZpdwKWaRWMV7iE8l1OQ7OALfK5K/uw5ekjQTOwbrmX3w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: new rules addition Message-Id: Date: Sat, 24 Jun 2023 06:56:12 +0000 commit d95f436c7dc6ccee68e1b77a3b01476ef41add55 Author: Stefano Stabellini AuthorDate: Thu Jun 15 14:19:22 2023 -0700 Commit: Stefano Stabellini CommitDate: Mon Jun 19 12:17:38 2023 -0700 docs/misra: new rules addition For Dir 1.1, a document describing all implementation-defined behaviour (i.e. gcc-specific behavior) will be added to docs/misra, also including implementation-specific (gcc-specific) appropriate types for bit-field relevant to Rule 6.1. Rule 21.21 is lacking an example on gitlab but the rule is straightforward: we don't use stdlib at all in Xen. Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis --- docs/misra/rules.rst | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index d5a6ee8cb6..a88c284e7d 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -40,6 +40,12 @@ existing codebase are work-in-progress. - Summary - Notes + * - `Dir 1.1 `_ + - Required + - Any implementation-defined behaviour on which the output of the + program depends shall be documented and understood + - + * - `Dir 2.1 `_ - Required - All source files shall compile without any compilation errors @@ -57,6 +63,13 @@ existing codebase are work-in-progress. header file being included more than once - + * - `Dir 4.11 `_ + - Required + - The validity of values passed to library functions shall be checked + - We do not have libraries in Xen (libfdt and others are not + considered libraries from MISRA C point of view as they are + imported in source form) + * - `Dir 4.14 `_ - Required - The validity of values received from external sources shall be @@ -133,6 +146,12 @@ existing codebase are work-in-progress. headers (xen/include/public/) are allowed to retain longer identifiers for backward compatibility. + * - `Rule 6.1 `_ + - Required + - Bit-fields shall only be declared with an appropriate type + - In addition to the C99 types, we also consider appropriate types + enum and all explicitly signed / unsigned integer types. + * - `Rule 6.2 `_ - Required - Single-bit named bit fields shall not be of a signed type @@ -143,6 +162,32 @@ existing codebase are work-in-progress. - Octal constants shall not be used - + * - `Rule 7.2 `_ + - Required + - A "u" or "U" suffix shall be applied to all integer constants + that are represented in an unsigned type + - The rule asks that any integer literal that is implicitly + unsigned is made explicitly unsigned by using one of the + indicated suffixes. As an example, on a machine where the int + type is 32-bit wide, 0x77777777 is signed whereas 0x80000000 is + (implicitly) unsigned. In order to comply with the rule, the + latter should be rewritten as either 0x80000000u or 0x80000000U. + Consistency considerations may suggest using the same suffix even + when not required by the rule. For instance, if one has: + + Original: f(0x77777777); f(0x80000000); + + one should do + + Solution 1: f(0x77777777U); f(0x80000000U); + + over + + Solution 2: f(0x77777777); f(0x80000000U); + + after having ascertained that "Solution 1" is compatible with the + intended semantics. + * - `Rule 7.3 `_ - Required - The lowercase character l shall not be used in a literal suffix @@ -314,6 +359,11 @@ existing codebase are work-in-progress. used following a subsequent call to the same function - + * - `Rule 21.21 `_ + - Required + - The Standard Library function system of shall not be used + - + * - `Rule 22.2 `_ - Mandatory - A block of memory shall only be freed if it was allocated by means of a -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:56:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:56:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554473.865679 (Exim 4.92) (envelope-from ) id 1qCxC4-0000EM-Ap; Sat, 24 Jun 2023 06:56:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554473.865679; Sat, 24 Jun 2023 06:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxC4-0000EE-83; Sat, 24 Jun 2023 06:56:24 +0000 Received: by outflank-mailman (input) for mailman id 554473; Sat, 24 Jun 2023 06:56:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxC3-0000E3-4H for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxC3-00088i-3Z for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxC3-0006y4-23 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TQfMTuSg9CGRn4GIK/TEY+OeTRhqST9hKUYoYW6k/M0=; b=YHUJKTXEDUxyjvveZHDG452sXt 9TFcRHk0bQmPNQ5jFKMx0Go/ICQVTWFKAf5lrr/i1gHROO9O3tGu2HPn/U1SKCOlu9ZqvjxeCaCnv rboFQNVhsGY4n9huPmjZu2LrBteL48BpSDoo65m6JJ2VGRsPZx6nGRCdtxolSjdbBUu8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/misra: add rules 1.4 and 2.1 Message-Id: Date: Sat, 24 Jun 2023 06:56:23 +0000 commit 314a54c1c2805883f50582c40308554a102fdb8a Author: Stefano Stabellini AuthorDate: Thu Jun 15 14:27:16 2023 -0700 Commit: Stefano Stabellini CommitDate: Mon Jun 19 12:18:31 2023 -0700 xen/misra: add rules 1.4 and 2.1 Also add a comment at the top of the file to say rules.rst could be changed. Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis Reviewed-by: Luca Fancellu --- docs/misra/rules.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index a88c284e7d..11b9c42b70 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -32,6 +32,9 @@ violations are meant to be documented as deviations, while some others should be fixed. Both compliance and documenting deviations on the existing codebase are work-in-progress. +The list below might need to be updated over time. Reach out to THE REST +maintainers if you want to suggest a change. + .. list-table:: :header-rows: 1 @@ -90,6 +93,18 @@ existing codebase are work-in-progress. behaviour - + * - `Rule 1.4 `_ + - Required + - Emergent language features shall not be used + - Emergent language features, such as C11 features, should not be + confused with similar compiler extensions, which we use. When the + time comes to adopt C11, this rule will be revisited. + + * - `Rule 2.1 `_ + - Required + - A project shall not contain unreachable code + - + * - `Rule 2.6 `_ - Advisory - A function should not contain unused label declarations -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:56:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:56:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554474.865682 (Exim 4.92) (envelope-from ) id 1qCxCE-0000HO-CG; Sat, 24 Jun 2023 06:56:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554474.865682; Sat, 24 Jun 2023 06:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCE-0000HG-9W; Sat, 24 Jun 2023 06:56:34 +0000 Received: by outflank-mailman (input) for mailman id 554474; Sat, 24 Jun 2023 06:56:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCD-0000H5-7I for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCD-00088q-6V for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxCD-0006yY-5k for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=E5bJBj9iume0DTW0Wyx/nwj0GnIS3lLPJbi3FXFSsDw=; b=WcfI9Pp0G9LZsk4zi1j7laYakp stWdqu6jTULcPiXbyGpmZEl+GMdVYCXUx1x6JpFAot6HYhJfUx1qLyhb+KEApJ7aANfYYcXIEzX4n 9BWTvHAuh+bPHdZTmhYolfuuCm15Is14Vf0ZB23GMxSJ+DIhU88GMaCZZNRcKg63mcaU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: debug-pl011: Use correct accessors Message-Id: Date: Sat, 24 Jun 2023 06:56:33 +0000 commit 655d0798d29b7ac490444b2daf9bffa16d41e822 Author: Michal Orzel AuthorDate: Wed Jun 7 11:27:24 2023 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 19 12:19:52 2023 -0700 xen/arm: debug-pl011: Use correct accessors Although most PL011 UARTs can cope with 32-bit accesses, some of the old legacy ones might not. PL011 registers are 8/16-bit wide and this shall be perceived as the normal behavior. Modify early printk pl011 code for arm32/arm64 to use the correct accessors depending on the register size (refer ARM DDI 0183G, Table 3.1). Signed-off-by: Michal Orzel Tested-by: Henry Wang Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm32/debug-pl011.inc | 12 ++++++------ xen/arch/arm/arm64/debug-pl011.inc | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm32/debug-pl011.inc b/xen/arch/arm/arm32/debug-pl011.inc index c527f1d442..9fe0c25038 100644 --- a/xen/arch/arm/arm32/debug-pl011.inc +++ b/xen/arch/arm/arm32/debug-pl011.inc @@ -26,13 +26,13 @@ */ .macro early_uart_init rb, rc, rd mov \rc, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE % 16) - str \rc, [\rb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ + strb \rc, [\rb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ mov \rc, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE / 16) - str \rc, [\rb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ + strh \rc, [\rb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ mov \rc, #WLEN_8 /* 8n1 */ - str \rc, [\rb, #LCR_H] /* -> UARTLCR_H (Line control) */ + strb \rc, [\rb, #LCR_H] /* -> UARTLCR_H (Line control) */ ldr \rc, =(RXE | TXE | UARTEN) /* RXE | TXE | UARTEN */ - str \rc, [\rb, #CR] /* -> UARTCR (Control Register) */ + strh \rc, [\rb, #CR] /* -> UARTCR (Control Register) */ .endm /* @@ -42,7 +42,7 @@ */ .macro early_uart_ready rb, rc 1: - ldr \rc, [\rb, #FR] /* <- UARTFR (Flag register) */ + ldrh \rc, [\rb, #FR] /* <- UARTFR (Flag register) */ tst \rc, #BUSY /* Check BUSY bit */ bne 1b /* Wait for the UART to be ready */ .endm @@ -53,7 +53,7 @@ * rt: register which contains the character to transmit */ .macro early_uart_transmit rb, rt - str \rt, [\rb, #DR] /* -> UARTDR (Data Register) */ + strb \rt, [\rb, #DR] /* -> UARTDR (Data Register) */ .endm /* diff --git a/xen/arch/arm/arm64/debug-pl011.inc b/xen/arch/arm/arm64/debug-pl011.inc index 6d60e78c8b..df713eff49 100644 --- a/xen/arch/arm/arm64/debug-pl011.inc +++ b/xen/arch/arm/arm64/debug-pl011.inc @@ -25,13 +25,13 @@ */ .macro early_uart_init xb, c mov x\c, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE % 16) - strh w\c, [\xb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ + strb w\c, [\xb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ mov x\c, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE / 16) strh w\c, [\xb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ mov x\c, #WLEN_8 /* 8n1 */ - str w\c, [\xb, #LCR_H] /* -> UARTLCR_H (Line control) */ + strb w\c, [\xb, #LCR_H] /* -> UARTLCR_H (Line control) */ ldr x\c, =(RXE | TXE | UARTEN) - str w\c, [\xb, #CR] /* -> UARTCR (Control Register) */ + strh w\c, [\xb, #CR] /* -> UARTCR (Control Register) */ .endm /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:56:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:56:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554475.865687 (Exim 4.92) (envelope-from ) id 1qCxCO-0000K8-Dx; Sat, 24 Jun 2023 06:56:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554475.865687; Sat, 24 Jun 2023 06:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCO-0000K1-Az; Sat, 24 Jun 2023 06:56:44 +0000 Received: by outflank-mailman (input) for mailman id 554475; Sat, 24 Jun 2023 06:56:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCN-0000Jn-A4 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCN-00088x-9M for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxCN-0006zB-8h for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=YT/efdrqdbruh46ZxPJWLTShCvFw2Lx8zusS59DeE0Y=; b=YlKa9tWt0tppnNUfvuFx1FBDt5 jOcyS3gg/QS5hR48R/TRlO/cje8Vhabd9oviwmQPZYE8KOP6b8DsHX5SBUBLFzqzBZ0mm6W8lF1Ao UUwnCcymVTJonyBZApfLHq3wtTyutG8hAwapwxNkA/Rql5/SeWMUTZzwIPoc2k3+ajas=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: debug-pl011: Add support for 32-bit only MMIO Message-Id: Date: Sat, 24 Jun 2023 06:56:43 +0000 commit 4fa2272458114b5e4872f835b803909333d5ccd4 Author: Michal Orzel AuthorDate: Wed Jun 7 11:27:25 2023 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 19 12:20:11 2023 -0700 xen/arm: debug-pl011: Add support for 32-bit only MMIO There are implementations of PL011 that can only handle 32-bit accesses as oppose to the normal behavior where accesses are 8/16-bit wide. This is usually advertised by setting a dt property 'reg-io-width' to 4. Introduce CONFIG_EARLY_UART_PL011_MMIO32 Kconfig option to be able to enable the use of 32-bit only accessors in PL011 early printk code. Define macros PL011_{STRH,STRB,LDRH} to distinguish accessors for normal case from 32-bit MMIO one and use them in arm32/arm64 pl011 early printk code. Update documentation accordingly. Signed-off-by: Michal Orzel Tested-by: Henry Wang Reviewed-by: Stefano Stabellini --- docs/misc/arm/early-printk.txt | 3 +++ xen/arch/arm/Kconfig.debug | 7 +++++++ xen/arch/arm/arm32/debug-pl011.inc | 12 ++++++------ xen/arch/arm/arm64/debug-pl011.inc | 12 ++++++------ xen/arch/arm/include/asm/pl011-uart.h | 19 +++++++++++++++++++ 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt index aa22826075..bc2d65aa2e 100644 --- a/docs/misc/arm/early-printk.txt +++ b/docs/misc/arm/early-printk.txt @@ -26,6 +26,9 @@ Other options depends on the driver selected: If CONFIG_EARLY_UART_PL011_BAUD_RATE is set to 0 then the code will not try to initialize the UART, so that bootloader or firmware settings can be used for maximum compatibility. + + - CONFIG_EARLY_UART_PL011_MMIO32 is, optionally, used to enable 32-bit + only accesses to registers. - scif - CONFIG_EARLY_UART_SCIF_VERSION_* is, optionally, the interface version of the UART. Default to version NONE. diff --git a/xen/arch/arm/Kconfig.debug b/xen/arch/arm/Kconfig.debug index 842d768280..eec860e88e 100644 --- a/xen/arch/arm/Kconfig.debug +++ b/xen/arch/arm/Kconfig.debug @@ -253,6 +253,13 @@ config EARLY_UART_PL011_BAUD_RATE default 115200 if EARLY_PRINTK_FASTMODEL default 0 +config EARLY_UART_PL011_MMIO32 + bool "32-bit only MMIO for PL011 early printk" + depends on EARLY_UART_PL011 + help + If specified, all accesses to PL011 registers made from early printk code + will be done using 32-bit only accessors. + config EARLY_UART_INIT depends on EARLY_UART_PL011 && EARLY_UART_PL011_BAUD_RATE != 0 def_bool y diff --git a/xen/arch/arm/arm32/debug-pl011.inc b/xen/arch/arm/arm32/debug-pl011.inc index 9fe0c25038..5833da2a23 100644 --- a/xen/arch/arm/arm32/debug-pl011.inc +++ b/xen/arch/arm/arm32/debug-pl011.inc @@ -26,13 +26,13 @@ */ .macro early_uart_init rb, rc, rd mov \rc, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE % 16) - strb \rc, [\rb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ + PL011_STRB \rc, [\rb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ mov \rc, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE / 16) - strh \rc, [\rb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ + PL011_STRH \rc, [\rb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ mov \rc, #WLEN_8 /* 8n1 */ - strb \rc, [\rb, #LCR_H] /* -> UARTLCR_H (Line control) */ + PL011_STRB \rc, [\rb, #LCR_H] /* -> UARTLCR_H (Line control) */ ldr \rc, =(RXE | TXE | UARTEN) /* RXE | TXE | UARTEN */ - strh \rc, [\rb, #CR] /* -> UARTCR (Control Register) */ + PL011_STRH \rc, [\rb, #CR] /* -> UARTCR (Control Register) */ .endm /* @@ -42,7 +42,7 @@ */ .macro early_uart_ready rb, rc 1: - ldrh \rc, [\rb, #FR] /* <- UARTFR (Flag register) */ + PL011_LDRH \rc, [\rb, #FR] /* <- UARTFR (Flag register) */ tst \rc, #BUSY /* Check BUSY bit */ bne 1b /* Wait for the UART to be ready */ .endm @@ -53,7 +53,7 @@ * rt: register which contains the character to transmit */ .macro early_uart_transmit rb, rt - strb \rt, [\rb, #DR] /* -> UARTDR (Data Register) */ + PL011_STRB \rt, [\rb, #DR] /* -> UARTDR (Data Register) */ .endm /* diff --git a/xen/arch/arm/arm64/debug-pl011.inc b/xen/arch/arm/arm64/debug-pl011.inc index df713eff49..430594610b 100644 --- a/xen/arch/arm/arm64/debug-pl011.inc +++ b/xen/arch/arm/arm64/debug-pl011.inc @@ -25,13 +25,13 @@ */ .macro early_uart_init xb, c mov x\c, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE % 16) - strb w\c, [\xb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ + PL011_STRB w\c, [\xb, #FBRD] /* -> UARTFBRD (Baud divisor fraction) */ mov x\c, #(7372800 / CONFIG_EARLY_UART_PL011_BAUD_RATE / 16) - strh w\c, [\xb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ + PL011_STRH w\c, [\xb, #IBRD] /* -> UARTIBRD (Baud divisor integer) */ mov x\c, #WLEN_8 /* 8n1 */ - strb w\c, [\xb, #LCR_H] /* -> UARTLCR_H (Line control) */ + PL011_STRB w\c, [\xb, #LCR_H] /* -> UARTLCR_H (Line control) */ ldr x\c, =(RXE | TXE | UARTEN) - strh w\c, [\xb, #CR] /* -> UARTCR (Control Register) */ + PL011_STRH w\c, [\xb, #CR] /* -> UARTCR (Control Register) */ .endm /* @@ -41,7 +41,7 @@ */ .macro early_uart_ready xb, c 1: - ldrh w\c, [\xb, #FR] /* <- UARTFR (Flag register) */ + PL011_LDRH w\c, [\xb, #FR] /* <- UARTFR (Flag register) */ tst w\c, #BUSY /* Check BUSY bit */ b.ne 1b /* Wait for the UART to be ready */ .endm @@ -52,7 +52,7 @@ * wt: register which contains the character to transmit */ .macro early_uart_transmit xb, wt - strb \wt, [\xb, #DR] /* -> UARTDR (Data Register) */ + PL011_STRB \wt, [\xb, #DR] /* -> UARTDR (Data Register) */ .endm /* diff --git a/xen/arch/arm/include/asm/pl011-uart.h b/xen/arch/arm/include/asm/pl011-uart.h index 5bb563ec08..27c9bfa444 100644 --- a/xen/arch/arm/include/asm/pl011-uart.h +++ b/xen/arch/arm/include/asm/pl011-uart.h @@ -21,6 +21,25 @@ #ifndef __ASM_ARM_PL011_H #define __ASM_ARM_PL011_H +#ifdef __ASSEMBLY__ + +/* + * PL011 registers are 8/16-bit wide. However, there are implementations that + * can only handle 32-bit accesses. The following macros used in early printk + * are defined to distinguish accessors for normal case from 32-bit MMIO one. + */ +#ifdef CONFIG_EARLY_UART_PL011_MMIO32 +#define PL011_STRH str +#define PL011_STRB str +#define PL011_LDRH ldr +#else +#define PL011_STRH strh +#define PL011_STRB strb +#define PL011_LDRH ldrh +#endif + +#endif /* __ASSEMBLY__ */ + /* PL011 register addresses */ #define DR (0x00) #define RSR (0x04) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:56:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:56:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554476.865691 (Exim 4.92) (envelope-from ) id 1qCxCY-0000NF-FT; Sat, 24 Jun 2023 06:56:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554476.865691; Sat, 24 Jun 2023 06:56:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCY-0000N8-Cf; Sat, 24 Jun 2023 06:56:54 +0000 Received: by outflank-mailman (input) for mailman id 554476; Sat, 24 Jun 2023 06:56:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCX-0000Mx-Cz for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCX-000897-CE for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxCX-0006zl-BQ for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:56:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UDM+Vstc+zvaWp30QKPI9qisaifyMjvpTBlajQMgKxc=; b=ePp1fd2YbgV1NdjCIZyoCfUFmq HumRXkpQEG5rkABaotvoBuNgPLAShQU0619dYpvK85OKHx7YS1+Kaj9DwpjQBLTFHgzRFMypij35I gbWVL3ST/08AxCEDQ8BjWziNCS8Zue0FJTIJIo5PqiZoN7JOgLowD1SPRj0bMms+sOC0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: pl011: Use correct accessors Message-Id: Date: Sat, 24 Jun 2023 06:56:53 +0000 commit 47e3941d2eee347e9c41b311d19048c41e1b33e3 Author: Michal Orzel AuthorDate: Wed Jun 7 11:27:26 2023 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 19 12:20:34 2023 -0700 xen/arm: pl011: Use correct accessors At the moment, we use 32-bit only accessors (i.e. readl/writel) to match the SBSA v2.x requirement. This should not be the default case for normal PL011 where accesses shall be 8/16-bit (max register size is 16-bit). There are however implementations of this UART that can only handle 32-bit MMIO. This is advertised by dt property "reg-io-width" set to 4. Introduce new struct pl011 member mmio32 and replace pl011_{read/write} macros with static inline helpers that use 32-bit or 16-bit accessors (largest-common not to end up using different ones depending on the actual register size) according to mmio32 value. By default this property is set to false, unless: - reg-io-width is specified with value 4, - SBSA UART is in use. For now, no changes done for ACPI due to lack of testing possibilities (i.e. current behavior maintained resulting in 32-bit accesses). Signed-off-by: Michal Orzel Tested-by: Henry Wang Reviewed-by: Stefano Stabellini --- xen/drivers/char/pl011.c | 53 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 052a651251..403b1ac065 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -41,6 +41,7 @@ static struct pl011 { /* unsigned int timeout_ms; */ /* bool_t probing, intr_works; */ bool sbsa; /* ARM SBSA generic interface */ + bool mmio32; /* 32-bit only MMIO */ } pl011_com = {0}; /* These parity settings can be ORed directly into the LCR. */ @@ -50,9 +51,30 @@ static struct pl011 { #define PARITY_MARK (PEN|SPS) #define PARITY_SPACE (PEN|EPS|SPS) -/* SBSA v2.x document requires, all reads/writes must be 32-bit accesses */ -#define pl011_read(uart, off) readl((uart)->regs + (off)) -#define pl011_write(uart, off,val) writel((val), (uart)->regs + (off)) +/* + * By default, PL011 accesses shall be done using 8/16-bit accessors to + * support legacy devices that cannot cope with 32-bit. On the other hand, + * there are implementations of PL011 that can only handle 32-bit MMIO. Also, + * SBSA v2.x requires 32-bit accesses. Note that for default case, we use + * largest-common accessors (i.e. 16-bit) not to end up using different ones + * depending on the actual register size. + */ +static inline void +pl011_write(struct pl011 *uart, unsigned int offset, unsigned int val) +{ + if ( uart->mmio32 ) + writel(val, uart->regs + offset); + else + writew(val, uart->regs + offset); +} + +static inline unsigned int pl011_read(struct pl011 *uart, unsigned int offset) +{ + if ( uart->mmio32 ) + return readl(uart->regs + offset); + + return readw(uart->regs + offset); +} static unsigned int pl011_intr_status(struct pl011 *uart) { @@ -222,7 +244,8 @@ static struct uart_driver __read_mostly pl011_driver = { .vuart_info = pl011_vuart, }; -static int __init pl011_uart_init(int irq, paddr_t addr, paddr_t size, bool sbsa) +static int __init +pl011_uart_init(int irq, paddr_t addr, paddr_t size, bool sbsa, bool mmio32) { struct pl011 *uart; @@ -233,6 +256,9 @@ static int __init pl011_uart_init(int irq, paddr_t addr, paddr_t size, bool sbsa uart->stop_bits = 1; uart->sbsa = sbsa; + /* Set 32-bit MMIO also for SBSA since v2.x requires it */ + uart->mmio32 = (mmio32 || sbsa); + uart->regs = ioremap_nocache(addr, size); if ( !uart->regs ) { @@ -259,6 +285,8 @@ static int __init pl011_dt_uart_init(struct dt_device_node *dev, const char *config = data; int res; paddr_t addr, size; + uint32_t io_width; + bool mmio32 = false; if ( strcmp(config, "") ) { @@ -280,7 +308,19 @@ static int __init pl011_dt_uart_init(struct dt_device_node *dev, return -EINVAL; } - res = pl011_uart_init(res, addr, size, false); + /* See linux Documentation/devicetree/bindings/serial/pl011.yaml */ + if ( dt_property_read_u32(dev, "reg-io-width", &io_width) ) + { + if ( io_width == 4 ) + mmio32 = true; + else if ( io_width != 1 ) + { + printk("pl011: Unsupported reg-io-width (%"PRIu32")\n", io_width); + return -EINVAL; + } + } + + res = pl011_uart_init(res, addr, size, false, mmio32); if ( res < 0 ) { printk("pl011: Unable to initialize\n"); @@ -328,8 +368,9 @@ static int __init pl011_acpi_uart_init(const void *data) /* trigger/polarity information is not available in spcr */ irq_set_type(spcr->interrupt, IRQ_TYPE_LEVEL_HIGH); + /* TODO - mmio32 proper handling (for now set to true) */ res = pl011_uart_init(spcr->interrupt, spcr->serial_port.address, - PAGE_SIZE, sbsa); + PAGE_SIZE, sbsa, true); if ( res < 0 ) { printk("pl011: Unable to initialize\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:57:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:57:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554477.865694 (Exim 4.92) (envelope-from ) id 1qCxCi-0000Q5-HA; Sat, 24 Jun 2023 06:57:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554477.865694; Sat, 24 Jun 2023 06:57:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCi-0000Py-EK; Sat, 24 Jun 2023 06:57:04 +0000 Received: by outflank-mailman (input) for mailman id 554477; Sat, 24 Jun 2023 06:57:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCh-0000Pm-GO for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCh-00089R-FX for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxCh-00070U-EW for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=EpTUd8GZj31H+5MP26/7UTxbcvzcJzYx5y+veq9XBfU=; b=eYtwKNWHBfAjY8abFA0UxSWVyb Esl4ju/KjnHSFGH1Dq3qh+yfhJ1APg6ladLyuf/N9Eoq3qEM8c6D+yAQfiIVM8jfU/AHDbgN56IiH NopujqrVMPEzWBt4Qzjzqixe53umuLGBROm8JOLUsvINnpDdhy7FCLhD2HJxBnrbGgNA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: pl011: Add SBSA UART device-tree support Message-Id: Date: Sat, 24 Jun 2023 06:57:03 +0000 commit 42473bae2394b6602372ab8b83a9ca294b1e40f4 Author: Michal Orzel AuthorDate: Wed Jun 7 11:27:27 2023 +0200 Commit: Stefano Stabellini CommitDate: Mon Jun 19 12:20:59 2023 -0700 xen/arm: pl011: Add SBSA UART device-tree support We already have all the bits necessary in PL011 driver to support SBSA UART thanks to commit 032ea8c736d10f02672863c6e369338f948f7ed8 that enabled it for ACPI. Plumb in the remaining part for device-tree boot: - add arm,sbsa-uart compatible to pl011_dt_match (no need for a separate struct and DT_DEVICE_START as SBSA is a subset of PL011), - from pl011_dt_uart_init(), check for SBSA UART compatible to determine the UART type in use. Signed-off-by: Michal Orzel Reviewed-by: Henry Wang Reviewed-by: Stefano Stabellini Tested-by: Henry Wang --- xen/drivers/char/pl011.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 403b1ac065..f7bf3ad117 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -286,7 +286,7 @@ static int __init pl011_dt_uart_init(struct dt_device_node *dev, int res; paddr_t addr, size; uint32_t io_width; - bool mmio32 = false; + bool mmio32 = false, sbsa; if ( strcmp(config, "") ) { @@ -320,7 +320,9 @@ static int __init pl011_dt_uart_init(struct dt_device_node *dev, } } - res = pl011_uart_init(res, addr, size, false, mmio32); + sbsa = dt_device_is_compatible(dev, "arm,sbsa-uart"); + + res = pl011_uart_init(res, addr, size, sbsa, mmio32); if ( res < 0 ) { printk("pl011: Unable to initialize\n"); @@ -335,6 +337,8 @@ static int __init pl011_dt_uart_init(struct dt_device_node *dev, static const struct dt_device_match pl011_dt_match[] __initconst = { DT_MATCH_COMPATIBLE("arm,pl011"), + /* No need for a separate struct as SBSA UART is a subset of PL011 */ + DT_MATCH_COMPATIBLE("arm,sbsa-uart"), { /* sentinel */ }, }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:57:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:57:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554478.865699 (Exim 4.92) (envelope-from ) id 1qCxCs-0000TN-KQ; Sat, 24 Jun 2023 06:57:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554478.865699; Sat, 24 Jun 2023 06:57:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCs-0000TG-Hq; Sat, 24 Jun 2023 06:57:14 +0000 Received: by outflank-mailman (input) for mailman id 554478; Sat, 24 Jun 2023 06:57:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCr-0000T5-Jc for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxCr-00089Y-Ir for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxCr-00070t-Hh for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Yr3tAHfiX/tPDcsr8jLnfyjC0lsdEFO3+egeiYYUPX8=; b=XyFLFDDraK+0jcVwG1aFHsMwgn HUQ3ieXc+Rf7TDHHO3qGVmvgl3Hz/LbJvo6yvvtmiU0XO7xupPjnjhsvncRxtxxyPOoUFLrYz5xO2 AkHCSP8U2O08Dnvw7ouFuyRy9SbuwgEIUsiWA71D8wKJhqpBn/fAb2QNPuS9SxlTeXLk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/evtchn: Purge ERROR_EXIT{,_DOM}() Message-Id: Date: Sat, 24 Jun 2023 06:57:13 +0000 commit e5ba5165cae654f4bb5023b74008f57b5649979d Author: Andrew Cooper AuthorDate: Tue Jun 13 17:06:47 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 20 17:07:35 2023 +0100 xen/evtchn: Purge ERROR_EXIT{,_DOM}() These interfere with code legibility by hiding control flow. Expand and drop them. * Rearrange the order of actions to write into rc, then render rc in the gdprintk(). * Drop redundant "rc = rc" assignments * Switch to using %pd for rendering domains As a side effect, this fixes several violations of MISRA rule 2.1 (dead code - the while() following a goto). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Julien Grall --- xen/common/event_channel.c | 79 ++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index f5e0b12d15..a7a004a084 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -36,23 +36,6 @@ #include #endif -#define ERROR_EXIT(_errno) \ - do { \ - gdprintk(XENLOG_WARNING, \ - "EVTCHNOP failure: error %d\n", \ - (_errno)); \ - rc = (_errno); \ - goto out; \ - } while ( 0 ) -#define ERROR_EXIT_DOM(_errno, _dom) \ - do { \ - gdprintk(XENLOG_WARNING, \ - "EVTCHNOP failure: domain %d, error %d\n", \ - (_dom)->domain_id, (_errno)); \ - rc = (_errno); \ - goto out; \ - } while ( 0 ) - #define consumer_is_xen(e) (!!(e)->xen_consumer) /* @@ -336,7 +319,11 @@ int evtchn_alloc_unbound(evtchn_alloc_unbound_t *alloc, evtchn_port_t port) port = rc = evtchn_get_port(d, port); if ( rc < 0 ) - ERROR_EXIT(rc); + { + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } + rc = 0; chn = evtchn_from_port(d, port); @@ -412,17 +399,30 @@ int evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind, struct domain *ld, lport = rc = evtchn_get_port(ld, lport); if ( rc < 0 ) - ERROR_EXIT(rc); + { + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } + rc = 0; lchn = evtchn_from_port(ld, lport); rchn = _evtchn_from_port(rd, rport); if ( !rchn ) - ERROR_EXIT_DOM(-EINVAL, rd); + { + rc = -EINVAL; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: %pd, error %d\n", rd, rc); + goto out; + } + if ( (rchn->state != ECS_UNBOUND) || (rchn->u.unbound.remote_domid != ld->domain_id) ) - ERROR_EXIT_DOM(-EINVAL, rd); + { + rc = -EINVAL; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: %pd, error %d\n", rd, rc); + goto out; + } rc = xsm_evtchn_interdomain(XSM_HOOK, ld, lchn, rd, rchn); if ( rc ) @@ -487,11 +487,19 @@ int evtchn_bind_virq(evtchn_bind_virq_t *bind, evtchn_port_t port) write_lock(&d->event_lock); if ( read_atomic(&v->virq_to_evtchn[virq]) ) - ERROR_EXIT(-EEXIST); + { + rc = -EEXIST; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } port = rc = evtchn_get_port(d, port); if ( rc < 0 ) - ERROR_EXIT(rc); + { + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } + rc = 0; chn = evtchn_from_port(d, port); @@ -535,7 +543,11 @@ static int evtchn_bind_ipi(evtchn_bind_ipi_t *bind) write_lock(&d->event_lock); if ( (port = get_free_port(d)) < 0 ) - ERROR_EXIT(port); + { + rc = port; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } chn = evtchn_from_port(d, port); @@ -599,16 +611,29 @@ static int evtchn_bind_pirq(evtchn_bind_pirq_t *bind) write_lock(&d->event_lock); if ( pirq_to_evtchn(d, pirq) != 0 ) - ERROR_EXIT(-EEXIST); + { + rc = -EEXIST; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } if ( (port = get_free_port(d)) < 0 ) - ERROR_EXIT(port); + { + rc = port; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } chn = evtchn_from_port(d, port); info = pirq_get_info(d, pirq); if ( !info ) - ERROR_EXIT(-ENOMEM); + { + rc = -ENOMEM; + gdprintk(XENLOG_WARNING, "EVTCHNOP failure: error %d\n", rc); + goto out; + } + info->evtchn = port; rc = (!is_hvm_domain(d) ? pirq_guest_bind(v, info, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:57:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:57:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554479.865703 (Exim 4.92) (envelope-from ) id 1qCxD2-0000W1-MN; Sat, 24 Jun 2023 06:57:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554479.865703; Sat, 24 Jun 2023 06:57:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxD2-0000Vu-Ja; Sat, 24 Jun 2023 06:57:24 +0000 Received: by outflank-mailman (input) for mailman id 554479; Sat, 24 Jun 2023 06:57:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxD1-0000Vk-N2 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxD1-0008A3-ME for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxD1-00071M-Lb for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TRfNB8Qde/taowa3D8osdwvSxOe++ZbrmZNilZZNT8g=; b=oKP2jv3QnNlEMSlhG66+nczdL7 wJwhmEPYICcVYzNrJVwjAmadQHG7TyVRb0Vk/ilaUz30vlmM2A6ySOXYllg7SMondt+VqPk6m/rpF HlB8Ch7StV+PE9wtJpMjw6/eYK5AKYI5LCelzir73zfeXSOp5BWzd6zJt+YYmortrIms=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86: Use printk_once() instead of opencoding it Message-Id: Date: Sat, 24 Jun 2023 06:57:23 +0000 commit a6120e3fc8fd90f3ed638c6f7a573bfb534af154 Author: Andrew Cooper AuthorDate: Wed May 10 20:21:12 2023 +0100 Commit: Andrew Cooper CommitDate: Tue Jun 20 17:20:01 2023 +0100 x86: Use printk_once() instead of opencoding it Technically our helper post-dates all of these examples, but it's good cleanup nevertheless. None of these examples should be using fully locked test_and_set_bool() in the first place. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/arch/x86/cpu/amd.c | 27 +++++++++------------------ xen/arch/x86/hvm/vmx/vmx.c | 18 ++++++------------ xen/arch/x86/srat.c | 8 ++------ xen/arch/x86/time.c | 19 ++++--------------- 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 0d3143031b..0eaef82e51 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -493,7 +493,6 @@ void amd_check_disable_c1e(unsigned int port, u8 value) static void check_syscfg_dram_mod_en(void) { uint64_t syscfg; - static bool_t printed = 0; if (!((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0x0f))) @@ -503,9 +502,7 @@ static void check_syscfg_dram_mod_en(void) if (!(syscfg & SYSCFG_MTRR_FIX_DRAM_MOD_EN)) return; - if (!test_and_set_bool(printed)) - printk(KERN_ERR "MTRR: SYSCFG[MtrrFixDramModEn] not " - "cleared by BIOS, clearing this bit\n"); + printk_once(KERN_ERR "MTRR: SYSCFG[MtrrFixDramModEn] found set; clearing\n"); syscfg &= ~SYSCFG_MTRR_FIX_DRAM_MOD_EN; wrmsrl(MSR_K8_SYSCFG, syscfg); @@ -1107,25 +1104,19 @@ static void cf_check init_amd(struct cpuinfo_x86 *c) rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { - static bool_t warned; - - if (c == &boot_cpu_data || opt_cpu_info || - !test_and_set_bool(warned)) - printk(KERN_WARNING - "CPU%u: Applying workaround for erratum 793\n", - smp_processor_id()); + if (c == &boot_cpu_data || opt_cpu_info) + printk_once(XENLOG_WARNING + "CPU%u: Applying workaround for erratum 793\n", + smp_processor_id()); wrmsrl(MSR_AMD64_LS_CFG, value | (1 << 15)); } } else if (c->x86 == 0x12) { rdmsrl(MSR_AMD64_DE_CFG, value); if (!(value & (1U << 31))) { - static bool warned; - - if (c == &boot_cpu_data || opt_cpu_info || - !test_and_set_bool(warned)) - printk(KERN_WARNING - "CPU%u: Applying workaround for erratum 665\n", - smp_processor_id()); + if (c == &boot_cpu_data || opt_cpu_info) + printk_once(XENLOG_WARNING + "CPU%u: Applying workaround for erratum 665\n", + smp_processor_id()); wrmsrl(MSR_AMD64_DE_CFG, value | (1U << 31)); } } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 40767b94c3..c686e6990c 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1207,16 +1207,11 @@ static void cf_check vmx_get_segment_register( */ if ( unlikely(!vmx_vmcs_try_enter(v)) ) { - static bool_t warned; + printk_once(XENLOG_WARNING "Segment register inaccessible for %pv\n" + "(If you see this outside of debugging activity," + " please report to xen-devel@lists.xenproject.org)\n", + v); - if ( !warned ) - { - warned = 1; - printk(XENLOG_WARNING "Segment register inaccessible for %pv\n" - "(If you see this outside of debugging activity," - " please report to xen-devel@lists.xenproject.org)\n", - v); - } memset(reg, 0, sizeof(*reg)); return; } @@ -2325,10 +2320,9 @@ static bool cf_check vmx_test_pir(const struct vcpu *v, uint8_t vec) static void cf_check vmx_handle_eoi(uint8_t vector, int isr) { uint8_t old_svi = set_svi(isr); - static bool warned; - if ( vector != old_svi && !test_and_set_bool(warned) ) - printk(XENLOG_WARNING "EOI for %02x but SVI=%02x\n", vector, old_svi); + if ( vector != old_svi ) + printk_once(XENLOG_WARNING "EOI for %02x but SVI=%02x\n", vector, old_svi); } static void cf_check vmx_enable_msr_interception(struct domain *d, uint32_t msr) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 56749ddca5..3f70338e6e 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -55,7 +55,6 @@ nodeid_t setup_node(unsigned pxm) { nodeid_t node; unsigned idx; - static bool warned; static unsigned nodes_found; BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE); @@ -75,11 +74,8 @@ nodeid_t setup_node(unsigned pxm) if (pxm2node[idx].node == NUMA_NO_NODE) goto finish; - if (!warned) { - printk(KERN_WARNING "SRAT: Too many proximity domains (%#x)\n", - pxm); - warned = true; - } + printk_once(XENLOG_WARNING "SRAT: Too many proximity domains (%#x)\n", + pxm); return NUMA_NO_NODE; diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index bc75e1ae7d..f5e30d4e02 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -876,13 +876,8 @@ static void cf_check plt_overflow(void *unused) plt_stamp64 += plt_mask + 1; } if ( i != 0 ) - { - static bool warned_once; - - if ( !test_and_set_bool(warned_once) ) - printk("Platform timer appears to have unexpectedly wrapped " - "%u%s times.\n", i, (i == 10) ? " or more" : ""); - } + printk_once("Platform timer appears to have unexpectedly wrapped " + "%u%s times.\n", i, (i == 10) ? " or more" : ""); spin_unlock_irq(&platform_timer_lock); @@ -2156,14 +2151,8 @@ void init_percpu_time(void) } else if ( adj != tsc_adjust[socket] ) { - static bool __read_mostly warned; - - if ( !warned ) - { - warned = true; - printk(XENLOG_WARNING - "Differing TSC ADJUST values within socket(s) - fixing all\n"); - } + printk_once(XENLOG_WARNING + "Differing TSC ADJUST values within socket(s) - fixing all\n"); wrmsrl(MSR_IA32_TSC_ADJUST, tsc_adjust[socket]); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:57:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:57:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554480.865706 (Exim 4.92) (envelope-from ) id 1qCxDC-0000Ym-Nz; Sat, 24 Jun 2023 06:57:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554480.865706; Sat, 24 Jun 2023 06:57:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDC-0000Ye-LQ; Sat, 24 Jun 2023 06:57:34 +0000 Received: by outflank-mailman (input) for mailman id 554480; Sat, 24 Jun 2023 06:57:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDB-0000YU-QE for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDB-0008AA-PS for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxDB-00071l-Od for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=To6by1b+V/zsi3ceeZULd/q3b01GoWMKqP1ZXoV1bdQ=; b=esRrQy+PiSSu9T7A+IQV3fQPFP 2N8deZ4uZhmiSAfs61/nBKlvtItIRkMKXmVnn8IRl5YaaYbDjZ+Oy83TuMR8meWiJARpiS0Fa6ApL 8k0CCJH4Z5UiG7fIjOB/G5WPfayk6PeqNPQVprXA6fUN9IGw8HDPXPRSocdvYMcEF1aY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPIT: re-order functions Message-Id: Date: Sat, 24 Jun 2023 06:57:33 +0000 commit 1f70315327f79079e5487421bcef2c66e199c5e7 Author: Jan Beulich AuthorDate: Wed Jun 21 13:44:43 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jun 21 13:44:43 2023 +0200 x86/vPIT: re-order functions To avoid the need for a forward declaration of pit_load_count() in a subsequent change, move it earlier in the file (along with its helper callback). While moving the code, address a few style issues. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/emul-i8254.c | 103 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 1688b7e458..586ad7b331 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -87,6 +87,58 @@ static int pit_get_count(PITState *pit, int channel) return counter; } +static void cf_check pit_time_fired(struct vcpu *v, void *priv) +{ + uint64_t *count_load_time = priv; + + TRACE_0D(TRC_HVM_EMUL_PIT_TIMER_CB); + *count_load_time = get_guest_time(v); +} + +static void pit_load_count(PITState *pit, int channel, int val) +{ + uint32_t period; + struct hvm_hw_pit_channel *s = &pit->hw.channels[channel]; + struct vcpu *v = vpit_vcpu(pit); + + ASSERT(spin_is_locked(&pit->lock)); + + if ( val == 0 ) + val = 0x10000; + + if ( v == NULL ) + pit->count_load_time[channel] = 0; + else + pit->count_load_time[channel] = get_guest_time(v); + s->count = val; + period = DIV_ROUND(val * SYSTEM_TIME_HZ, PIT_FREQ); + + if ( !v || !is_hvm_vcpu(v) || channel ) + return; + + switch ( s->mode ) + { + case 2: + case 3: + /* Periodic timer. */ + TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, period); + create_periodic_time(v, &pit->pt0, period, period, 0, pit_time_fired, + &pit->count_load_time[channel], false); + break; + case 1: + case 4: + /* One-shot timer. */ + TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, 0); + create_periodic_time(v, &pit->pt0, period, 0, 0, pit_time_fired, + &pit->count_load_time[channel], false); + break; + default: + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + break; + } +} + static int pit_get_out(PITState *pit, int channel) { struct hvm_hw_pit_channel *s = &pit->hw.channels[channel]; @@ -156,57 +208,6 @@ static int pit_get_gate(PITState *pit, int channel) return pit->hw.channels[channel].gate; } -static void cf_check pit_time_fired(struct vcpu *v, void *priv) -{ - uint64_t *count_load_time = priv; - TRACE_0D(TRC_HVM_EMUL_PIT_TIMER_CB); - *count_load_time = get_guest_time(v); -} - -static void pit_load_count(PITState *pit, int channel, int val) -{ - u32 period; - struct hvm_hw_pit_channel *s = &pit->hw.channels[channel]; - struct vcpu *v = vpit_vcpu(pit); - - ASSERT(spin_is_locked(&pit->lock)); - - if ( val == 0 ) - val = 0x10000; - - if ( v == NULL ) - pit->count_load_time[channel] = 0; - else - pit->count_load_time[channel] = get_guest_time(v); - s->count = val; - period = DIV_ROUND(val * SYSTEM_TIME_HZ, PIT_FREQ); - - if ( (v == NULL) || !is_hvm_vcpu(v) || (channel != 0) ) - return; - - switch ( s->mode ) - { - case 2: - case 3: - /* Periodic timer. */ - TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, period); - create_periodic_time(v, &pit->pt0, period, period, 0, pit_time_fired, - &pit->count_load_time[channel], false); - break; - case 1: - case 4: - /* One-shot timer. */ - TRACE_2D(TRC_HVM_EMUL_PIT_START_TIMER, period, 0); - create_periodic_time(v, &pit->pt0, period, 0, 0, pit_time_fired, - &pit->count_load_time[channel], false); - break; - default: - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - break; - } -} - static void pit_latch_count(PITState *pit, int channel) { struct hvm_hw_pit_channel *c = &pit->hw.channels[channel]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:57:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:57:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554481.865710 (Exim 4.92) (envelope-from ) id 1qCxDM-0000bn-Q5; Sat, 24 Jun 2023 06:57:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554481.865710; Sat, 24 Jun 2023 06:57:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDM-0000bg-NA; Sat, 24 Jun 2023 06:57:44 +0000 Received: by outflank-mailman (input) for mailman id 554481; Sat, 24 Jun 2023 06:57:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDL-0000bL-TP for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDL-0008AH-Se for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxDL-00072M-Rf for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=uHmhVFH3fC7a1Tw/mViDlKKRROs1k/8d9XMFFyR6a1k=; b=nowZGas1/tETDTW9vuVQ/RArYV BKRksA+b2fKgcZmK0Q+gti7wDzH+6NMYgeU+NnGP7XJzeTZkaGsWBdbL5u3NOFb7fhD22fhXwtoc3 rC6bR5bqCcsG0xrkxIGmQV1Rskx8oc68gUWJxa5ZdUrb9HO8TjOCFR1CEdLbPBh8l/ZA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vPIT: account for "counter stopped" time Message-Id: Date: Sat, 24 Jun 2023 06:57:43 +0000 commit 14f42af3f52d56e769263dc414616be805bd6e2d Author: Jan Beulich AuthorDate: Wed Jun 21 13:45:36 2023 +0200 Commit: Jan Beulich CommitDate: Wed Jun 21 13:45:36 2023 +0200 x86/vPIT: account for "counter stopped" time For an approach like that used in "x86: detect PIT aliasing on ports other than 0x4[0-3]" [1] to work, channel 2 may not (appear to) continue counting when "gate" is low. Record the time when "gate" goes low, and adjust pit_get_{count,out}() accordingly. Additionally for most of the modes a rising edge of "gate" doesn't mean just "resume counting", but "initiate counting", i.e. specifically the reloading of the counter with its init value. No special handling for state save/load: See the comment near the end of pit_load(). Along with introducing the get_count() helper to have the calculations (and the locking check) in a single place, switch pit_get_count()'s d, counter, and return type to unsigned int. [1] https://lists.xen.org/archives/html/xen-devel/2023-05/msg00898.html Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/arch/x86/emul-i8254.c | 82 ++++++++++++++++++++++++-------------- xen/arch/x86/include/asm/hvm/vpt.h | 8 +++- 2 files changed, 59 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 586ad7b331..a81232fc55 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -56,17 +56,24 @@ static int cf_check handle_speaker_io( #define get_guest_time(v) \ (is_hvm_vcpu(v) ? hvm_get_guest_time(v) : (u64)get_s_time()) -static int pit_get_count(PITState *pit, int channel) +static uint64_t get_count(PITState *pit, unsigned int channel) { - uint64_t d; - int counter; - struct hvm_hw_pit_channel *c = &pit->hw.channels[channel]; - struct vcpu *v = vpit_vcpu(pit); + const struct hvm_hw_pit_channel *c = &pit->hw.channels[channel]; + uint64_t d = c->gate || (c->mode & 3) == 1 + ? get_guest_time(vpit_vcpu(pit)) + : pit->count_stop_time[channel]; ASSERT(spin_is_locked(&pit->lock)); - d = muldiv64(get_guest_time(v) - pit->count_load_time[channel], - PIT_FREQ, SYSTEM_TIME_HZ); + return muldiv64((d - pit->count_load_time[channel] - + pit->stopped_time[channel]), + PIT_FREQ, SYSTEM_TIME_HZ); +} + +static unsigned int pit_get_count(PITState *pit, int channel) +{ + unsigned int d = get_count(pit, channel), counter; + struct hvm_hw_pit_channel *c = &pit->hw.channels[channel]; switch ( c->mode ) { @@ -110,6 +117,10 @@ static void pit_load_count(PITState *pit, int channel, int val) pit->count_load_time[channel] = 0; else pit->count_load_time[channel] = get_guest_time(v); + + pit->count_stop_time[channel] = pit->count_load_time[channel]; + pit->stopped_time[channel] = 0; + s->count = val; period = DIV_ROUND(val * SYSTEM_TIME_HZ, PIT_FREQ); @@ -142,14 +153,8 @@ static void pit_load_count(PITState *pit, int channel, int val) static int pit_get_out(PITState *pit, int channel) { struct hvm_hw_pit_channel *s = &pit->hw.channels[channel]; - uint64_t d; + uint64_t d = get_count(pit, channel); int out; - struct vcpu *v = vpit_vcpu(pit); - - ASSERT(spin_is_locked(&pit->lock)); - - d = muldiv64(get_guest_time(v) - pit->count_load_time[channel], - PIT_FREQ, SYSTEM_TIME_HZ); switch ( s->mode ) { @@ -182,22 +187,39 @@ static void pit_set_gate(PITState *pit, int channel, int val) ASSERT(spin_is_locked(&pit->lock)); - switch ( s->mode ) - { - default: - case 0: - case 4: - /* XXX: just disable/enable counting */ - break; - case 1: - case 5: - case 2: - case 3: - /* Restart counting on rising edge. */ - if ( s->gate < val ) - pit->count_load_time[channel] = get_guest_time(v); - break; - } + if ( s->gate > val ) + switch ( s->mode ) + { + case 0: + case 2: + case 3: + case 4: + /* Disable counting. */ + if ( !channel ) + destroy_periodic_time(&pit->pt0); + pit->count_stop_time[channel] = get_guest_time(v); + break; + } + + if ( s->gate < val ) + switch ( s->mode ) + { + default: + case 0: + case 4: + /* Enable counting. */ + pit->stopped_time[channel] += get_guest_time(v) - + pit->count_stop_time[channel]; + break; + + case 1: + case 5: + case 2: + case 3: + /* Initiate counting on rising edge. */ + pit_load_count(pit, channel, pit->hw.channels[channel].count); + break; + } s->gate = val; } diff --git a/xen/arch/x86/include/asm/hvm/vpt.h b/xen/arch/x86/include/asm/hvm/vpt.h index 935cbe333b..2af76ca8dc 100644 --- a/xen/arch/x86/include/asm/hvm/vpt.h +++ b/xen/arch/x86/include/asm/hvm/vpt.h @@ -48,8 +48,14 @@ struct periodic_time { typedef struct PITState { /* Hardware state */ struct hvm_hw_pit hw; - /* Last time the counters read zero, for calcuating counter reads */ + + /* Last time the counters read zero, for calculating counter reads */ int64_t count_load_time[3]; + /* Last time the counters were stopped, for calculating counter reads */ + int64_t count_stop_time[3]; + /* Accumulate "stopped" time, since the last counter write/reload. */ + uint64_t stopped_time[3]; + /* Channel 0 IRQ handling. */ struct periodic_time pt0; spinlock_t lock; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:57:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:57:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554482.865714 (Exim 4.92) (envelope-from ) id 1qCxDW-0000f1-T0; Sat, 24 Jun 2023 06:57:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554482.865714; Sat, 24 Jun 2023 06:57:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDW-0000ev-QN; Sat, 24 Jun 2023 06:57:54 +0000 Received: by outflank-mailman (input) for mailman id 554482; Sat, 24 Jun 2023 06:57:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDW-0000ej-03 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDV-0008AP-Vd for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxDV-00072l-Ul for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:57:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=a+7VyZQ6rTi3lhMV8XAeDFcn1zeFyBc/UnmEdi2N+OA=; b=HU6npE0ObEs+SrxWCJZmW67Jys tQMphGraU5WxAJYl+KppSl++t/9Jt4Srf2dfB7rD9B+pYD6IMzDKiIGKGCnJXOAOLWuMW/ZYP1fMs dheB6p7DQKm4kSU8SAOwO9U5G2C0vcRT5uy8NT7fSuOuutUEX10+9KtS7WM6BWvTOMdA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] build: Drop CONFIG_$ARCH_$(XEN_OS) definitions Message-Id: Date: Sat, 24 Jun 2023 06:57:53 +0000 commit 7f314e0aa5d4caf8eceaab9653ec68b72a6ac521 Author: Andrew Cooper AuthorDate: Mon Jun 19 18:54:18 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 21 14:26:21 2023 +0100 build: Drop CONFIG_$ARCH_$(XEN_OS) definitions These aren't used, and are not obvious useful either. tools/ does have some logic which works on $(XEN_OS) directly, and some on CONFIG_$(XEN_OS) too, but this isn't how we typically refer to things. The only user ever of this scheme (AFAICT) was introduced in c0fd920e987 (2006) and deleted in fa2244104b4 (2010). No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Oleksii Kurochko Reviewed-by: Alistair Francis Acked-by: Stefano Stabellini Tested-by: Jiamei Xie --- config/arm32.mk | 1 - config/arm64.mk | 1 - config/riscv64.mk | 1 - config/x86_32.mk | 1 - config/x86_64.mk | 1 - 5 files changed, 5 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index f95228e3c0..c38d89cb30 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -1,6 +1,5 @@ CONFIG_ARM := y CONFIG_ARM_32 := y -CONFIG_ARM_$(XEN_OS) := y CONFIG_XEN_INSTALL_SUFFIX := diff --git a/config/arm64.mk b/config/arm64.mk index aa45772b61..c4662f67d0 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -1,6 +1,5 @@ CONFIG_ARM := y CONFIG_ARM_64 := y -CONFIG_ARM_$(XEN_OS) := y CONFIG_XEN_INSTALL_SUFFIX := diff --git a/config/riscv64.mk b/config/riscv64.mk index a5a21e5fa2..91c6e53da6 100644 --- a/config/riscv64.mk +++ b/config/riscv64.mk @@ -1,5 +1,4 @@ CONFIG_RISCV := y CONFIG_RISCV_64 := y -CONFIG_RISCV_$(XEN_OS) := y CONFIG_XEN_INSTALL_SUFFIX := diff --git a/config/x86_32.mk b/config/x86_32.mk index bc96ff013d..3cc046d9bc 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -1,6 +1,5 @@ CONFIG_X86 := y CONFIG_X86_32 := y -CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y diff --git a/config/x86_64.mk b/config/x86_64.mk index 4afef44141..8614457b03 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -1,6 +1,5 @@ CONFIG_X86 := y CONFIG_X86_64 := y -CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:58:06 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:58:06 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554483.865719 (Exim 4.92) (envelope-from ) id 1qCxDh-0000ho-V1; Sat, 24 Jun 2023 06:58:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554483.865719; Sat, 24 Jun 2023 06:58:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDh-0000hh-S6; Sat, 24 Jun 2023 06:58:05 +0000 Received: by outflank-mailman (input) for mailman id 554483; Sat, 24 Jun 2023 06:58:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDg-0000hT-37 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDg-0008Al-2N for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxDg-00073U-1V for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Ba0kb7gq0fa4cfMSl5QWuyQwmWOfh/aPIHRLzb75BtA=; b=vbK2uuyDpc0d+w09iOT+bPldMZ D5lB1xcyo7GQetX8zDHGYZS1mOAyZLql3CJ9hYphiCP3qMfuaBUwrmGhZ+/ZVUUfiCOR41Iz4zSg0 sDuddC2LZThMOXYu/iMitjFetqAqo+DGITtoTFLbtYtEon0CN8vOJA6vUeZa9azu61TI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen: Add files needed for minimal ppc64le build Message-Id: Date: Sat, 24 Jun 2023 06:58:04 +0000 commit b0582dd686d218a8ffa6a62da58b47e6d565c0b9 Author: Shawn Anastasio AuthorDate: Tue Jun 20 13:12:47 2023 -0500 Commit: Andrew Cooper CommitDate: Wed Jun 21 14:26:21 2023 +0100 xen: Add files needed for minimal ppc64le build Add the build system changes required to build for ppc64le (POWER8+). As of now the resulting image simply boots to an infinite loop. $ make XEN_TARGET_ARCH=ppc64 -C xen build This port targets POWER8+ CPUs running in Little Endian mode specifically, and does not boot on older machines. Additionally, this initial skeleton only implements the PaPR/pseries boot protocol which allows it to be booted in a standard QEMU virtual machine: $ qemu-system-ppc64 -M pseries-5.2 -m 256M -kernel xen/xen Signed-off-by: Shawn Anastasio Acked-by: Andrew Cooper --- config/ppc64.mk | 4 + xen/Makefile | 5 +- xen/arch/ppc/Kconfig | 42 ++++++++ xen/arch/ppc/Kconfig.debug | 0 xen/arch/ppc/Makefile | 16 +++ xen/arch/ppc/Rules.mk | 0 xen/arch/ppc/arch.mk | 12 +++ xen/arch/ppc/configs/ppc64_defconfig | 13 +++ xen/arch/ppc/include/asm/config.h | 63 ++++++++++++ xen/arch/ppc/include/asm/page-bits.h | 7 ++ xen/arch/ppc/ppc64/Makefile | 1 + xen/arch/ppc/ppc64/asm-offsets.c | 0 xen/arch/ppc/ppc64/head.S | 30 ++++++ xen/arch/ppc/xen.lds.S | 188 +++++++++++++++++++++++++++++++++++ 14 files changed, 379 insertions(+), 2 deletions(-) diff --git a/config/ppc64.mk b/config/ppc64.mk new file mode 100644 index 0000000000..05f74bb306 --- /dev/null +++ b/config/ppc64.mk @@ -0,0 +1,4 @@ +CONFIG_PPC := y +CONFIG_PPC64 := y + +CONFIG_XEN_INSTALL_SUFFIX := diff --git a/xen/Makefile b/xen/Makefile index e89fc461fc..db5454fb58 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -38,7 +38,7 @@ EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi ARCH=$(XEN_TARGET_ARCH) SRCARCH=$(shell echo $(ARCH) | \ sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \ - -e s'/riscv.*/riscv/g') + -e s'/riscv.*/riscv/g' -e s'/ppc.*/ppc/g') export ARCH SRCARCH # Allow someone to change their config file @@ -244,7 +244,7 @@ include $(XEN_ROOT)/Config.mk export TARGET_SUBARCH := $(XEN_TARGET_ARCH) export TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \ sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g' \ - -e s'/riscv.*/riscv/g') + -e s'/riscv.*/riscv/g' -e s'/ppc.*/ppc/g') export CONFIG_SHELL := $(SHELL) export CC CXX LD NM OBJCOPY OBJDUMP ADDR2LINE @@ -563,6 +563,7 @@ _clean: $(Q)$(MAKE) $(clean)=xsm $(Q)$(MAKE) $(clean)=crypto $(Q)$(MAKE) $(clean)=arch/arm + $(Q)$(MAKE) $(clean)=arch/ppc $(Q)$(MAKE) $(clean)=arch/riscv $(Q)$(MAKE) $(clean)=arch/x86 $(Q)$(MAKE) $(clean)=test diff --git a/xen/arch/ppc/Kconfig b/xen/arch/ppc/Kconfig new file mode 100644 index 0000000000..a2ade2ecf4 --- /dev/null +++ b/xen/arch/ppc/Kconfig @@ -0,0 +1,42 @@ +config PPC + def_bool y + +config PPC64 + def_bool y + select 64BIT + +config ARCH_DEFCONFIG + string + default "arch/ppc/configs/ppc64_defconfig" + +menu "Architecture Features" + +source "arch/Kconfig" + +endmenu + +menu "ISA Selection" + +choice + prompt "Base ISA" + default POWER_ISA_2_07B + help + This selects the base ISA version that Xen will target. + +config POWER_ISA_2_07B + bool "Power ISA 2.07B (POWER8)" + help + Target version 2.07B of the Power ISA (POWER8) or later + +config POWER_ISA_3_00 + bool "Power ISA 3.00 (POWER9)" + help + Target version 3.00 of the Power ISA (POWER9) or later + +endchoice + +endmenu + +source "common/Kconfig" + +source "drivers/Kconfig" diff --git a/xen/arch/ppc/Kconfig.debug b/xen/arch/ppc/Kconfig.debug new file mode 100644 index 0000000000..e69de29bb2 diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile new file mode 100644 index 0000000000..98220648af --- /dev/null +++ b/xen/arch/ppc/Makefile @@ -0,0 +1,16 @@ +obj-$(CONFIG_PPC64) += ppc64/ + +$(TARGET): $(TARGET)-syms + cp -f $< $@ + +$(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) -o $@ + $(NM) -pa --format=sysv $@ \ + | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ + > $@.map + +$(obj)/xen.lds: $(src)/xen.lds.S FORCE + $(call if_changed_dep,cpp_lds_S) + +.PHONY: include +include: diff --git a/xen/arch/ppc/Rules.mk b/xen/arch/ppc/Rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/xen/arch/ppc/arch.mk b/xen/arch/ppc/arch.mk new file mode 100644 index 0000000000..36830457c6 --- /dev/null +++ b/xen/arch/ppc/arch.mk @@ -0,0 +1,12 @@ +######################################## +# Power-specific definitions + +ppc-march-$(CONFIG_POWER_ISA_2_07B) := power8 +ppc-march-$(CONFIG_POWER_ISA_3_00) := power9 + +CFLAGS += -m64 -mlittle-endian -mcpu=$(ppc-march-y) +CFLAGS += -mstrict-align -mcmodel=large -mabi=elfv2 -mno-altivec -mno-vsx + +# TODO: Drop override when more of the build is working +override ALL_OBJS-y = arch/$(TARGET_ARCH)/built_in.o +override ALL_LIBS-y = diff --git a/xen/arch/ppc/configs/ppc64_defconfig b/xen/arch/ppc/configs/ppc64_defconfig new file mode 100644 index 0000000000..8783eb3488 --- /dev/null +++ b/xen/arch/ppc/configs/ppc64_defconfig @@ -0,0 +1,13 @@ +# CONFIG_SCHED_CREDIT is not set +# CONFIG_SCHED_RTDS is not set +# CONFIG_SCHED_NULL is not set +# CONFIG_SCHED_ARINC653 is not set +# CONFIG_TRACEBUFFER is not set +# CONFIG_HYPFS is not set +# CONFIG_GRANT_TABLE is not set +# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set + +CONFIG_PPC64=y +CONFIG_DEBUG=y +CONFIG_DEBUG_INFO=y +CONFIG_EXPERT=y diff --git a/xen/arch/ppc/include/asm/config.h b/xen/arch/ppc/include/asm/config.h new file mode 100644 index 0000000000..b9a6814f00 --- /dev/null +++ b/xen/arch/ppc/include/asm/config.h @@ -0,0 +1,63 @@ +#ifndef __PPC_CONFIG_H__ +#define __PPC_CONFIG_H__ + +#include +#include + +#if defined(CONFIG_PPC64) +#define LONG_BYTEORDER 3 +#define ELFSIZE 64 +#define MAX_VIRT_CPUS 1024u +#else +#error "Unsupported PowerPC variant" +#endif + +#define BYTES_PER_LONG (1 << LONG_BYTEORDER) +#define BITS_PER_LONG (BYTES_PER_LONG << 3) +#define POINTER_ALIGN BYTES_PER_LONG + +#define BITS_PER_LLONG 64 + +/* xen_ulong_t is always 64 bits */ +#define BITS_PER_XEN_ULONG 64 + +#define CONFIG_PPC_L1_CACHE_SHIFT 7 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + +#define OPT_CONSOLE_STR "dtuart" +#define INVALID_VCPU_ID MAX_VIRT_CPUS + +/* Linkage for PPC */ +#ifdef __ASSEMBLY__ +#define ALIGN .p2align 2 + +#define ENTRY(name) \ + .globl name; \ + ALIGN; \ + name: +#endif + +#define XEN_VIRT_START _AT(UL, 0x400000) + +#define SMP_CACHE_BYTES (1 << 6) + +#define STACK_ORDER 2 +#define STACK_SIZE (PAGE_SIZE << STACK_ORDER) + +/* 288 bytes below the stack pointer must be preserved by interrupt handlers */ +#define STACK_VOLATILE_AREA 288 + +/* size of minimum stack frame; C code can write into the caller's stack */ +#define STACK_FRAME_OVERHEAD 32 + +#endif /* __PPC_CONFIG_H__ */ +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/ppc/include/asm/page-bits.h b/xen/arch/ppc/include/asm/page-bits.h new file mode 100644 index 0000000000..4c01bf9716 --- /dev/null +++ b/xen/arch/ppc/include/asm/page-bits.h @@ -0,0 +1,7 @@ +#ifndef __PPC_PAGE_BITS_H__ +#define __PPC_PAGE_BITS_H__ + +#define PAGE_SHIFT 16 /* 64 KiB Pages */ +#define PADDR_BITS 48 + +#endif /* __PPC_PAGE_BITS_H__ */ diff --git a/xen/arch/ppc/ppc64/Makefile b/xen/arch/ppc/ppc64/Makefile new file mode 100644 index 0000000000..3340058c08 --- /dev/null +++ b/xen/arch/ppc/ppc64/Makefile @@ -0,0 +1 @@ +obj-y += head.o diff --git a/xen/arch/ppc/ppc64/asm-offsets.c b/xen/arch/ppc/ppc64/asm-offsets.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/xen/arch/ppc/ppc64/head.S b/xen/arch/ppc/ppc64/head.S new file mode 100644 index 0000000000..2fcefb40d8 --- /dev/null +++ b/xen/arch/ppc/ppc64/head.S @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + + .section .text.header, "ax", %progbits + +ENTRY(start) + /* + * Depending on how we were booted, the CPU could be running in either + * Little Endian or Big Endian mode. The following trampoline from Linux + * cleverly uses an instruction that encodes to a NOP if the CPU's + * endianness matches the assumption of the assembler (LE, in our case) + * or a branch to code that performs the endian switch in the other case. + */ + tdi 0, 0, 0x48 /* Reverse endian of b . + 8 */ + b . + 44 /* Skip trampoline if endian is good */ + .long 0xa600607d /* mfmsr r11 */ + .long 0x01006b69 /* xori r11,r11,1 */ + .long 0x00004039 /* li r10,0 */ + .long 0x6401417d /* mtmsrd r10,1 */ + .long 0x05009f42 /* bcl 20,31,$+4 */ + .long 0xa602487d /* mflr r10 */ + .long 0x14004a39 /* addi r10,r10,20 */ + .long 0xa6035a7d /* mtsrr0 r10 */ + .long 0xa6037b7d /* mtsrr1 r11 */ + .long 0x2400004c /* rfid */ + + /* Now that the endianness is confirmed, continue */ +1: b 1b + + .size start, . - start + .type start, %function diff --git a/xen/arch/ppc/xen.lds.S b/xen/arch/ppc/xen.lds.S new file mode 100644 index 0000000000..c628cc0e5c --- /dev/null +++ b/xen/arch/ppc/xen.lds.S @@ -0,0 +1,188 @@ +#include +#include + +#undef ENTRY +#undef ALIGN + +OUTPUT_ARCH(powerpc:common64) +ENTRY(start) + +PHDRS +{ + text PT_LOAD ; +#if defined(BUILD_ID) + note PT_NOTE ; +#endif +} + +/** + * OpenFirmware's base load address is 0x400000 (XEN_VIRT_START). + * By defining sections this way, we can keep our virtual address base at 0x400000 + * while keeping the physical base at 0x0. + * + * Otherwise, OpenFirmware incorrectly loads .text at 0x400000 + 0x400000 = 0x800000. + * Taken from x86/xen.lds.S + */ +#ifdef CONFIG_LD_IS_GNU +# define DECL_SECTION(x) x : AT(ADDR(#x) - XEN_VIRT_START) +#else +# define DECL_SECTION(x) x : AT(ADDR(x) - XEN_VIRT_START) +#endif + +SECTIONS +{ + . = XEN_VIRT_START; + + DECL_SECTION(.text) { + _stext = .; /* Text section */ + *(.text.header) + + *(.text.cold) + *(.text.unlikely .text.*_unlikely .text.unlikely.*) + + *(.text) +#ifdef CONFIG_CC_SPLIT_SECTIONS + *(.text.*) +#endif + + *(.fixup) + *(.gnu.warning) + . = ALIGN(POINTER_ALIGN); + _etext = .; /* End of text section */ + } :text + + . = ALIGN(PAGE_SIZE); + DECL_SECTION(.rodata) { + _srodata = .; /* Read-only data */ + *(.rodata) + *(.rodata.*) + *(.data.rel.ro) + *(.data.rel.ro.*) + + VPCI_ARRAY + + . = ALIGN(POINTER_ALIGN); + _erodata = .; /* End of read-only data */ + } :text + + #if defined(BUILD_ID) + . = ALIGN(4); + DECL_SECTION(.note.gnu.build-id) { + __note_gnu_build_id_start = .; + *(.note.gnu.build-id) + __note_gnu_build_id_end = .; + } :note :text + #endif + _erodata = .; /* End of read-only data */ + + . = ALIGN(PAGE_SIZE); + DECL_SECTION(.data.ro_after_init) { + __ro_after_init_start = .; + *(.data.ro_after_init) + . = ALIGN(PAGE_SIZE); + __ro_after_init_end = .; + } : text + + DECL_SECTION(.data.read_mostly) { + *(.data.read_mostly) + } :text + + . = ALIGN(PAGE_SIZE); + DECL_SECTION(.data) { /* Data */ + *(.data.page_aligned) + . = ALIGN(8); + __start_schedulers_array = .; + *(.data.schedulers) + __end_schedulers_array = .; + + HYPFS_PARAM + + *(.data .data.*) + CONSTRUCTORS + } :text + + . = ALIGN(PAGE_SIZE); /* Init code and data */ + __init_begin = .; + DECL_SECTION(.init.text) { + _sinittext = .; + *(.init.text) + _einittext = .; + . = ALIGN(PAGE_SIZE); /* Avoid mapping alt insns executable */ + } :text + + . = ALIGN(PAGE_SIZE); + DECL_SECTION(.init.data) { + *(.init.rodata) + *(.init.rodata.*) + + . = ALIGN(POINTER_ALIGN); + __setup_start = .; + *(.init.setup) + __setup_end = .; + + __initcall_start = .; + *(.initcallpresmp.init) + __presmp_initcall_end = .; + *(.initcall1.init) + __initcall_end = .; + + LOCK_PROFILE_DATA + + *(.init.data) + *(.init.data.rel) + *(.init.data.rel.*) + + . = ALIGN(8); + __ctors_start = .; + *(.ctors) + *(.init_array) + *(SORT(.init_array.*)) + __ctors_end = .; + } :text + + DECL_SECTION(.got) { + *(.got) + } :text + + DECL_SECTION(.got.plt) { + *(.got.plt) + } :text + + . = ALIGN(POINTER_ALIGN); + __init_end = .; + + DECL_SECTION(.bss) { /* BSS */ + __bss_start = .; + *(.bss.stack_aligned) + *(.bss.page_aligned) + . = ALIGN(PAGE_SIZE); + __per_cpu_start = .; + *(.bss.percpu.page_aligned) + *(.bss.percpu) + . = ALIGN(SMP_CACHE_BYTES); + *(.bss.percpu.read_mostly) + . = ALIGN(SMP_CACHE_BYTES); + __per_cpu_data_end = .; + *(.bss .bss.*) + . = ALIGN(POINTER_ALIGN); + __bss_end = .; + } :text + _end = . ; + + /* Section for the device tree blob (if any). */ + DECL_SECTION(.dtb) { *(.dtb) } :text + + DWARF2_DEBUG_SECTIONS + + DISCARD_SECTIONS + + STABS_DEBUG_SECTIONS + + ELF_DETAILS_SECTIONS +} + +ASSERT(IS_ALIGNED(__bss_start, POINTER_ALIGN), "__bss_start is misaligned") +ASSERT(IS_ALIGNED(__bss_end, POINTER_ALIGN), "__bss_end is misaligned") + +ASSERT(!SIZEOF(.got), ".got non-empty") +ASSERT(!SIZEOF(.got.plt), ".got.plt non-empty") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:58:16 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:58:16 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554484.865723 (Exim 4.92) (envelope-from ) id 1qCxDs-0000k2-0d; Sat, 24 Jun 2023 06:58:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554484.865723; Sat, 24 Jun 2023 06:58:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDr-0000ju-Tp; Sat, 24 Jun 2023 06:58:15 +0000 Received: by outflank-mailman (input) for mailman id 554484; Sat, 24 Jun 2023 06:58:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDq-0000jh-68 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxDq-0008At-5V for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxDq-000747-4n for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=UT7uYRl4FGCj/vmwRQpWtYBC318zVFxQ/I7dCgzMkXs=; b=Gj5L3zHVri8lrujv39aRoLjmDR 3FHoyqRMRIZJ0prXNjSXj+fsI/JEuq3Unrb6lrYM9/HKgJ642xTWWz3WP+dH6jsIrEpZOshCReXrf 8iMI989g7b4SUbmKRxyBfkJrwEyqbJd64zhgbabxXa+KKO/gNNP+N/kLCjRIBFO/q3+8=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add ppc64le cross-build jobs Message-Id: Date: Sat, 24 Jun 2023 06:58:14 +0000 commit 125a180741c953c9051b3583e2ce360a40fdaf62 Author: Shawn Anastasio AuthorDate: Tue Jun 20 13:12:48 2023 -0500 Commit: Andrew Cooper CommitDate: Wed Jun 21 14:26:21 2023 +0100 automation: Add ppc64le cross-build jobs Add build jobs to cross-compile Xen for ppc64le. Signed-off-by: Shawn Anastasio Acked-by: Stefano Stabellini Acked-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 420ffa5acb..bd8c7332db 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -183,6 +183,33 @@ variables: <<: *gcc +.ppc64le-cross-build-tmpl: + <<: *build + variables: + XEN_TARGET_ARCH: ppc64 + tags: + - x86_64 + +.ppc64le-cross-build: + extends: .ppc64le-cross-build-tmpl + variables: + debug: n + +.ppc64le-cross-build-debug: + extends: .ppc64le-cross-build-tmpl + variables: + debug: y + +.gcc-ppc64le-cross-build: + extends: .ppc64le-cross-build + variables: + <<: *gcc + +.gcc-ppc64le-cross-build-debug: + extends: .ppc64le-cross-build-debug + variables: + <<: *gcc + .yocto-test: stage: build image: registry.gitlab.com/xen-project/xen/${CONTAINER} @@ -516,6 +543,39 @@ archlinux-current-gcc-riscv64-debug-randconfig: EXTRA_FIXED_RANDCONFIG: CONFIG_COVERAGE=n +# Power cross-build +debian-bullseye-gcc-ppc64le: + extends: .gcc-ppc64le-cross-build + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: openpower_defconfig + HYPERVISOR_ONLY: y + +debian-bullseye-gcc-ppc64le-debug: + extends: .gcc-ppc64le-cross-build-debug + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: openpower_defconfig + HYPERVISOR_ONLY: y + +debian-bullseye-gcc-ppc64le-randconfig: + extends: .gcc-ppc64le-cross-build + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: openpower_defconfig + RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: + CONFIG_COVERAGE=n + +debian-bullseye-gcc-ppc64le-debug-randconfig: + extends: .gcc-ppc64le-cross-build-debug + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: openpower_defconfig + RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: + CONFIG_COVERAGE=n + # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:58:26 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:58:26 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554485.865727 (Exim 4.92) (envelope-from ) id 1qCxE2-0000mz-2R; Sat, 24 Jun 2023 06:58:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554485.865727; Sat, 24 Jun 2023 06:58:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxE1-0000mr-Vi; Sat, 24 Jun 2023 06:58:25 +0000 Received: by outflank-mailman (input) for mailman id 554485; Sat, 24 Jun 2023 06:58:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxE0-0000mf-9A for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxE0-0008BU-8Q for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxE0-00074a-7b for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=vVFJewbV+duI01avmDk5AqY92LGdprOZ23rNrsy6aEk=; b=vM/iOoiijnwl5PT/Mi1mG+TFLc +Q/nKh52rM0TxeOX9bK0NxW86ydRu/SqtEASxyP/HyxLia+LCU6DA/26OD6+6wsLc88I5RG6dkE/5 LWOoJxg/sXzkpzYGqbLihGfUGFfDfI0SUBB9Ot0sYnJ1qaSvm7zlQERzK9X8Kou8/lps=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] maintainers: Add ppc64 maintainer Message-Id: Date: Sat, 24 Jun 2023 06:58:24 +0000 commit 1ec2f5305b826367d2cbfcd24ca079448057e331 Author: Shawn Anastasio AuthorDate: Tue Jun 20 13:12:49 2023 -0500 Commit: Andrew Cooper CommitDate: Wed Jun 21 14:26:21 2023 +0100 maintainers: Add ppc64 maintainer Signed-off-by: Shawn Anastasio Acked-by: Andrew Cooper --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7a07949e1d..64c9cc89ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -458,6 +458,10 @@ X: xen/arch/x86/acpi/lib.c F: xen/drivers/cpufreq/ F: xen/include/acpi/cpufreq/ +PPC64 +M: Shawn Anastasio +F: xen/arch/ppc/ + PUBLIC I/O INTERFACES AND PV DRIVERS DESIGNS M: Juergen Gross S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:58:36 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:58:36 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554486.865731 (Exim 4.92) (envelope-from ) id 1qCxEC-0000qF-3s; Sat, 24 Jun 2023 06:58:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554486.865731; Sat, 24 Jun 2023 06:58:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEC-0000q7-0s; Sat, 24 Jun 2023 06:58:36 +0000 Received: by outflank-mailman (input) for mailman id 554486; Sat, 24 Jun 2023 06:58:34 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEA-0000pr-D7 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:34 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEA-0008Bh-CF for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxEA-00075R-BC for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=7CLdpKHmjMI/gQa2ejUBpSeTA6Z2VfYTB0rEEnKh8AI=; b=P4uxeadveKMq8Cm0yhI8UxcQl1 muEiuAOMA7wyMsAPjRZL4A8dP4fYsDKd/CLAyjesTXmasAJr7aBMgj9Alq2BfjrCMo6+IKfxb0ck3 eHwJKuz8JISbXusDAAenoFm3sKE/7x3epInRUht7Axw5gq/9+mZHd94rMlvFy1QI66bU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Add QEMU to bullseye-ppc64le Message-Id: Date: Sat, 24 Jun 2023 06:58:34 +0000 commit b1a7c2b297555009022845fe67e8bc1f7382f8d7 Author: Shawn Anastasio AuthorDate: Wed Jun 21 11:59:50 2023 -0500 Commit: Andrew Cooper CommitDate: Wed Jun 21 19:05:06 2023 +0100 automation: Add QEMU to bullseye-ppc64le Add qemu-system-ppc package to the bullseye-ppc64le container to allow running smoke tests in CI. Signed-off-by: Shawn Anastasio Acked-by: Andrew Cooper --- automation/build/debian/bullseye-ppc64le.dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile index 8a87631b52..8fad26e903 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -22,6 +22,8 @@ RUN apt-get update && \ gcc-powerpc64le-linux-gnu \ make \ python3-minimal \ + # for test phase + qemu-system-ppc \ && \ apt-get autoremove -y && \ apt-get clean && \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:58:46 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:58:46 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554487.865735 (Exim 4.92) (envelope-from ) id 1qCxEM-0000t7-6u; Sat, 24 Jun 2023 06:58:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554487.865735; Sat, 24 Jun 2023 06:58:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEM-0000t0-44; Sat, 24 Jun 2023 06:58:46 +0000 Received: by outflank-mailman (input) for mailman id 554487; Sat, 24 Jun 2023 06:58:44 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEK-0000si-G0 for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:44 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEK-0008Bo-FF for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxEK-00075q-EW for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=0nYI5GTbxgZqlRcduzAjRL9wb03BBP3mDsqrI7umO70=; b=iCRJBZ1AtyBpEUOWH83qPPbkBZ ZW/04/4T3qTlQgIoxWISGKaC1SX1xOcUvTND273j7ycFVQysvyed5zD4r34gjZp8l1q2jr3DKziI6 hPLVq3STvHAkyAYeyTSe/Hrxek8akWHBPzfsOkHF8Qv0FhU1sXJNP+RPrBk/PalI68OY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] automation: Fix KBUILD_DEFCONFIG for *ppc64le jobs Message-Id: Date: Sat, 24 Jun 2023 06:58:44 +0000 commit ef8d8412290dd70219703681ff63e5136b3cfe97 Author: Shawn Anastasio AuthorDate: Wed Jun 21 11:59:51 2023 -0500 Commit: Andrew Cooper CommitDate: Wed Jun 21 19:05:06 2023 +0100 automation: Fix KBUILD_DEFCONFIG for *ppc64le jobs During an iteration of the initial ppc64le support patchset the default defconfig was renamed but build.yaml wasn't updated to reflect this. Fix it up. Signed-off-by: Shawn Anastasio Acked-by: Andrew Cooper --- automation/gitlab-ci/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index bd8c7332db..c401f62d61 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -548,21 +548,21 @@ debian-bullseye-gcc-ppc64le: extends: .gcc-ppc64le-cross-build variables: CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: openpower_defconfig + KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y debian-bullseye-gcc-ppc64le-debug: extends: .gcc-ppc64le-cross-build-debug variables: CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: openpower_defconfig + KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y debian-bullseye-gcc-ppc64le-randconfig: extends: .gcc-ppc64le-cross-build variables: CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: openpower_defconfig + KBUILD_DEFCONFIG: ppc64_defconfig RANDCONFIG: y EXTRA_FIXED_RANDCONFIG: CONFIG_COVERAGE=n @@ -571,7 +571,7 @@ debian-bullseye-gcc-ppc64le-debug-randconfig: extends: .gcc-ppc64le-cross-build-debug variables: CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: openpower_defconfig + KBUILD_DEFCONFIG: ppc64_defconfig RANDCONFIG: y EXTRA_FIXED_RANDCONFIG: CONFIG_COVERAGE=n -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat Jun 24 06:58:56 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 24 Jun 2023 06:58:56 +0000 Received: from list by lists.xenproject.org with outflank-mailman.554488.865739 (Exim 4.92) (envelope-from ) id 1qCxEW-0000w5-9C; Sat, 24 Jun 2023 06:58:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 554488.865739; Sat, 24 Jun 2023 06:58:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEW-0000vy-6G; Sat, 24 Jun 2023 06:58:56 +0000 Received: by outflank-mailman (input) for mailman id 554488; Sat, 24 Jun 2023 06:58:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEU-0000vk-Iz for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qCxEU-0008Bv-IC for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qCxEU-00076F-HY for xen-changelog@lists.xenproject.org; Sat, 24 Jun 2023 06:58:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=u+PFLU6iq16rWoe7tVlHP+QPQqR9h36X4kqCHzwPT14=; b=FCzXTcMrDFQWK+chN35Q7uECl5 jgBjidj2Cpp2omD/8niFen/uW/Vk42JEpfiinB+TYUmdRe+pyg0CxDLQu4W2lfaYlThYRWd+ukshr bky3GzzY5z/0JyD4Pf+6OjTE7ZWa5A3OlXOXJb3fyDWYZ8hZLEOt7UxKGlun4BPhylxs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/decompress: Drop bool_t and use bool instead Message-Id: Date: Sat, 24 Jun 2023 06:58:54 +0000 commit 5c84f1f636981dab5341e84aaba8d4dd00bbc2cb Author: Andrew Cooper AuthorDate: Tue Jun 20 17:43:55 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 21 19:08:22 2023 +0100 xen/decompress: Drop bool_t and use bool instead In particular, the libxg wrapper for unxz.c uses char for bool_t which is a major antipattern. Luckily the code doesn't suffer from truncated values. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- tools/libs/guest/xg_dom_decompress_unsafe_xz.c | 1 - xen/common/unxz.c | 2 +- xen/common/xz/dec_bcj.c | 6 +++--- xen/common/xz/dec_lzma2.c | 20 ++++++++++---------- xen/common/xz/dec_stream.c | 8 ++++---- xen/common/xz/lzma2.h | 2 +- xen/common/xz/private.h | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/tools/libs/guest/xg_dom_decompress_unsafe_xz.c b/tools/libs/guest/xg_dom_decompress_unsafe_xz.c index fc48198741..80eed912dd 100644 --- a/tools/libs/guest/xg_dom_decompress_unsafe_xz.c +++ b/tools/libs/guest/xg_dom_decompress_unsafe_xz.c @@ -11,7 +11,6 @@ // TODO #define XZ_DEC_X86 -typedef char bool_t; typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; diff --git a/xen/common/unxz.c b/xen/common/unxz.c index 17aead0adf..9586a4e5c9 100644 --- a/xen/common/unxz.c +++ b/xen/common/unxz.c @@ -166,7 +166,7 @@ int __init unxz(unsigned char *in, unsigned int in_size, struct xz_buf b; struct xz_dec *s; enum xz_ret ret; - bool_t must_free_in = false; + bool must_free_in = false; xz_crc32_init(); diff --git a/xen/common/xz/dec_bcj.c b/xen/common/xz/dec_bcj.c index bfa498587a..bdc59770f8 100644 --- a/xen/common/xz/dec_bcj.c +++ b/xen/common/xz/dec_bcj.c @@ -35,7 +35,7 @@ struct xz_dec_bcj { enum xz_ret ret; /* True if we are operating in single-call mode. */ - bool_t single_call; + bool single_call; /* * Absolute position relative to the beginning of the uncompressed @@ -87,7 +87,7 @@ static inline int __init bcj_x86_test_msbyte(uint8_t b) static size_t __init bcj_x86(struct xz_dec_bcj *s, uint8_t *buf, size_t size) { - static const bool_t mask_to_allowed_status[8] + static const bool mask_to_allowed_status[8] = { true, true, true, false, true, false, false, false }; static const uint8_t mask_to_bit_num[8] = { 0, 1, 2, 2, 3, 3, 3, 3 }; @@ -524,7 +524,7 @@ XZ_EXTERN enum xz_ret __init xz_dec_bcj_run(struct xz_dec_bcj *s, return s->ret; } -XZ_EXTERN struct xz_dec_bcj *__init xz_dec_bcj_create(bool_t single_call) +XZ_EXTERN struct xz_dec_bcj *__init xz_dec_bcj_create(bool single_call) { struct xz_dec_bcj *s = malloc(sizeof(*s)); if (s != NULL) diff --git a/xen/common/xz/dec_lzma2.c b/xen/common/xz/dec_lzma2.c index f80d8309f4..71359fab9f 100644 --- a/xen/common/xz/dec_lzma2.c +++ b/xen/common/xz/dec_lzma2.c @@ -241,13 +241,13 @@ struct lzma2_dec { * True if dictionary reset is needed. This is false before * the first chunk (LZMA or uncompressed). */ - bool_t need_dict_reset; + bool need_dict_reset; /* * True if new LZMA properties are needed. This is false * before the first LZMA chunk. */ - bool_t need_props; + bool need_props; }; struct xz_dec_lzma2 { @@ -306,7 +306,7 @@ static void __init dict_limit(struct dictionary *dict, size_t out_max) } /* Return true if at least one byte can be written into the dictionary. */ -static inline bool_t __init dict_has_space(const struct dictionary *dict) +static inline bool __init dict_has_space(const struct dictionary *dict) { return dict->pos < dict->limit; } @@ -343,7 +343,7 @@ static inline void __init dict_put(struct dictionary *dict, uint8_t byte) * invalid, false is returned. On success, true is returned and *len is * updated to indicate how many bytes were left to be repeated. */ -static bool_t __init dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist) +static bool __init dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist) { size_t back; uint32_t left; @@ -463,7 +463,7 @@ static void __init rc_reset(struct rc_dec *rc) * Read the first five initial bytes into rc->code if they haven't been * read already. (Yes, the first byte gets completely ignored.) */ -static bool_t __init rc_read_init(struct rc_dec *rc, struct xz_buf *b) +static bool __init rc_read_init(struct rc_dec *rc, struct xz_buf *b) { while (rc->init_bytes_left > 0) { if (b->in_pos == b->in_size) @@ -477,7 +477,7 @@ static bool_t __init rc_read_init(struct rc_dec *rc, struct xz_buf *b) } /* Return true if there may not be enough input for the next decoding loop. */ -static inline bool_t __init rc_limit_exceeded(const struct rc_dec *rc) +static inline bool __init rc_limit_exceeded(const struct rc_dec *rc) { return rc->in_pos > rc->in_limit; } @@ -486,7 +486,7 @@ static inline bool_t __init rc_limit_exceeded(const struct rc_dec *rc) * Return true if it is possible (from point of view of range decoder) that * we have reached the end of the LZMA chunk. */ -static inline bool_t __init rc_is_finished(const struct rc_dec *rc) +static inline bool __init rc_is_finished(const struct rc_dec *rc) { return rc->code == 0; } @@ -736,7 +736,7 @@ static void __init lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state) } /* LZMA decoder core */ -static bool_t __init lzma_main(struct xz_dec_lzma2 *s) +static bool __init lzma_main(struct xz_dec_lzma2 *s) { uint32_t pos_state; @@ -814,7 +814,7 @@ static void __init lzma_reset(struct xz_dec_lzma2 *s) * from the decoded lp and pb values. On success, the LZMA decoder state is * reset and true is returned. */ -static bool_t __init lzma_props(struct xz_dec_lzma2 *s, uint8_t props) +static bool __init lzma_props(struct xz_dec_lzma2 *s, uint8_t props) { if (props > (4 * 5 + 4) * 9 + 8) return false; @@ -861,7 +861,7 @@ static bool_t __init lzma_props(struct xz_dec_lzma2 *s, uint8_t props) * function. We decode a few bytes from the temporary buffer so that we can * continue decoding from the caller-supplied input buffer again. */ -static bool_t __init lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b) +static bool __init lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b) { size_t in_avail; uint32_t tmp; diff --git a/xen/common/xz/dec_stream.c b/xen/common/xz/dec_stream.c index b91d8362c1..caea4f2596 100644 --- a/xen/common/xz/dec_stream.c +++ b/xen/common/xz/dec_stream.c @@ -55,7 +55,7 @@ struct xz_dec { * True if the next call to xz_dec_run() is allowed to return * XZ_BUF_ERROR. */ - bool_t allow_buf_error; + bool allow_buf_error; /* Information stored in Block Header */ struct { @@ -132,7 +132,7 @@ struct xz_dec { #ifdef XZ_DEC_BCJ struct xz_dec_bcj *bcj; - bool_t bcj_active; + bool bcj_active; #endif }; @@ -154,7 +154,7 @@ static const uint8_t check_sizes[16] = { * to copy into s->temp.buf. Return true once s->temp.pos has reached * s->temp.size. */ -static bool_t __init fill_temp(struct xz_dec *s, struct xz_buf *b) +static bool __init fill_temp(struct xz_dec *s, struct xz_buf *b) { size_t copy_size = min_t(size_t, b->in_size - b->in_pos, s->temp.size - s->temp.pos); @@ -367,7 +367,7 @@ static enum xz_ret __init crc32_validate(struct xz_dec *s, struct xz_buf *b) * Skip over the Check field when the Check ID is not supported. * Returns true once the whole Check field has been skipped over. */ -static bool_t __init check_skip(struct xz_dec *s, struct xz_buf *b) +static bool __init check_skip(struct xz_dec *s, struct xz_buf *b) { while (s->pos < check_sizes[s->check_type]) { if (b->in_pos == b->in_size) diff --git a/xen/common/xz/lzma2.h b/xen/common/xz/lzma2.h index e0ef42e880..06a7edb4d7 100644 --- a/xen/common/xz/lzma2.h +++ b/xen/common/xz/lzma2.h @@ -90,7 +90,7 @@ static inline void __init lzma_state_short_rep(enum lzma_state *state) } /* Test if the previous symbol was a literal. */ -static inline bool_t __init lzma_state_is_literal(enum lzma_state state) +static inline bool __init lzma_state_is_literal(enum lzma_state state) { return state < LIT_STATES; } diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h index 511343fcc2..e6814250e8 100644 --- a/xen/common/xz/private.h +++ b/xen/common/xz/private.h @@ -237,7 +237,7 @@ XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s); * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before * calling xz_dec_bcj_run(). */ -XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool_t single_call); +XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call); /* * Decode the Filter ID of a BCJ filter. This implementation doesn't -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu Jun 29 07:33:08 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 29 Jun 2023 07:33:08 +0000 Received: from list by lists.xenproject.org with outflank-mailman.556681.869387 (Exim 4.92) (envelope-from ) id 1qEm9H-0007bt-2S; Thu, 29 Jun 2023 07:33:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 556681.869387; Thu, 29 Jun 2023 07:33:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qEm9G-0007bl-W5; Thu, 29 Jun 2023 07:33:02 +0000 Received: by outflank-mailman (input) for mailman id 556681; Thu, 29 Jun 2023 07:33:01 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qEm9F-0007bd-Mz for xen-changelog@lists.xenproject.org; Thu, 29 Jun 2023 07:33:01 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qEm9F-0003WC-MH for xen-changelog@lists.xenproject.org; Thu, 29 Jun 2023 07:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qEm9F-0001hk-LE for xen-changelog@lists.xenproject.org; Thu, 29 Jun 2023 07:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=DmNh9IT5cCZx6paU8Quidv2/5IqBgEaIDw3gUpls1mI=; b=G4M2yJewiidnWoA1HvFRdO3Znd 7RLTmhVmedmF6ufMx2S7sB3R6L3e8TVghc4ARaJfQQ1f0gvYXhMr03TZVvswGQyAvZIbC3lpmQAr3 YBjecd2HiZSd7rqeO/mFR5AtW11llabJDLw/C+ghxomi+TZkaGZuUBBLOoiLivm/xly4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] x86/vpmu: Simplify is_pmc_quirk Message-Id: Date: Thu, 29 Jun 2023 07:33:01 +0000 commit 6c32a08e2b7e6d796081ed84c84ad682bcc4b3a6 Author: Andrew Cooper AuthorDate: Tue Jun 20 17:36:19 2023 +0100 Commit: Andrew Cooper CommitDate: Wed Jun 28 15:59:34 2023 +0100 x86/vpmu: Simplify is_pmc_quirk This should be static, and there's no need for a separate (non-init, even) function to perform a simple equality test. Drop the is_ prefix which is gramatically questionable, and make it __ro_after_init. Leave a TODO, because the behaviour is definitely wrong to be applied to all modern Intel CPUs. The question has been raised on xen-devel previously without conclusion. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/vpmu_intel.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 35e350578b..bda5d511ac 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -91,22 +91,14 @@ static const unsigned int regs_off = * 1 (or another value != 0) into it. * There exist no errata and the real cause of this behaviour is unknown. */ -bool_t __read_mostly is_pmc_quirk; - -static void check_pmc_quirk(void) -{ - if ( current_cpu_data.x86 == 6 ) - is_pmc_quirk = 1; - else - is_pmc_quirk = 0; -} +static bool __ro_after_init pmc_quirk; static void handle_pmc_quirk(u64 msr_content) { int i; u64 val; - if ( !is_pmc_quirk ) + if ( !pmc_quirk ) return; val = msr_content; @@ -791,8 +783,9 @@ static int cf_check core2_vpmu_do_interrupt(struct cpu_user_regs *regs) rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, msr_content); if ( msr_content ) { - if ( is_pmc_quirk ) + if ( pmc_quirk ) handle_pmc_quirk(msr_content); + core2_vpmu_cxt->global_status |= msr_content; msr_content &= ~global_ovf_ctrl_mask; wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, msr_content); @@ -967,7 +960,8 @@ const struct arch_vpmu_ops *__init core2_vpmu_init(void) sizeof(uint64_t) * fixed_pmc_cnt + sizeof(struct xen_pmu_cntr_pair) * arch_pmc_cnt; - check_pmc_quirk(); + /* TODO: It's clearly incorrect for this to quirk all Intel Fam6 CPUs. */ + pmc_quirk = current_cpu_data.x86 == 6; if ( sizeof(struct xen_pmu_data) + sizeof(uint64_t) * fixed_pmc_cnt + sizeof(struct xen_pmu_cntr_pair) * arch_pmc_cnt > PAGE_SIZE ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:22:10 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:22:10 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557506.870887 (Exim 4.92) (envelope-from ) id 1qFF0e-0006Rq-6m; Fri, 30 Jun 2023 14:22:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557506.870887; Fri, 30 Jun 2023 14:22:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0e-0006Ri-2y; Fri, 30 Jun 2023 14:22:04 +0000 Received: by outflank-mailman (input) for mailman id 557506; Fri, 30 Jun 2023 14:22:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0c-0006Rc-Ep for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0c-0008AE-0V for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF0b-0006cp-Ve for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=q9VnITYDr8pJWSUGqMBIEMQvw8n5/5O/In5gYMw2yXs=; b=DQiaiDRPwMwCXx32klKpcYkTes prEDXuPDQPRnDwjaBnHu4fvp5B6nZK3AgpOS5szYc/+jvWAKt+QCj0fNfyMO+5IlqPmxzro5wyGwK mNc8WTdzHRq+drKI/tqYH3XJyxl5/a3FijftIFUKePe4humtbttZbwksHb0ATBlXuQQY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: change names in function access_guest_memory_by_ipa(). Message-Id: Date: Fri, 30 Jun 2023 14:22:01 +0000 commit 8f47510b84769192204f4e1f0f4431d3b741f7fc Author: Federico Serafini AuthorDate: Mon Jun 26 11:52:13 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 28 15:54:05 2023 -0700 xen/arm: change names in function access_guest_memory_by_ipa(). Change the function name 'access_guest_memory_by_ipa' to 'access_guest_memory_by_gpa' and change its formal parameter name from 'ipa' to 'gpa' because of the following: 1) 'gpa' is used more frequently and therefore is preferable; 2) changing parameter name makes the declaration consistent with the corresponding definition thus fixing a violation of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Julien Grall --- xen/arch/arm/guest_walk.c | 6 +++--- xen/arch/arm/guestcopy.c | 2 +- xen/arch/arm/include/asm/guest_access.h | 2 +- xen/arch/arm/tee/optee.c | 10 +++++----- xen/arch/arm/vgic-v3-its.c | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/guest_walk.c b/xen/arch/arm/guest_walk.c index c80a0ce55b..d99b411f3b 100644 --- a/xen/arch/arm/guest_walk.c +++ b/xen/arch/arm/guest_walk.c @@ -85,7 +85,7 @@ static bool guest_walk_sd(const struct vcpu *v, paddr |= (gva & mask) >> 18; /* Access the guest's memory to read only one PTE. */ - ret = access_guest_memory_by_ipa(d, paddr, &pte, sizeof(short_desc_t), false); + ret = access_guest_memory_by_gpa(d, paddr, &pte, sizeof(short_desc_t), false); if ( ret ) return false; @@ -110,7 +110,7 @@ static bool guest_walk_sd(const struct vcpu *v, paddr = ((paddr_t)pte.walk.base << 10) | ((gva & mask) >> 10); /* Access the guest's memory to read only one PTE. */ - ret = access_guest_memory_by_ipa(d, paddr, &pte, sizeof(short_desc_t), false); + ret = access_guest_memory_by_gpa(d, paddr, &pte, sizeof(short_desc_t), false); if ( ret ) return false; @@ -481,7 +481,7 @@ static bool guest_walk_ld(const struct vcpu *v, paddr |= LPAE_TABLE_INDEX_GS(grainsizes[gran], level, gva) << 3; /* Access the guest's memory to read only one PTE. */ - ret = access_guest_memory_by_ipa(d, paddr, &pte, sizeof(lpae_t), false); + ret = access_guest_memory_by_gpa(d, paddr, &pte, sizeof(lpae_t), false); if ( ret ) return false; diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index 225fd343dd..6716b03561 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -142,7 +142,7 @@ unsigned long copy_to_guest_phys_flush_dcache(struct domain *d, COPY_to_guest | COPY_ipa | COPY_flush_dcache); } -int access_guest_memory_by_ipa(struct domain *d, paddr_t gpa, void *buf, +int access_guest_memory_by_gpa(struct domain *d, paddr_t gpa, void *buf, uint32_t size, bool is_write) { unsigned long left; diff --git a/xen/arch/arm/include/asm/guest_access.h b/xen/arch/arm/include/asm/guest_access.h index 4421e43611..8278a45dbf 100644 --- a/xen/arch/arm/include/asm/guest_access.h +++ b/xen/arch/arm/include/asm/guest_access.h @@ -16,7 +16,7 @@ unsigned long copy_to_guest_phys_flush_dcache(struct domain *d, void *buf, unsigned int len); -int access_guest_memory_by_ipa(struct domain *d, paddr_t ipa, void *buf, +int access_guest_memory_by_gpa(struct domain *d, paddr_t gpa, void *buf, uint32_t size, bool is_write); #define __raw_copy_to_guest raw_copy_to_guest diff --git a/xen/arch/arm/tee/optee.c b/xen/arch/arm/tee/optee.c index 9cb9f16d43..301d205a36 100644 --- a/xen/arch/arm/tee/optee.c +++ b/xen/arch/arm/tee/optee.c @@ -951,7 +951,7 @@ static bool copy_std_request(struct cpu_user_regs *regs, map_xen_arg(call); - if ( access_guest_memory_by_ipa(current->domain, call->guest_arg_ipa, + if ( access_guest_memory_by_gpa(current->domain, call->guest_arg_ipa, call->xen_arg, OPTEE_MSG_NONCONTIG_PAGE_SIZE, false) ) { @@ -1106,7 +1106,7 @@ static int handle_rpc_return(struct optee_domain *ctx, shm_rpc->xen_arg = __map_domain_page(shm_rpc->xen_arg_pg); - if ( access_guest_memory_by_ipa(current->domain, + if ( access_guest_memory_by_gpa(current->domain, gfn_to_gaddr(shm_rpc->gfn), shm_rpc->xen_arg, OPTEE_MSG_GET_ARG_SIZE(shm_rpc->xen_arg->num_params), @@ -1329,7 +1329,7 @@ static bool issue_rpc_cmd_free(struct optee_domain *ctx, shm_rpc->xen_arg->params[0].u.value.a = call->rpc_buffer_type; shm_rpc->xen_arg->params[0].u.value.b = cookie; - if ( access_guest_memory_by_ipa(current->domain, + if ( access_guest_memory_by_gpa(current->domain, gfn_to_gaddr(shm_rpc->gfn), shm_rpc->xen_arg, OPTEE_MSG_GET_ARG_SIZE(1), @@ -1462,7 +1462,7 @@ static void handle_rpc_cmd(struct optee_domain *ctx, struct cpu_user_regs *regs, shm_rpc->xen_arg = __map_domain_page(shm_rpc->xen_arg_pg); /* First, copy only header to read number of arguments */ - if ( access_guest_memory_by_ipa(current->domain, + if ( access_guest_memory_by_gpa(current->domain, gfn_to_gaddr(shm_rpc->gfn), shm_rpc->xen_arg, sizeof(struct optee_msg_arg), @@ -1480,7 +1480,7 @@ static void handle_rpc_cmd(struct optee_domain *ctx, struct cpu_user_regs *regs, } /* Read the whole command structure */ - if ( access_guest_memory_by_ipa(current->domain, gfn_to_gaddr(shm_rpc->gfn), + if ( access_guest_memory_by_gpa(current->domain, gfn_to_gaddr(shm_rpc->gfn), shm_rpc->xen_arg, arg_size, false) ) { shm_rpc->xen_arg->ret = TEEC_ERROR_GENERIC; diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 299b384250..05429030b5 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -121,7 +121,7 @@ static int its_set_collection(struct virt_its *its, uint16_t collid, if ( collid >= its->max_collections ) return -ENOENT; - return access_guest_memory_by_ipa(its->d, + return access_guest_memory_by_gpa(its->d, addr + collid * sizeof(coll_table_entry_t), &vcpu_id, sizeof(vcpu_id), true); } @@ -139,7 +139,7 @@ static struct vcpu *get_vcpu_from_collection(struct virt_its *its, if ( collid >= its->max_collections ) return NULL; - ret = access_guest_memory_by_ipa(its->d, + ret = access_guest_memory_by_gpa(its->d, addr + collid * sizeof(coll_table_entry_t), &vcpu_id, sizeof(coll_table_entry_t), false); if ( ret ) @@ -161,7 +161,7 @@ static int its_set_itt_address(struct virt_its *its, uint32_t devid, if ( devid >= its->max_devices ) return -ENOENT; - return access_guest_memory_by_ipa(its->d, + return access_guest_memory_by_gpa(its->d, addr + devid * sizeof(dev_table_entry_t), &itt_entry, sizeof(itt_entry), true); } @@ -179,7 +179,7 @@ static int its_get_itt(struct virt_its *its, uint32_t devid, if ( devid >= its->max_devices ) return -EINVAL; - return access_guest_memory_by_ipa(its->d, + return access_guest_memory_by_gpa(its->d, addr + devid * sizeof(dev_table_entry_t), itt, sizeof(*itt), false); } @@ -226,7 +226,7 @@ static bool read_itte(struct virt_its *its, uint32_t devid, uint32_t evid, if ( addr == INVALID_PADDR ) return false; - if ( access_guest_memory_by_ipa(its->d, addr, &itte, sizeof(itte), false) ) + if ( access_guest_memory_by_gpa(its->d, addr, &itte, sizeof(itte), false) ) return false; vcpu = get_vcpu_from_collection(its, itte.collection); @@ -260,7 +260,7 @@ static bool write_itte(struct virt_its *its, uint32_t devid, itte.collection = collid; itte.vlpi = vlpi; - if ( access_guest_memory_by_ipa(its->d, addr, &itte, sizeof(itte), true) ) + if ( access_guest_memory_by_gpa(its->d, addr, &itte, sizeof(itte), true) ) return false; return true; @@ -405,7 +405,7 @@ static int update_lpi_property(struct domain *d, struct pending_irq *p) addr = d->arch.vgic.rdist_propbase & GENMASK(51, 12); - ret = access_guest_memory_by_ipa(d, addr + p->irq - LPI_OFFSET, + ret = access_guest_memory_by_gpa(d, addr + p->irq - LPI_OFFSET, &property, sizeof(property), false); if ( ret ) return ret; @@ -910,7 +910,7 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its) { int ret; - ret = access_guest_memory_by_ipa(d, addr + its->creadr, + ret = access_guest_memory_by_gpa(d, addr + its->creadr, command, sizeof(command), false); if ( ret ) return ret; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:22:13 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:22:13 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557507.870890 (Exim 4.92) (envelope-from ) id 1qFF0n-0006Ty-7K; Fri, 30 Jun 2023 14:22:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557507.870890; Fri, 30 Jun 2023 14:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0n-0006Tq-4W; Fri, 30 Jun 2023 14:22:13 +0000 Received: by outflank-mailman (input) for mailman id 557507; Fri, 30 Jun 2023 14:22:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0m-0006Th-4Z for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0m-0008AY-3e for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF0m-0006dE-2e for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZKtBKqJRvLegpiVF5qIOmBPOrQ3kR13LaBy4JXd6bM8=; b=sZ7TVF1PkisF9xlN+QaUYfyk2x +gGB6zGC/IDya9+2ZTM67FKh/uZQCF+70fi2qUs8BEYhCjglVwOv5S8Axs2dzR0osXMWveEI6Oy4V n235JU2rZDA939rKmpcu20vhIBt4EsUZT3mTjhfhIIScsbQK8XpM3rugbJMz1N6nOLMY=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: change parameter name 'vcpu' in domain() function definition. Message-Id: Date: Fri, 30 Jun 2023 14:22:12 +0000 commit be17548c00a63264c0a0399624a73b611358f3ea Author: Federico Serafini AuthorDate: Mon Jun 26 11:52:14 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 28 15:54:09 2023 -0700 xen/arm: change parameter name 'vcpu' in domain() function definition. In the current version of domain() function, the declaration (correctly) uses the parameter name 'v' while the definition uses the parameter name 'vcpu'. Since it is common to use 'v' to denote a vCPU, change the parameter name 'vcpu' of function definition to 'v', thus fixing a violation of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Julien Grall --- xen/arch/arm/domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index add9929b79..8c18e92079 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -1155,15 +1155,15 @@ void vcpu_block_unless_event_pending(struct vcpu *v) vcpu_unblock(current); } -void vcpu_kick(struct vcpu *vcpu) +void vcpu_kick(struct vcpu *v) { - bool running = vcpu->is_running; + bool running = v->is_running; - vcpu_unblock(vcpu); - if ( running && vcpu != current ) + vcpu_unblock(v); + if ( running && v != current ) { perfc_incr(vcpu_kick); - smp_send_event_check_mask(cpumask_of(vcpu->processor)); + smp_send_event_check_mask(cpumask_of(v->processor)); } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:22:23 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:22:23 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557510.870904 (Exim 4.92) (envelope-from ) id 1qFF0x-0006pW-J4; Fri, 30 Jun 2023 14:22:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557510.870904; Fri, 30 Jun 2023 14:22:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0x-0006pP-GQ; Fri, 30 Jun 2023 14:22:23 +0000 Received: by outflank-mailman (input) for mailman id 557510; Fri, 30 Jun 2023 14:22:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0w-0006on-7g for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF0w-0008Aw-6u for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF0w-0006dd-5l for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Jvo1tcFluBnwrje5JjHr6E88Kukx/YfNdMRZtfX6ZpQ=; b=Pb+ntQekNLUwZjbYA9MWs7OX3e RvXy1sibkQXfDVmPLE0F6fo1iGBhg9BLoqNJT30CC9/axaRmkNS3mYceEY/MgPTD0BXV5ubbfKQZi K2JirlxMfRA1jqwN4gCzltQJjbZNDJ8EaCrFvxxUEJNqbU9FtTyS/HB6betTaIg+wB/M=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: change parameter name 'pa' in ioremap_addr() definition. Message-Id: Date: Fri, 30 Jun 2023 14:22:22 +0000 commit 31f54edf7e9df134760a0d6ca41e49a7905163d0 Author: Federico Serafini AuthorDate: Mon Jun 26 11:52:15 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 28 15:54:12 2023 -0700 xen/arm: change parameter name 'pa' in ioremap_addr() definition. In the current version of ioremap_addr() function, the declaration uses the parameter name 'start' (consistenly with the other ioremap_* function declarations), while the definition uses the parameter name 'pa'. Change the parameter name 'pa' of function definition to 'start', thus fixing a violation of MISRA C:2012 Rule 8.3 and keeping the consistency with other ioremap_* functions. Signed-off-by: Federico Serafini Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index e460249736..2e9860a754 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -736,10 +736,10 @@ void *__init arch_vmap_virt_end(void) * This function should only be used to remap device address ranges * TODO: add a check to verify this assumption */ -void *ioremap_attr(paddr_t pa, size_t len, unsigned int attributes) +void *ioremap_attr(paddr_t start, size_t len, unsigned int attributes) { - mfn_t mfn = _mfn(PFN_DOWN(pa)); - unsigned int offs = pa & (PAGE_SIZE - 1); + mfn_t mfn = _mfn(PFN_DOWN(start)); + unsigned int offs = start & (PAGE_SIZE - 1); unsigned int nr = PFN_UP(offs + len); void *ptr = __vmap(&mfn, nr, 1, 1, attributes, VMAP_DEFAULT); @@ -1579,7 +1579,7 @@ void put_page_type(struct page_info *page) return; } -int create_grant_host_mapping(unsigned long addr, mfn_t frame, +int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, unsigned int flags, unsigned int cache_flags) { int rc; @@ -1591,7 +1591,7 @@ int create_grant_host_mapping(unsigned long addr, mfn_t frame, if ( flags & GNTMAP_readonly ) t = p2m_grant_map_ro; - rc = guest_physmap_add_entry(current->domain, gaddr_to_gfn(addr), + rc = guest_physmap_add_entry(current->domain, gaddr_to_gfn(gpaddr), frame, 0, t); if ( rc ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:22:33 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:22:33 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557512.870908 (Exim 4.92) (envelope-from ) id 1qFF17-00070J-KZ; Fri, 30 Jun 2023 14:22:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557512.870908; Fri, 30 Jun 2023 14:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF17-00070B-Hv; Fri, 30 Jun 2023 14:22:33 +0000 Received: by outflank-mailman (input) for mailman id 557512; Fri, 30 Jun 2023 14:22:32 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF16-0006zb-B3 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF16-0008BC-AB for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF16-0006eF-93 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=tF9kwXBQn3WGpWBTkFDKAsQ/yUyw519zatsyEZRpmfo=; b=JCbkGmhxJ0pPmtZr6YMnBx1JF4 PqoCWbBqEku22e13tAIdwq2YbN2qpBu15wf5XkLGmIqDB30sd850CRFrtxCoVusMA20mhT5TB/mu6 BmKMzxYR2ZJ1pWqhROabIRi9TEbt4rFDjYiJevAb5HgGSf6RODUc7I15VJY0zpKTC8Jk=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: vgic: change parameter name in 'init' and 'free' functions. Message-Id: Date: Fri, 30 Jun 2023 14:22:32 +0000 commit 98ca99685d8e8dbc5e8ef2500ee1b8a87a0b26f5 Author: Federico Serafini AuthorDate: Mon Jun 26 11:52:16 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 28 15:54:16 2023 -0700 xen/arm: vgic: change parameter name in 'init' and 'free' functions. In the current versions of vcpu_vgic_init() and vcpu_vgic_free(), the declarations (correctly) use the parameter name 'v' while the corresponding definitions use the parameter name 'vcpu'. Since it is common to use 'v' to denote a vCPU, change the parameter name 'vcpu' of function definitions to 'v', thus fixing violations of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Julien Grall --- xen/arch/arm/vgic/vgic-init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/vgic/vgic-init.c b/xen/arch/arm/vgic/vgic-init.c index ea739d081e..76b85ea823 100644 --- a/xen/arch/arm/vgic/vgic-init.c +++ b/xen/arch/arm/vgic/vgic-init.c @@ -196,16 +196,16 @@ int domain_vgic_init(struct domain *d, unsigned int nr_spis) * vcpu_vgic_init() - Register VCPU-specific KVM iodevs * was: kvm_vgic_vcpu_init() * Xen: adding vgic_vx_enable() call - * @vcpu: pointer to the VCPU being created and initialized + * @v: pointer to the VCPU being created and initialized */ -int vcpu_vgic_init(struct vcpu *vcpu) +int vcpu_vgic_init(struct vcpu *v) { int ret = 0; - vgic_vcpu_early_init(vcpu); + vgic_vcpu_early_init(v); if ( gic_hw_version() == GIC_V2 ) - vgic_v2_enable(vcpu); + vgic_v2_enable(v); else ret = -ENXIO; @@ -239,9 +239,9 @@ void domain_vgic_free(struct domain *d) dist->nr_spis = 0; } -int vcpu_vgic_free(struct vcpu *vcpu) +int vcpu_vgic_free(struct vcpu *v) { - struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic; + struct vgic_cpu *vgic_cpu = &v->arch.vgic; INIT_LIST_HEAD(&vgic_cpu->ap_list_head); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:22:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:22:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557515.870911 (Exim 4.92) (envelope-from ) id 1qFF1H-000781-MI; Fri, 30 Jun 2023 14:22:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557515.870911; Fri, 30 Jun 2023 14:22:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1H-00077t-JQ; Fri, 30 Jun 2023 14:22:43 +0000 Received: by outflank-mailman (input) for mailman id 557515; Fri, 30 Jun 2023 14:22:42 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1G-00077f-Fj for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:42 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1G-0008BJ-Ex for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF1G-0006ey-CM for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=iAmGRJNDDHnxosxkaRmF2V1SZCRwI4niIf8ChFIoP3Y=; b=mq4pgFFspd/VakJ9pXsLMy93Oj 9wZ3IcGOIjXbgSLizVRs4VNDCGkPLqVOF/zqPBJRmJX4p4C8EpNz6EjauPTnc7WuoB2c+cikm8bZu BlHBfF5TEuxQguincsICDWe3ochBZFD3wMgDZocVJoVtcM+5QOCDw1p+V7iFoHaajTr4=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: make parameter names of function declarations consistent. Message-Id: Date: Fri, 30 Jun 2023 14:22:42 +0000 commit 06ed62d1f3485cd787da042c64d4507c4d0cb8f3 Author: Federico Serafini AuthorDate: Mon Jun 26 11:52:17 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 28 15:54:19 2023 -0700 xen/arm: make parameter names of function declarations consistent. Change the parameter names of function declarations to be consistent with the names used in the corresponding function definitions, thus fixing violations of MISRA C:2012 Rule 8.3. Signed-off-by: Federico Serafini Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/fixmap.h | 2 +- xen/arch/arm/include/asm/gic.h | 2 +- xen/arch/arm/include/asm/gic_v3_its.h | 5 +++-- xen/arch/arm/include/asm/grant_table.h | 2 +- xen/arch/arm/include/asm/guest_access.h | 2 +- xen/arch/arm/include/asm/irq.h | 2 +- xen/arch/arm/include/asm/regs.h | 2 +- xen/arch/arm/include/asm/vgic.h | 4 ++-- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/include/asm/fixmap.h b/xen/arch/arm/include/asm/fixmap.h index d0c9a52c8c..734eb9b1d4 100644 --- a/xen/arch/arm/include/asm/fixmap.h +++ b/xen/arch/arm/include/asm/fixmap.h @@ -30,7 +30,7 @@ extern lpae_t xen_fixmap[XEN_PT_LPAE_ENTRIES]; /* Map a page in a fixmap entry */ -extern void set_fixmap(unsigned int map, mfn_t mfn, unsigned int attributes); +extern void set_fixmap(unsigned int map, mfn_t mfn, unsigned int flags); /* Remove a mapping from a fixmap entry */ extern void clear_fixmap(unsigned int map); diff --git a/xen/arch/arm/include/asm/gic.h b/xen/arch/arm/include/asm/gic.h index 76e3fa5dc4..f1ef347edc 100644 --- a/xen/arch/arm/include/asm/gic.h +++ b/xen/arch/arm/include/asm/gic.h @@ -257,7 +257,7 @@ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, extern void gic_clear_pending_irqs(struct vcpu *v); extern void init_maintenance_interrupt(void); -extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, +extern void gic_raise_guest_irq(struct vcpu *v, unsigned int virtual_irq, unsigned int priority); extern void gic_raise_inflight_irq(struct vcpu *v, unsigned int virtual_irq); diff --git a/xen/arch/arm/include/asm/gic_v3_its.h b/xen/arch/arm/include/asm/gic_v3_its.h index fae3f6ecef..c24d4752d0 100644 --- a/xen/arch/arm/include/asm/gic_v3_its.h +++ b/xen/arch/arm/include/asm/gic_v3_its.h @@ -190,8 +190,9 @@ struct pending_irq *gicv3_its_get_event_pending_irq(struct domain *d, uint32_t eventid); int gicv3_remove_guest_event(struct domain *d, paddr_t vdoorbell_address, uint32_t vdevid, uint32_t eventid); -struct pending_irq *gicv3_assign_guest_event(struct domain *d, paddr_t doorbell, - uint32_t devid, uint32_t eventid, +struct pending_irq *gicv3_assign_guest_event(struct domain *d, + paddr_t vdoorbell_address, + uint32_t vdevid, uint32_t eventid, uint32_t virt_lpi); void gicv3_lpi_update_host_entry(uint32_t host_lpi, int domain_id, uint32_t virt_lpi); diff --git a/xen/arch/arm/include/asm/grant_table.h b/xen/arch/arm/include/asm/grant_table.h index e13dfeefa5..265e598e56 100644 --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -36,7 +36,7 @@ static inline bool gnttab_release_host_mappings(const struct domain *d) return true; } -int create_grant_host_mapping(unsigned long gpaddr, mfn_t mfn, +int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, unsigned int flags, unsigned int cache_flags); int replace_grant_host_mapping(unsigned long gpaddr, mfn_t mfn, unsigned long new_gpaddr, unsigned int flags); diff --git a/xen/arch/arm/include/asm/guest_access.h b/xen/arch/arm/include/asm/guest_access.h index 8278a45dbf..18c88b70d7 100644 --- a/xen/arch/arm/include/asm/guest_access.h +++ b/xen/arch/arm/include/asm/guest_access.h @@ -12,7 +12,7 @@ unsigned long raw_clear_guest(void *to, unsigned int len); /* Copy data to guest physical address, then clean the region. */ unsigned long copy_to_guest_phys_flush_dcache(struct domain *d, - paddr_t phys, + paddr_t gpa, void *buf, unsigned int len); diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index 11bc85d111..105b33b37d 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -76,7 +76,7 @@ void init_IRQ(void); int route_irq_to_guest(struct domain *d, unsigned int virq, unsigned int irq, const char *devname); -int release_guest_irq(struct domain *d, unsigned int irq); +int release_guest_irq(struct domain *d, unsigned int virq); void arch_move_irqs(struct vcpu *v); diff --git a/xen/arch/arm/include/asm/regs.h b/xen/arch/arm/include/asm/regs.h index 0693a68131..ef34b38aa1 100644 --- a/xen/arch/arm/include/asm/regs.h +++ b/xen/arch/arm/include/asm/regs.h @@ -58,7 +58,7 @@ static inline bool guest_mode(const struct cpu_user_regs *r) } register_t get_user_reg(struct cpu_user_regs *regs, int reg); -void set_user_reg(struct cpu_user_regs *regs, int reg, register_t val); +void set_user_reg(struct cpu_user_regs *regs, int reg, register_t value); #endif diff --git a/xen/arch/arm/include/asm/vgic.h b/xen/arch/arm/include/asm/vgic.h index 328fd46d1b..aa9f49409e 100644 --- a/xen/arch/arm/include/asm/vgic.h +++ b/xen/arch/arm/include/asm/vgic.h @@ -355,8 +355,8 @@ bool vgic_evtchn_irq_pending(struct vcpu *v); int domain_vgic_register(struct domain *d, int *mmio_count); int domain_vgic_init(struct domain *d, unsigned int nr_spis); void domain_vgic_free(struct domain *d); -int vcpu_vgic_init(struct vcpu *vcpu); -int vcpu_vgic_free(struct vcpu *vcpu); +int vcpu_vgic_init(struct vcpu *v); +int vcpu_vgic_free(struct vcpu *v); void vgic_inject_irq(struct domain *d, struct vcpu *v, unsigned int virq, bool level); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:22:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:22:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557517.870917 (Exim 4.92) (envelope-from ) id 1qFF1S-0007Ea-PK; Fri, 30 Jun 2023 14:22:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557517.870917; Fri, 30 Jun 2023 14:22:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1S-0007ES-MK; Fri, 30 Jun 2023 14:22:54 +0000 Received: by outflank-mailman (input) for mailman id 557517; Fri, 30 Jun 2023 14:22:52 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1Q-0007E9-Ki for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:52 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1Q-0008BW-Jr for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF1Q-0006fh-H7 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=WOpDH320RlTfYVhdHAJ6+RgYFkcXbqgtEronqRtDfmg=; b=xl3kT3PeqUF4PXp627/w2HOd4I r7dQRrI/byKFohMc8GuJnWLtk9+u7s4hHh2vT7y29NKqDA241LOANi48zgeMKC4V+Q1o3b69tVXtT v2Jqj0QT/oS8yVkh3sM726a9wbjlO/ET3ZVsvECaR68cGUhw4sIOLMIGBBwVTQ9vUZ2w=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: change parameter names in replace_grant_host_mapping(). Message-Id: Date: Fri, 30 Jun 2023 14:22:52 +0000 commit 5b9c96a808efdc004a876c03c2ea0bd0c5358812 Author: Federico Serafini AuthorDate: Mon Jun 26 11:52:18 2023 +0200 Commit: Stefano Stabellini CommitDate: Wed Jun 28 15:54:21 2023 -0700 xen/arm: change parameter names in replace_grant_host_mapping(). In the current version of replace_grant_host_mapping() function, the declaration (correctly) uses the parameter names 'gpaddr' and 'new_gpaddr', while the definition uses the parameter names 'addr' and 'new_addr'. Change the parameter names of the definition to 'gpaddr' and 'new_gpaddr' so that it is clear what type of address is expected and violations of MISRA C:2012 Rule 8.3 are fixed. In both declaration and definition of function replace_grant_host_mapping() change the parameter name 'mfn' to 'frame', thus improving readability and keeping consistency with name used in create_grant_host_mapping(). Signed-off-by: Federico Serafini Reviewed-by: Julien Grall --- xen/arch/arm/include/asm/grant_table.h | 2 +- xen/arch/arm/mm.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/grant_table.h b/xen/arch/arm/include/asm/grant_table.h index 265e598e56..f2d115b97d 100644 --- a/xen/arch/arm/include/asm/grant_table.h +++ b/xen/arch/arm/include/asm/grant_table.h @@ -38,7 +38,7 @@ static inline bool gnttab_release_host_mappings(const struct domain *d) int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, unsigned int flags, unsigned int cache_flags); -int replace_grant_host_mapping(unsigned long gpaddr, mfn_t mfn, +int replace_grant_host_mapping(unsigned long gpaddr, mfn_t frame, unsigned long new_gpaddr, unsigned int flags); /* diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 2e9860a754..0a3e1f3b64 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1600,17 +1600,17 @@ int create_grant_host_mapping(unsigned long gpaddr, mfn_t frame, return GNTST_okay; } -int replace_grant_host_mapping(unsigned long addr, mfn_t mfn, - unsigned long new_addr, unsigned int flags) +int replace_grant_host_mapping(unsigned long gpaddr, mfn_t frame, + unsigned long new_gpaddr, unsigned int flags) { - gfn_t gfn = gaddr_to_gfn(addr); + gfn_t gfn = gaddr_to_gfn(gpaddr); struct domain *d = current->domain; int rc; - if ( new_addr != 0 || (flags & GNTMAP_contains_pte) ) + if ( new_gpaddr != 0 || (flags & GNTMAP_contains_pte) ) return GNTST_general_error; - rc = guest_physmap_remove_page(d, gfn, mfn, 0); + rc = guest_physmap_remove_page(d, gfn, frame, 0); return rc ? GNTST_general_error : GNTST_okay; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:23:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:23:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557518.870920 (Exim 4.92) (envelope-from ) id 1qFF1c-0007HX-QU; Fri, 30 Jun 2023 14:23:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557518.870920; Fri, 30 Jun 2023 14:23:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1c-0007HQ-Nm; Fri, 30 Jun 2023 14:23:04 +0000 Received: by outflank-mailman (input) for mailman id 557518; Fri, 30 Jun 2023 14:23:02 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1a-0007HC-Nl for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:02 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1a-0008Bw-N1 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF1a-0006gH-Ly for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=TiAqghX2Zil726zbHYL5yKHjlTrupwRgSnfkEMBm+i8=; b=QMVwjx+RBwb+d4oplgx8pvQNQe HwNgddjbR3RCPV1D9Xhk/cKhPzl+vdfh3G9DGpTzvZYr/E60sPBxk9jzauPY6fG/kSq73toOtn2oZ 3GvV8CpLwI4QiuL+kXFt9metwgjN19QcPd4CqpHHdlvIcrKsh+LK1+ArmKdnZ9bqlFWc=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: add Rules 8.2, 8.3, 8.14 Message-Id: Date: Fri, 30 Jun 2023 14:23:02 +0000 commit 49ecef9fb4b635523c10b51fac4ae93d563a58a6 Author: Stefano Stabellini AuthorDate: Tue Jun 20 18:26:18 2023 -0700 Commit: Stefano Stabellini CommitDate: Thu Jun 29 12:06:35 2023 -0700 docs/misra: add Rules 8.2, 8.3, 8.14 Signed-off-by: Stefano Stabellini Reviewed-by: Bertrand Marquis --- docs/misra/rules.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 11b9c42b70..9caf43968c 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -213,6 +213,17 @@ maintainers if you want to suggest a change. - Types shall be explicitly specified - + * - `Rule 8.2 `_ + - Required + - Function types shall be in prototype form with named parameters + - + + * - `Rule 8.3 `_ + - Required + - All declarations of an object or function shall use the same + names and type qualifiers + - + * - `Rule 8.4 `_ - Required - A compatible declaration shall be visible when an object or @@ -248,6 +259,11 @@ maintainers if you want to suggest a change. enumeration constant shall be unique - + * - `Rule 8.14 `_ + - Required + - The restrict type qualifier shall not be used + - + * - `Rule 9.1 `_ - Mandatory - The value of an object with automatic storage duration shall not -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:23:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:23:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557519.870923 (Exim 4.92) (envelope-from ) id 1qFF1m-0007KP-Rt; Fri, 30 Jun 2023 14:23:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557519.870923; Fri, 30 Jun 2023 14:23:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1m-0007KI-PK; Fri, 30 Jun 2023 14:23:14 +0000 Received: by outflank-mailman (input) for mailman id 557519; Fri, 30 Jun 2023 14:23:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1k-0007K4-QW for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1k-0008CM-Ph for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF1k-0006gv-P7 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ltkrwmQMF7ebxKwUHrsQ6PGdJuOhvl2bRQorTatZb3A=; b=KY9rb2p9F1uPlqbKmk1C2I8mrC E5t2PSs0gwJ3O8Sxc/T4klHYcpYgNSq047GT6g25blmY5yUug60ext17yyuKqdAMhNtMVAyF6Nfie R62Cal4GV+1KVQeeogtrqAFE9qLq/5mZxBysFKnBu/QmjATXFmH5PLkNUmRDHMSTw04Y=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] docs/misra: rules: Remove incorrect deviation guidance Message-Id: Date: Fri, 30 Jun 2023 14:23:12 +0000 commit 160975b89866d42912c2a83141c7fa0f6bf8d8ba Author: Michal Orzel AuthorDate: Wed Jun 28 10:37:01 2023 +0200 Commit: Stefano Stabellini CommitDate: Thu Jun 29 12:07:30 2023 -0700 docs/misra: rules: Remove incorrect deviation guidance It creates confusion since the new format of documenting violations can be found in: docs/misra/documenting-violations.rst. Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Reviewed-by: Stefano Stabellini --- docs/misra/rules.rst | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/misra/rules.rst b/docs/misra/rules.rst index 9caf43968c..622f35410c 100644 --- a/docs/misra/rules.rst +++ b/docs/misra/rules.rst @@ -17,13 +17,8 @@ hypervisor. It is possible that in specific circumstances it is best not to follow a rule because it is not possible or because the alternative leads to better code quality. Those cases are called "deviations". They are -permissible as long as they are documented as an in-code comment using -the following format:: - - /* - * MISRA_DEV: Rule ID - * Justification text. - */ +permissible as long as they are documented. For details, please refer to +docs/misra/documenting-violations.rst Other documentation mechanisms are work-in-progress. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:23:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:23:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557523.870937 (Exim 4.92) (envelope-from ) id 1qFF1w-0007eB-62; Fri, 30 Jun 2023 14:23:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557523.870937; Fri, 30 Jun 2023 14:23:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1w-0007e3-3G; Fri, 30 Jun 2023 14:23:24 +0000 Received: by outflank-mailman (input) for mailman id 557523; Fri, 30 Jun 2023 14:23:22 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1u-0007dD-TR for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:22 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF1u-0008Ch-Sf for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF1u-0006hK-Rm for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=3Ah6QU9X8cv4elbOFYQC3iVHxW2zdx1lBe3fY+2W0W0=; b=VrLJANjJLpJDGq9QA8FCZyASK7 Od64gCVUBoS42nHtWt8rL6fs2EO4507g2djbvMYYd9fpnXoL97q0nBGxEkqzCegecqwzR3UiV4lww ecnpldSZWdZ8RBoJxnl2OR4/4bASYMbtL0SL9UZHLtiOz0eHZ9k22wqM76nfiBaip2Gg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: tlbflush: fix violations of MISRA C:2012 Rule 3.1 Message-Id: Date: Fri, 30 Jun 2023 14:23:22 +0000 commit 0adb4147fdcde50856c02203a1721c5541ef1a32 Author: Nicola Vetrini AuthorDate: Thu Jun 29 12:06:15 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 29 20:36:14 2023 +0100 xen/arm: tlbflush: fix violations of MISRA C:2012 Rule 3.1 In the files `xen/arch/arm/include/asm/arm(32|64)/flushtlb.h' there are a few occurrences of nested '//' character sequences inside C-style comment blocks, which violate Rule 3.1. The patch aims to resolve those by changing the inner comments to arm asm comments, delimited by ';' instead. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini Reviewed-by: Luca Fancellu --- xen/arch/arm/include/asm/arm32/flushtlb.h | 8 ++++---- xen/arch/arm/include/asm/arm64/flushtlb.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/flushtlb.h b/xen/arch/arm/include/asm/arm32/flushtlb.h index 22ee3b317b..61c25a3189 100644 --- a/xen/arch/arm/include/asm/arm32/flushtlb.h +++ b/xen/arch/arm/include/asm/arm32/flushtlb.h @@ -4,10 +4,10 @@ /* * Every invalidation operation use the following patterns: * - * DSB ISHST // Ensure prior page-tables updates have completed - * TLBI... // Invalidate the TLB - * DSB ISH // Ensure the TLB invalidation has completed - * ISB // See explanation below + * DSB ISHST ; Ensure prior page-tables updates have completed + * TLBI... ; Invalidate the TLB + * DSB ISH ; Ensure the TLB invalidation has completed + * ISB ; See explanation below * * For Xen page-tables the ISB will discard any instructions fetched * from the old mappings. diff --git a/xen/arch/arm/include/asm/arm64/flushtlb.h b/xen/arch/arm/include/asm/arm64/flushtlb.h index 56c6fc763b..45642201d1 100644 --- a/xen/arch/arm/include/asm/arm64/flushtlb.h +++ b/xen/arch/arm/include/asm/arm64/flushtlb.h @@ -4,10 +4,10 @@ /* * Every invalidation operation use the following patterns: * - * DSB ISHST // Ensure prior page-tables updates have completed - * TLBI... // Invalidate the TLB - * DSB ISH // Ensure the TLB invalidation has completed - * ISB // See explanation below + * DSB ISHST ; Ensure prior page-tables updates have completed + * TLBI... ; Invalidate the TLB + * DSB ISH ; Ensure the TLB invalidation has completed + * ISB ; See explanation below * * ARM64_WORKAROUND_REPEAT_TLBI: * Modification of the translation table for a virtual address might lead to -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:23:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:23:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557524.870941 (Exim 4.92) (envelope-from ) id 1qFF26-0007km-7U; Fri, 30 Jun 2023 14:23:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557524.870941; Fri, 30 Jun 2023 14:23:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF26-0007kc-4d; Fri, 30 Jun 2023 14:23:34 +0000 Received: by outflank-mailman (input) for mailman id 557524; Fri, 30 Jun 2023 14:23:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF24-0007kB-W7 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:32 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF24-0008D2-VU for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF24-0006i6-Uk for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=5NF80yZxLUCfyZEBYbG99YG7jxh5/fgV5vizLgR5Qa8=; b=k5TVS+g+YnQoUrECsvAQuzBcdr ETw6MbHN/+BYTTDaCyJvWOoxjn3J88fDBXSZX6/5R82OchQ3eRwGXh2BIqzqp34oBvKTX4lxzId6P oGmy07e55W2LnGBX+RZ5Tocn+vCy8uboxGZ1BNL2eJLfoEZ+mvcJoRuO2RfYPSGCR6wA=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: Check Xen size when linking Message-Id: Date: Fri, 30 Jun 2023 14:23:32 +0000 commit 02a11313cdc60d266d8613899fcc9d3870ef5164 Author: Julien Grall AuthorDate: Thu Jun 29 20:44:17 2023 +0100 Commit: Julien Grall CommitDate: Thu Jun 29 20:58:09 2023 +0100 xen/arm: Check Xen size when linking The linker will happily link Xen if it is bigger than what we can handle (e.g 2MB). This will result to unexpected failure after boot. This unexpected failure can be prevented by forbidding linking if Xen is bigger than the area we reserved. Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Michal Orzel Tested-by: Henry Wang --- xen/arch/arm/xen.lds.S | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index be58c2c395..d36b67708a 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -241,3 +241,4 @@ ASSERT(IS_ALIGNED(__init_begin, 4), "__init_begin is misaligned") ASSERT(IS_ALIGNED(__init_end, 4), "__init_end is misaligned") ASSERT(IS_ALIGNED(__bss_start, POINTER_ALIGN), "__bss_start is misaligned") ASSERT(IS_ALIGNED(__bss_end, POINTER_ALIGN), "__bss_end is misaligned") +ASSERT((_end - _start) <= XEN_VIRT_SIZE, "Xen is too big") -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:23:45 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:23:45 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557525.870946 (Exim 4.92) (envelope-from ) id 1qFF2H-0007vl-8t; Fri, 30 Jun 2023 14:23:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557525.870946; Fri, 30 Jun 2023 14:23:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2H-0007vd-6D; Fri, 30 Jun 2023 14:23:45 +0000 Received: by outflank-mailman (input) for mailman id 557525; Fri, 30 Jun 2023 14:23:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2F-0007v2-30 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2F-0008DB-2D for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF2F-0006iW-1I for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=I3S7fkb4tubOffhggyqjNnzgLRE4Gyooeto3gtwrjAs=; b=Wp2aK6QaDIhmdROTF3/YCRbErp qDjdkw3T0qFpHnWRxQ3x5oNz6JuGe8PLdWTTlfhj25Q2zcjU6im6gapuPUz5yLGKysZnHaDWDd9J0 QCxjtxfkg3zItXSt/Wp6TXXicRwUY90CcIvjiw2kYlLPEsykGUlExoYEcZLqOpANLFoU=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: head: Remove 'r6' from the clobber list of create_page_tables() Message-Id: Date: Fri, 30 Jun 2023 14:23:43 +0000 commit 2b0af6e398d945bbe8d35f7a4495c821a0e0e912 Author: Julien Grall AuthorDate: Thu Jun 29 20:47:12 2023 +0100 Commit: Julien Grall CommitDate: Thu Jun 29 20:58:09 2023 +0100 xen/arm32: head: Remove 'r6' from the clobber list of create_page_tables() Since commit 62529f16c8a2 ("xen/arm32: head: Use a page mapping for the 1:1 mapping in create_page_tables()"), the register 'r6' is not used anymore within create_page_tables(). So remove it from the documentation. Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Michal Orzel Reviewed-by: Bertrand Marquis --- xen/arch/arm/arm32/head.S | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index f9f7be9588..1ad981b674 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -451,10 +451,7 @@ ENDPROC(cpu_init) * Output: * r12: Was a temporary mapping created? * - * Clobbers r0 - r4, r6 - * - * Register usage within this function: - * r6 : Identity map in place + * Clobbers r0 - r4 */ create_page_tables: /* Prepare the page-tables for mapping Xen */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:23:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:23:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557528.870951 (Exim 4.92) (envelope-from ) id 1qFF2Q-00080w-BL; Fri, 30 Jun 2023 14:23:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557528.870951; Fri, 30 Jun 2023 14:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2Q-00080D-7l; Fri, 30 Jun 2023 14:23:54 +0000 Received: by outflank-mailman (input) for mailman id 557528; Fri, 30 Jun 2023 14:23:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2P-0007zr-5j for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2P-0008DI-50 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF2P-0006iz-4G for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:23:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=f3brK3xq71SOGqgnG6EwLXZX0Z7bSNVuxJ1h3bus+m8=; b=gS/BwdeW/ukqamkB9rYc0vPy+K ZntV51kX9t2jy/IYvkfxwomi67gVxaD6/U+5AD1wxOL+orm/nW/ZPTrku3Pnt6D9qiaeMaRXRZX9+ gg3Wg8AOE+WNnhoc2/YyOvw9/teGkrUJsdo8TFw375UF2FAMp+YEdfwK3T5QWQyfz1II=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: entry: Don't jump outside of an alternative Message-Id: Date: Fri, 30 Jun 2023 14:23:53 +0000 commit ef62b34aeb6ad152d9f5a94592814ca23b2dfab0 Author: Julien Grall AuthorDate: Thu Jun 29 20:55:18 2023 +0100 Commit: Julien Grall CommitDate: Thu Jun 29 20:58:09 2023 +0100 xen/arm64: entry: Don't jump outside of an alternative The instruction CBNZ can only jump to a pc-relative that is in the range +/- 1MB. Alternative instructions replacement are living in a separate subsection of the init section. This is usually placed towards the end of the linker. Whereas text is towards the beginning. While today Xen is quite small (~1MB), it could grow up to 2MB in the current setup. So there is no guarantee that the target address in the text section will be within the range +/- 1MB of the CBNZ in alternative section. The easiest solution is to have the target address within the same section of the alternative. This means that we need to duplicate a couple of instructions. Signed-off-by: Julien Grall Reviewed-by: Michal Orzel ---- I couldn't come up with a solution that would not change the number of instructions executed in the entry path. --- xen/arch/arm/arm64/entry.S | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 95f1a92684..523c6d23d9 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -242,13 +242,24 @@ msr daifclr, \iflags bl enter_hypervisor_from_guest + /* + * CBNZ can only address an offset of +/- 1MB. This means, it is + * not possible to jump outside of an alternative because + * the .text section and .altinstr_replacement may be further + * apart. The easiest way is to duplicate the few instructions + * that need to be skipped. + */ alternative_if SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT - cbnz x19, 1f - alternative_else_nop_endif - - mov x0, sp - bl do_trap_\trap + cbnz x19, 1f + mov x0, sp + bl do_trap_\trap 1: + alternative_else + nop + mov x0, sp + bl do_trap_\trap + alternative_endif + exit hyp=0, compat=\compat .endm -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:24:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:24:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557530.870954 (Exim 4.92) (envelope-from ) id 1qFF2a-00085E-By; Fri, 30 Jun 2023 14:24:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557530.870954; Fri, 30 Jun 2023 14:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2a-000856-9L; Fri, 30 Jun 2023 14:24:04 +0000 Received: by outflank-mailman (input) for mailman id 557530; Fri, 30 Jun 2023 14:24:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2Z-00084s-8k for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2Z-0008Di-7p for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF2Z-0006jb-76 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=e/PuG0Qs6VKyEtOYBTT0luki0CQlmdYqvL5FCXxG9Gg=; b=x5L0krPaJMt/ES6CG/1yewXPe4 B4CKH90OSSRl0OQyPMn8SSUk21X559HKHKmVLKsCCFfmmpLN9/4g3iY5DS8ZFSOKZxxZWOVu5eCgl /sVwbQ+w0SPZ0WewKbPQZsIy52/4EYgjpIwjp5AQoR3h0JTWA6HEJIM4Rs8k6+JPTQ6c=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm64: head: Rework PRINT() to work when the string is not withing +/- 1MB Message-Id: Date: Fri, 30 Jun 2023 14:24:03 +0000 commit 3460987c77b9b7efab07e1c538108d067590007e Author: Julien Grall AuthorDate: Thu Jun 29 20:56:18 2023 +0100 Commit: Julien Grall CommitDate: Thu Jun 29 20:58:09 2023 +0100 xen/arm64: head: Rework PRINT() to work when the string is not withing +/- 1MB The instruction ADR is able to load an address of a symbol that is within the range +/- 1 MB of the instruction. While today Xen is quite small (~1MB), it could grow up to 2MB in the current setup. So there is no guarantee that the instruction can load the string address (stored in rodata). So replace the instruction ADR with the pseudo-instruction ADR_L which is able to handle symbol within the range +/- 4GB. Signed-off-by: Julien Grall Reviewed-by: Michal Orzel Reviewed-by: Henry Wang --- xen/arch/arm/arm64/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index f37133cf7c..c0e03755bb 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -90,7 +90,7 @@ */ #define PRINT(_s) \ mov x3, lr ; \ - adr x0, 98f ; \ + adr_l x0, 98f ; \ bl puts ; \ mov lr, x3 ; \ RODATA_STR(98, _s) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:24:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:24:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557531.870958 (Exim 4.92) (envelope-from ) id 1qFF2k-00088v-FD; Fri, 30 Jun 2023 14:24:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557531.870958; Fri, 30 Jun 2023 14:24:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2k-00088o-CS; Fri, 30 Jun 2023 14:24:14 +0000 Received: by outflank-mailman (input) for mailman id 557531; Fri, 30 Jun 2023 14:24:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2j-00088a-Ba for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2j-0008E9-Ak for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF2j-0006kD-9y for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=71IAkY8ko0SLWbuQvzLRbMlOn6DOERkCNgS2muBCBlQ=; b=HWoNLLiAU2yqZ8QruhOgqfTvxP ISoMaBYxeEuW66hY9maVxSsLIl4i3K0EfqH6TLnrurzEwOEKbuFH4UAmTe1G1sxbY6do11CB9ysBS MC83KCexh/pyaF9RFSkGgyTeIq1szSztKzXCxxF8Nly1vNFxgNo18ZTxAWOSxl/TEUUI=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm32: vfp: Add missing U for shifted constant Message-Id: Date: Fri, 30 Jun 2023 14:24:13 +0000 commit 2a6da58442ded2b6199f0ff15f5d8a85ab923d85 Author: Julien Grall AuthorDate: Thu Jun 29 20:57:10 2023 +0100 Commit: Julien Grall CommitDate: Thu Jun 29 20:58:09 2023 +0100 xen/arm32: vfp: Add missing U for shifted constant When enabling UBSAN on arm32, the following splat will be printed: (XEN) ================================================================================ (XEN) UBSAN: Undefined behaviour in arch/arm/arm32/vfp.c:75:22 (XEN) left shift of 255 by 24 places cannot be represented in type 'int' This is referring to the shift in FPSID_IMPLEMENTER_MASK. While we could only add the U to the value shift there, it would be better to be consistent and also add it for every value shifted. This should also addressing MISRA Rule 7.2: A "u" or "U" suffix shall be applied to all integer constants that are represented in an unsigned type Signed-off-by: Julien Grall Reviewed-by: Henry Wang Reviewed-by: Bertrand Marquis --- xen/arch/arm/include/asm/arm32/vfp.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/arm32/vfp.h b/xen/arch/arm/include/asm/arm32/vfp.h index bade3bc66e..2f2e4b24bb 100644 --- a/xen/arch/arm/include/asm/arm32/vfp.h +++ b/xen/arch/arm/include/asm/arm32/vfp.h @@ -1,23 +1,23 @@ #ifndef _ARM_ARM32_VFP_H #define _ARM_ARM32_VFP_H -#define FPEXC_EX (1u << 31) -#define FPEXC_EN (1u << 30) -#define FPEXC_FP2V (1u << 28) +#define FPEXC_EX (1U << 31) +#define FPEXC_EN (1U << 30) +#define FPEXC_FP2V (1U << 28) -#define MVFR0_A_SIMD_MASK (0xf << 0) +#define MVFR0_A_SIMD_MASK (0xfU << 0) #define FPSID_IMPLEMENTER_BIT (24) -#define FPSID_IMPLEMENTER_MASK (0xff << FPSID_IMPLEMENTER_BIT) +#define FPSID_IMPLEMENTER_MASK (0xffU << FPSID_IMPLEMENTER_BIT) #define FPSID_ARCH_BIT (16) -#define FPSID_ARCH_MASK (0xf << FPSID_ARCH_BIT) +#define FPSID_ARCH_MASK (0xfU << FPSID_ARCH_BIT) #define FPSID_PART_BIT (8) -#define FPSID_PART_MASK (0xff << FPSID_PART_BIT) +#define FPSID_PART_MASK (0xffU << FPSID_PART_BIT) #define FPSID_VARIANT_BIT (4) -#define FPSID_VARIANT_MASK (0xf << FPSID_VARIANT_BIT) +#define FPSID_VARIANT_MASK (0xfU << FPSID_VARIANT_BIT) #define FPSID_REV_BIT (0) -#define FPSID_REV_MASK (0xf << FPSID_REV_BIT) +#define FPSID_REV_MASK (0xfU << FPSID_REV_BIT) struct vfp_state { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:24:24 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:24:24 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557532.870962 (Exim 4.92) (envelope-from ) id 1qFF2u-0008Cr-Gp; Fri, 30 Jun 2023 14:24:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557532.870962; Fri, 30 Jun 2023 14:24:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2u-0008Cj-EA; Fri, 30 Jun 2023 14:24:24 +0000 Received: by outflank-mailman (input) for mailman id 557532; Fri, 30 Jun 2023 14:24:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2t-0008CJ-EP for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF2t-0008EI-DZ for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF2t-0006lC-Cn for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Dcd736swk1OfYhrx8Lc7RNQ6qufY20nF+jJfFcq3wWM=; b=B+4t5fPKz7Fv/utcxAw+5jSeJs hOp5TP9yx45/NGm2FbNuTKThC0WYZ9l4ob3N/MeBAO4+mrTvEhP38Gck25ItZOtDDewoBsQGDZhN0 3lBt/wm+LFvoy/RGXIQeeJpmPD8/iBKZMKl0SKtlUsfcGhOnk7eH8r/QFBPDw/Kw2ZP0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] xen/arm: arm32: Allow Xen to boot on unidentified CPUs Message-Id: Date: Fri, 30 Jun 2023 14:24:23 +0000 commit bd1001db0af1e1cec97325cac9da5ed10785bca5 Author: Ayan Kumar Halder AuthorDate: Mon Jun 26 19:14:44 2023 +0100 Commit: Julien Grall CommitDate: Thu Jun 29 22:07:27 2023 +0100 xen/arm: arm32: Allow Xen to boot on unidentified CPUs Currently if the processor id is not identified (ie it is missing in proc-v7.S) , then Xen boot fails quite early. We have removed this restriction as for some CPUs (eg Cortex-R52), there isn't any special initialization required. Signed-off-by: Ayan Kumar Halder Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm32/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 1ad981b674..72f667b856 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -324,7 +324,7 @@ cpu_init: PRINT("- Missing processor info: ") print_reg r4 PRINT(" -\r\n") - b fail + b cpu_init_done 1: /* Jump to cpu_init */ ldr r1, [r1, #PROCINFO_cpu_init] /* r1 := vaddr(init func) */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:24:34 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:24:34 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557534.870966 (Exim 4.92) (envelope-from ) id 1qFF34-0008G4-IP; Fri, 30 Jun 2023 14:24:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557534.870966; Fri, 30 Jun 2023 14:24:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF34-0008Fx-Fo; Fri, 30 Jun 2023 14:24:34 +0000 Received: by outflank-mailman (input) for mailman id 557534; Fri, 30 Jun 2023 14:24:33 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF33-0008Fj-HN for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:33 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF33-0008EZ-Gc for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF33-0006lo-Fw for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=shI4ZaZQz2BMD7gVSg+8ATIfZUD8I7ClEbT+HUIdFFg=; b=QH4/gFaOl3Pqgo4fsjx4KMsgK7 HB1TejmpsMZc3vEap4uT4Wn7hMZu9QtuiyHZmihyXzAqzqNI6QQHkuR6bUFGhIzG2gFRBkrFp+P9G 4LF+Yu0S2QnbiBbbyQ5oG+gDWK0g1ETByl4KrsxVdGivkC+m14bebmy/e95//TYtKST0=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remove no longer needed functions from xs_lib.c Message-Id: Date: Fri, 30 Jun 2023 14:24:33 +0000 commit 9859a80380b06bf72dbfd19e4010f69ec44b3cc3 Author: Juergen Gross AuthorDate: Tue Jun 27 14:27:46 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 29 22:38:22 2023 +0100 tools/xenstore: remove no longer needed functions from xs_lib.c xs_daemon_tdb() in xs_lib.c is no longer used at all, so it can be removed. xs_domain_dev() and xs_write_all() are not used by xenstored, so they can be moved to tools/libs/store/xs.c. xs_daemon_rootdir() is used by xenstored only and it only calls xs_daemon_rundir(), so replace its use cases with xs_daemon_rundir() and remove it from xs_lib.c. xs_daemon_socket_ro() is needed in libxenstore only, so move it to tools/libs/store/xs.c. Move functions used by xenstore-client only to xenstore_client.c. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/include/xenstore.h | 3 + tools/include/xenstore_lib.h | 3 - tools/libs/store/xs.c | 43 ++++++++++ tools/xenstore/xenstore_client.c | 129 ++++++++++++++++++++++++++++ tools/xenstore/xenstored_control.c | 4 +- tools/xenstore/xenstored_core.c | 3 +- tools/xenstore/xs_lib.c | 166 ------------------------------------- tools/xenstore/xs_lib.h | 19 ----- 8 files changed, 178 insertions(+), 192 deletions(-) diff --git a/tools/include/xenstore.h b/tools/include/xenstore.h index 2b3f69fb61..a442252849 100644 --- a/tools/include/xenstore.h +++ b/tools/include/xenstore.h @@ -113,6 +113,9 @@ void *xs_read(struct xs_handle *h, xs_transaction_t t, bool xs_write(struct xs_handle *h, xs_transaction_t t, const char *path, const void *data, unsigned int len); +/* Simple write function: loops for you. */ +bool xs_write_all(int fd, const void *data, unsigned int len); + /* Create a new directory. * Returns false on failure, or success if it already exists. */ diff --git a/tools/include/xenstore_lib.h b/tools/include/xenstore_lib.h index 2266009ec1..43eec87379 100644 --- a/tools/include/xenstore_lib.h +++ b/tools/include/xenstore_lib.h @@ -47,9 +47,6 @@ const char *xs_daemon_rundir(void); const char *xs_daemon_socket(void); const char *xs_daemon_socket_ro(void); -/* Simple write function: loops for you. */ -bool xs_write_all(int fd, const void *data, unsigned int len); - /* Convert strings to permissions. False if a problem. */ bool xs_strings_to_perms(struct xs_permissions *perms, unsigned int num, const char *strings); diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 76ffb1be45..bb93246bfb 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -311,6 +311,26 @@ struct xs_handle *xs_domain_open(void) return xs_open(0); } +static const char *xs_domain_dev(void) +{ + char *s = getenv("XENSTORED_PATH"); + if (s) + return s; +#if defined(__RUMPUSER_XEN__) || defined(__RUMPRUN__) + return "/dev/xen/xenbus"; +#elif defined(__linux__) + if (access("/dev/xen/xenbus", F_OK) == 0) + return "/dev/xen/xenbus"; + return "/proc/xen/xenbus"; +#elif defined(__NetBSD__) + return "/kern/xen/xenbus"; +#elif defined(__FreeBSD__) + return "/dev/xen/xenstore"; +#else + return "/dev/xen/xenbus"; +#endif +} + struct xs_handle *xs_open(unsigned long flags) { struct xs_handle *xsh = NULL; @@ -431,6 +451,24 @@ out_false: #ifdef XSTEST #define read_all read_all_choice #define xs_write_all write_all_choice +#else +/* Simple routine for writing to sockets, etc. */ +bool xs_write_all(int fd, const void *data, unsigned int len) +{ + while (len) { + int done; + + done = write(fd, data, len); + if (done < 0 && errno == EINTR) + continue; + if (done <= 0) + return false; + data += done; + len -= done; + } + + return true; +} #endif static int get_error(const char *errorstring) @@ -1328,6 +1366,11 @@ error: return ret; } +const char *xs_daemon_socket_ro(void) +{ + return xs_daemon_socket(); +} + #ifdef USE_PTHREAD static void *read_thread(void *arg) { diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index de788b3e0a..27fda81401 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -8,6 +8,7 @@ * */ +#include #include #include #include @@ -40,12 +41,140 @@ enum mode { MODE_watch, }; +/* Sanitising (quoting) possibly-binary strings. */ +struct expanding_buffer { + char *buf; + int avail; +}; + static char *output_buf = NULL; static int output_pos = 0; static struct expanding_buffer ebuf; static int output_size = 0; +/* Ensure that given expanding buffer has at least min_avail characters. */ +static char *expanding_buffer_ensure(struct expanding_buffer *ebuf, + int min_avail) +{ + int want; + char *got; + + if ( ebuf->avail >= min_avail ) + return ebuf->buf; + + if ( min_avail >= INT_MAX/3 ) + return 0; + + want = ebuf->avail + min_avail + 10; + got = realloc(ebuf->buf, want); + if ( !got ) + return 0; + + ebuf->buf = got; + ebuf->avail = want; + return ebuf->buf; +} + +/* sanitise_value() may return NULL if malloc fails. */ +static char *sanitise_value(struct expanding_buffer *ebuf, + const char *val, unsigned len) +{ + int used, remain, c; + unsigned char *ip; + +#define ADD(c) (ebuf->buf[used++] = (c)) +#define ADDF(f,c) (used += sprintf(ebuf->buf+used, (f), (c))) + + assert(len < INT_MAX/5); + + ip = (unsigned char *)val; + used = 0; + remain = len; + + if ( !expanding_buffer_ensure(ebuf, remain + 1) ) + return NULL; + + while ( remain-- > 0 ) + { + c= *ip++; + + if ( c >= ' ' && c <= '~' && c != '\\' ) + { + ADD(c); + continue; + } + + if ( !expanding_buffer_ensure(ebuf, used + remain + 5) ) + /* for "\\nnn\0" */ + return 0; + + ADD('\\'); + switch (c) + { + case '\t': ADD('t'); break; + case '\n': ADD('n'); break; + case '\r': ADD('r'); break; + case '\\': ADD('\\'); break; + default: + if ( c < 010 ) ADDF("%03o", c); + else ADDF("x%02x", c); + } + } + + ADD(0); + assert(used <= ebuf->avail); + return ebuf->buf; + +#undef ADD +#undef ADDF +} + +/* *out_len_r on entry is ignored; out must be at least strlen(in)+1 bytes. */ +static void unsanitise_value(char *out, unsigned *out_len_r, const char *in) +{ + const char *ip; + char *op; + unsigned c; + int n; + + for ( ip = in, op = out; (c = *ip++); *op++ = c ) + { + if ( c == '\\' ) + { + c = *ip++; + +#define GETF(f) do \ +{ \ + n = 0; \ + sscanf(ip, f "%n", &c, &n); \ + ip += n; \ +} while ( 0 ) + + switch ( c ) + { + case 't': c= '\t'; break; + case 'n': c= '\n'; break; + case 'r': c= '\r'; break; + case '\\': c= '\\'; break; + case 'x': GETF("%2x"); break; + case '0': case '4': + case '1': case '5': + case '2': case '6': + case '3': case '7': --ip; GETF("%3o"); break; + case 0: --ip; break; + default:; + } +#undef GETF + } + } + + *op = 0; + + if ( out_len_r ) + *out_len_r = op - out; +} + /* make sure there is at least 'len' more space in output_buf */ static void expand_buffer(size_t len) { diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index ed80924ee4..6ef800ff64 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -560,7 +560,7 @@ static FILE *lu_dump_open(const void *ctx) char *filename; int fd; - filename = talloc_asprintf(ctx, "%s/state_dump", xs_daemon_rootdir()); + filename = talloc_asprintf(ctx, "%s/state_dump", xs_daemon_rundir()); if (!filename) return NULL; @@ -583,7 +583,7 @@ static void lu_get_dump_state(struct lu_dump_state *state) state->size = 0; state->filename = talloc_asprintf(NULL, "%s/state_dump", - xs_daemon_rootdir()); + xs_daemon_rundir()); if (!state->filename) barf("Allocation failure"); diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 07fbac55ac..a78cbf1116 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2888,10 +2888,9 @@ int main(int argc, char *argv[]) reopen_log(); - /* make sure xenstored directories exist */ + /* Make sure xenstored directory exists. */ /* Errors ignored here, will be reported when we open files */ mkdir(xs_daemon_rundir(), 0755); - mkdir(xs_daemon_rootdir(), 0755); if (dofork) { openlog("xenstored", 0, LOG_DAEMON); diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index b9941c567c..826fa7b5a8 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -32,11 +32,6 @@ const char *xs_daemon_rundir(void) return (s ? s : XEN_RUN_STORED); } -const char *xs_daemon_rootdir(void) -{ - return xs_daemon_rundir(); -} - static const char *xs_daemon_path(void) { static char buf[PATH_MAX]; @@ -49,61 +44,11 @@ static const char *xs_daemon_path(void) return buf; } -const char *xs_daemon_tdb(void) -{ - static char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/tdb", xs_daemon_rootdir()); - return buf; -} - const char *xs_daemon_socket(void) { return xs_daemon_path(); } -const char *xs_daemon_socket_ro(void) -{ - return xs_daemon_path(); -} - -const char *xs_domain_dev(void) -{ - char *s = getenv("XENSTORED_PATH"); - if (s) - return s; -#if defined(__RUMPUSER_XEN__) || defined(__RUMPRUN__) - return "/dev/xen/xenbus"; -#elif defined(__linux__) - if (access("/dev/xen/xenbus", F_OK) == 0) - return "/dev/xen/xenbus"; - return "/proc/xen/xenbus"; -#elif defined(__NetBSD__) - return "/kern/xen/xenbus"; -#elif defined(__FreeBSD__) - return "/dev/xen/xenstore"; -#else - return "/dev/xen/xenbus"; -#endif -} - -/* Simple routines for writing to sockets, etc. */ -bool xs_write_all(int fd, const void *data, unsigned int len) -{ - while (len) { - int done; - - done = write(fd, data, len); - if (done < 0 && errno == EINTR) - continue; - if (done <= 0) - return false; - data += done; - len -= done; - } - - return true; -} - /* Convert strings to permissions. False if a problem. */ bool xs_strings_to_perms(struct xs_permissions *perms, unsigned int num, const char *strings) @@ -179,114 +124,3 @@ unsigned int xs_count_strings(const char *strings, unsigned int len) return num; } - -char *expanding_buffer_ensure(struct expanding_buffer *ebuf, int min_avail) -{ - int want; - char *got; - - if (ebuf->avail >= min_avail) - return ebuf->buf; - - if (min_avail >= INT_MAX/3) - return 0; - - want = ebuf->avail + min_avail + 10; - got = realloc(ebuf->buf, want); - if (!got) - return 0; - - ebuf->buf = got; - ebuf->avail = want; - return ebuf->buf; -} - -char *sanitise_value(struct expanding_buffer *ebuf, - const char *val, unsigned len) -{ - int used, remain, c; - unsigned char *ip; - -#define ADD(c) (ebuf->buf[used++] = (c)) -#define ADDF(f,c) (used += sprintf(ebuf->buf+used, (f), (c))) - - assert(len < INT_MAX/5); - - ip = (unsigned char *)val; - used = 0; - remain = len; - - if (!expanding_buffer_ensure(ebuf, remain + 1)) - return NULL; - - while (remain-- > 0) { - c= *ip++; - - if (c >= ' ' && c <= '~' && c != '\\') { - ADD(c); - continue; - } - - if (!expanding_buffer_ensure(ebuf, used + remain + 5)) - /* for "\\nnn\0" */ - return 0; - - ADD('\\'); - switch (c) { - case '\t': ADD('t'); break; - case '\n': ADD('n'); break; - case '\r': ADD('r'); break; - case '\\': ADD('\\'); break; - default: - if (c < 010) ADDF("%03o", c); - else ADDF("x%02x", c); - } - } - - ADD(0); - assert(used <= ebuf->avail); - return ebuf->buf; - -#undef ADD -#undef ADDF -} - -void unsanitise_value(char *out, unsigned *out_len_r, const char *in) -{ - const char *ip; - char *op; - unsigned c; - int n; - - for (ip = in, op = out; (c = *ip++); *op++ = c) { - if (c == '\\') { - c = *ip++; - -#define GETF(f) do { \ - n = 0; \ - sscanf(ip, f "%n", &c, &n); \ - ip += n; \ - } while (0) - - switch (c) { - case 't': c= '\t'; break; - case 'n': c= '\n'; break; - case 'r': c= '\r'; break; - case '\\': c= '\\'; break; - case 'x': GETF("%2x"); break; - case '0': case '4': - case '1': case '5': - case '2': case '6': - case '3': case '7': --ip; GETF("%3o"); break; - case 0: --ip; break; - default:; - } -#undef GETF - } - } - - *op = 0; - - if (out_len_r) - *out_len_r = op - out; -} diff --git a/tools/xenstore/xs_lib.h b/tools/xenstore/xs_lib.h index efa05997d6..5b9874d741 100644 --- a/tools/xenstore/xs_lib.h +++ b/tools/xenstore/xs_lib.h @@ -21,10 +21,6 @@ #include "xenstore_lib.h" -const char *xs_daemon_rootdir(void); -const char *xs_domain_dev(void); -const char *xs_daemon_tdb(void); - /* Convert permissions to a string (up to len MAX_STRLEN(unsigned int)+1). */ bool xs_perm_to_string(const struct xs_permissions *perm, char *buffer, size_t buf_len); @@ -32,19 +28,4 @@ bool xs_perm_to_string(const struct xs_permissions *perm, /* Given a string and a length, count how many strings (nul terms). */ unsigned int xs_count_strings(const char *strings, unsigned int len); -/* Sanitising (quoting) possibly-binary strings. */ -struct expanding_buffer { - char *buf; - int avail; -}; - -/* Ensure that given expanding buffer has at least min_avail characters. */ -char *expanding_buffer_ensure(struct expanding_buffer *, int min_avail); - -/* sanitise_value() may return NULL if malloc fails. */ -char *sanitise_value(struct expanding_buffer *, const char *val, unsigned len); - -/* *out_len_r on entry is ignored; out must be at least strlen(in)+1 bytes. */ -void unsanitise_value(char *out, unsigned *out_len_r, const char *in); - #endif /* XS_LIB_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:24:44 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:24:44 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557535.870970 (Exim 4.92) (envelope-from ) id 1qFF3E-0008Ir-KR; Fri, 30 Jun 2023 14:24:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557535.870970; Fri, 30 Jun 2023 14:24:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3E-0008Ik-Ha; Fri, 30 Jun 2023 14:24:44 +0000 Received: by outflank-mailman (input) for mailman id 557535; Fri, 30 Jun 2023 14:24:43 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3D-0008Ib-Ku for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:43 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3D-0008Eo-K2 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF3D-0006mL-J8 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=qNQWHgMGgyvjEGXwFfz88l3aeBKs6JJxMDtnB5g8mq8=; b=G5kbLOaQvFlkMfeooDeUUsgeuq Jl5NPCJOnUI3p86DvK+BNd3yn+WLX4LbMmJZh3lJrSlzdE6ua8m/eG63ew1bPMdF4hzD9InS8qvUP zX5iczH3t9/gihamQ7R7X6pFygldqvhB0oUkDVAo+mxR/6MLOoMYdJIpMg1XytNuI+Vs=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: replace xs_lib.c with a header Message-Id: Date: Fri, 30 Jun 2023 14:24:43 +0000 commit b2126a992fe2607c3ec78b7b8ab3d0bd9d559eea Author: Juergen Gross AuthorDate: Tue Jun 27 14:27:47 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 29 22:38:22 2023 +0100 tools/xenstore: replace xs_lib.c with a header Instead of including the same small C source in multiple binaries from 2 source directories, use a header file with inline functions as a replacement. As some of the functions are exported by libxenstore, rename the inline functions from xs_*() do xenstore_*() and add xs_*() wrappers to libxenstore. With that no sources required to build libxenstore are left in tools/xenstore, so the file COPYING can be removed now. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- MAINTAINERS | 1 + tools/include/xen-tools/xenstore-common.h | 128 ++++++++ tools/libs/store/Makefile | 4 - tools/libs/store/xs.c | 28 +- tools/xenstore/COPYING | 514 ------------------------------ tools/xenstore/Makefile | 2 +- tools/xenstore/Makefile.common | 2 +- tools/xenstore/xenstore_client.c | 4 +- tools/xenstore/xenstored_control.c | 9 +- tools/xenstore/xenstored_core.c | 15 +- tools/xenstore/xs_lib.c | 126 -------- tools/xenstore/xs_lib.h | 31 -- 12 files changed, 168 insertions(+), 696 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 64c9cc89ed..180e57dac4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -660,6 +660,7 @@ F: tools/helpers/init-xenstore-domain.c F: tools/include/xenstore-compat/ F: tools/include/xenstore.h F: tools/include/xenstore_lib.h +F: tools/include/xen-tools/xenstore-common.h F: tools/libs/store/ F: tools/xenstore/ diff --git a/tools/include/xen-tools/xenstore-common.h b/tools/include/xen-tools/xenstore-common.h new file mode 100644 index 0000000000..8cb097a8fc --- /dev/null +++ b/tools/include/xen-tools/xenstore-common.h @@ -0,0 +1,128 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* Common functions for libxenstore, xenstored and xenstore-clients. */ + +#ifndef __XEN_TOOLS_XENSTORE_COMMON__ +#define __XEN_TOOLS_XENSTORE_COMMON__ + +#include +#include +#include +#include + +static inline const char *xenstore_daemon_rundir(void) +{ + char *s = getenv("XENSTORED_RUNDIR"); + + return s ? s : XEN_RUN_STORED; +} + +static inline const char *xenstore_daemon_path(void) +{ + static char buf[PATH_MAX]; + char *s = getenv("XENSTORED_PATH"); + + if ( s ) + return s; + + if ( snprintf(buf, sizeof(buf), "%s/socket", xenstore_daemon_rundir()) >= + PATH_MAX ) + return NULL; + + return buf; +} + +/* Convert strings to permissions. False if a problem. */ +static inline bool xenstore_strings_to_perms(struct xs_permissions *perms, + unsigned int num, + const char *strings) +{ + const char *p; + char *end; + unsigned int i; + + for ( p = strings, i = 0; i < num; i++ ) + { + /* "r", "w", or "b" for both. */ + switch ( *p ) + { + case 'r': + perms[i].perms = XS_PERM_READ; + break; + + case 'w': + perms[i].perms = XS_PERM_WRITE; + break; + + case 'b': + perms[i].perms = XS_PERM_READ|XS_PERM_WRITE; + break; + + case 'n': + perms[i].perms = XS_PERM_NONE; + break; + + default: + errno = EINVAL; + return false; + } + + p++; + perms[i].id = strtol(p, &end, 0); + if ( *end || !*p ) + { + errno = EINVAL; + return false; + } + + p = end + 1; + } + + return true; +} + +/* Convert permissions to a string (up to len MAX_STRLEN(unsigned int)+1). */ +static inline bool xenstore_perm_to_string(const struct xs_permissions *perm, + char *buffer, size_t buf_len) +{ + switch ( (int)perm->perms & ~XS_PERM_IGNORE ) + { + case XS_PERM_WRITE: + *buffer = 'w'; + break; + + case XS_PERM_READ: + *buffer = 'r'; + break; + + case XS_PERM_READ|XS_PERM_WRITE: + *buffer = 'b'; + break; + + case XS_PERM_NONE: + *buffer = 'n'; + break; + + default: + errno = EINVAL; + return false; + } + + snprintf(buffer + 1, buf_len - 1, "%i", (int)perm->id); + + return true; +} + +/* Given a string and a length, count how many strings (nul terms). */ +static inline unsigned int xenstore_count_strings(const char *strings, + unsigned int len) +{ + unsigned int num; + const char *p; + + for ( p = strings, num = 0; p < strings + len; p++ ) + if ( *p == '\0' ) + num++; + + return num; +} +#endif /* __XEN_TOOLS_XENSTORE_COMMON__ */ diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index daed9d148f..c1a1508713 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -9,7 +9,6 @@ ifeq ($(CONFIG_Linux),y) LDLIBS += -ldl endif -OBJS-y += xs_lib.o OBJS-y += xs.o LIBHEADER = xenstore.h xenstore_lib.h @@ -21,9 +20,6 @@ CFLAGS += -include $(XEN_ROOT)/tools/config.h CFLAGS += $(CFLAGS_libxentoolcore) CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" -vpath xs_lib.c $(XEN_ROOT)/tools/xenstore -CFLAGS += -iquote $(XEN_ROOT)/tools/xenstore - xs.opic: CFLAGS += -DUSE_PTHREAD ifeq ($(CONFIG_Linux),y) xs.opic: CFLAGS += -DUSE_DLSYM diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index bb93246bfb..140b9a2839 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -34,8 +34,8 @@ #include #include #include +#include #include "xenstore.h" -#include "xs_lib.h" #include #include @@ -627,7 +627,7 @@ static char **xs_directory_common(char *strings, unsigned int len, char *p, **ret; /* Count the strings. */ - *num = xs_count_strings(strings, len); + *num = xenstore_count_strings(strings, len); /* Transfer to one big alloc for easy freeing. */ ret = malloc(*num * sizeof(char *) + len); @@ -775,7 +775,7 @@ struct xs_permissions *xs_get_permissions(struct xs_handle *h, return NULL; /* Count the strings: each one perms then domid. */ - *num = xs_count_strings(strings, len); + *num = xenstore_count_strings(strings, len); /* Transfer to one big alloc for easy freeing. */ ret = malloc(*num * sizeof(struct xs_permissions)); @@ -784,7 +784,7 @@ struct xs_permissions *xs_get_permissions(struct xs_handle *h, return NULL; } - if (!xs_strings_to_perms(ret, *num, strings)) { + if (!xenstore_strings_to_perms(ret, *num, strings)) { free_no_errno(ret); ret = NULL; } @@ -811,7 +811,7 @@ bool xs_set_permissions(struct xs_handle *h, for (i = 0; i < num_perms; i++) { char buffer[MAX_STRLEN(unsigned int)+1]; - if (!xs_perm_to_string(&perms[i], buffer, sizeof(buffer))) + if (!xenstore_perm_to_string(&perms[i], buffer, sizeof(buffer))) goto unwind; iov[i+1].iov_base = strdup(buffer); @@ -977,7 +977,7 @@ static char **read_watch_internal(struct xs_handle *h, unsigned int *num, assert(msg->hdr.type == XS_WATCH_EVENT); strings = msg->body; - num_strings = xs_count_strings(strings, msg->hdr.len); + num_strings = xenstore_count_strings(strings, msg->hdr.len); ret = malloc(sizeof(char*) * num_strings + msg->hdr.len); if (!ret) { @@ -1366,11 +1366,27 @@ error: return ret; } +const char *xs_daemon_socket(void) +{ + return xenstore_daemon_path(); +} + const char *xs_daemon_socket_ro(void) { return xs_daemon_socket(); } +const char *xs_daemon_rundir(void) +{ + return xenstore_daemon_rundir(); +} + +bool xs_strings_to_perms(struct xs_permissions *perms, unsigned int num, + const char *strings) +{ + return xenstore_strings_to_perms(perms, num, strings); +} + #ifdef USE_PTHREAD static void *read_thread(void *arg) { diff --git a/tools/xenstore/COPYING b/tools/xenstore/COPYING deleted file mode 100644 index c764b2e329..0000000000 --- a/tools/xenstore/COPYING +++ /dev/null @@ -1,514 +0,0 @@ -This license (LGPL) applies to the xenstore library which interfaces -with the xenstore daemon (as stated in xs.c, xenstore.h, xs_lib.c and -xenstore_lib.h). The remaining files in the directory are licensed as -stated in the comments (as of this writing, GPL, see ../../COPYING). - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 56723139a1..dc39b6cb31 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -44,7 +44,7 @@ xenstored: $(XENSTORED_OBJS-y) $(CLIENTS): xenstore ln -f xenstore $@ -xenstore: xenstore_client.o xs_lib.o +xenstore: xenstore_client.o $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) xenstore-control: xenstore_control.o diff --git a/tools/xenstore/Makefile.common b/tools/xenstore/Makefile.common index b18f95c103..f71c9bfd55 100644 --- a/tools/xenstore/Makefile.common +++ b/tools/xenstore/Makefile.common @@ -2,7 +2,7 @@ XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o -XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o +XENSTORED_OBJS-y += talloc.o utils.o tdb.o hashtable.o XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c index 27fda81401..a104cf6487 100644 --- a/tools/xenstore/xenstore_client.c +++ b/tools/xenstore/xenstore_client.c @@ -23,7 +23,7 @@ #include -#include "xs_lib.h" +#include #define PATH_SEP '/' #define MAX_PATH_LEN 256 @@ -361,7 +361,7 @@ static void do_ls(struct xs_handle *h, char *path, int cur_depth, int show_perms for (i = 0; i < nperms; i++) { if (i) putchar(','); - xs_perm_to_string(perms+i, buf, sizeof(buf)); + xenstore_perm_to_string(perms+i, buf, sizeof(buf)); fputs(buf, stdout); } putchar(')'); diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 6ef800ff64..0d131e2ebc 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -31,10 +31,10 @@ #include #include #include +#include #include "utils.h" #include "talloc.h" -#include "xs_lib.h" #include "xenstored_core.h" #include "xenstored_control.h" #include "xenstored_domain.h" @@ -560,7 +560,8 @@ static FILE *lu_dump_open(const void *ctx) char *filename; int fd; - filename = talloc_asprintf(ctx, "%s/state_dump", xs_daemon_rundir()); + filename = talloc_asprintf(ctx, "%s/state_dump", + xenstore_daemon_rundir()); if (!filename) return NULL; @@ -583,7 +584,7 @@ static void lu_get_dump_state(struct lu_dump_state *state) state->size = 0; state->filename = talloc_asprintf(NULL, "%s/state_dump", - xs_daemon_rundir()); + xenstore_daemon_rundir()); if (!state->filename) barf("Allocation failure"); @@ -1017,7 +1018,7 @@ int do_control(const void *ctx, struct connection *conn, if (cmd == ARRAY_SIZE(cmds)) return EINVAL; - num = xs_count_strings(in->buffer, in->used); + num = xenstore_count_strings(in->buffer, in->used); if (cmds[cmd].max_pars) num = min(num, cmds[cmd].max_pars); vec = talloc_array(ctx, char *, num); diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index a78cbf1116..62deee9cb9 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -42,11 +42,11 @@ #include #include +#include #include "utils.h" #include "list.h" #include "talloc.h" -#include "xs_lib.h" #include "xenstored_core.h" #include "xenstored_watch.h" #include "xenstored_transaction.h" @@ -1201,7 +1201,8 @@ static char *perms_to_strings(const void *ctx, const struct node_perms *perms, char buffer[MAX_STRLEN(unsigned int) + 1]; for (*len = 0, i = 0; i < perms->num; i++) { - if (!xs_perm_to_string(&perms->p[i], buffer, sizeof(buffer))) + if (!xenstore_perm_to_string(&perms->p[i], buffer, + sizeof(buffer))) return NULL; strings = talloc_realloc(ctx, strings, char, @@ -1279,7 +1280,7 @@ static int send_directory_part(const void *ctx, struct connection *conn, struct node *node; char gen[24]; - if (xs_count_strings(in->buffer, in->used) != 2) + if (xenstore_count_strings(in->buffer, in->used) != 2) return EINVAL; /* First arg is node name. */ @@ -1766,7 +1767,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, char *name, *permstr; struct node *node; - perms.num = xs_count_strings(in->buffer, in->used); + perms.num = xenstore_count_strings(in->buffer, in->used); if (perms.num < 2) return EINVAL; @@ -1779,7 +1780,7 @@ static int do_set_perms(const void *ctx, struct connection *conn, perms.p = talloc_array(ctx, struct xs_permissions, perms.num); if (!perms.p) return ENOMEM; - if (!xs_strings_to_perms(perms.p, perms.num, permstr)) + if (!xenstore_strings_to_perms(perms.p, perms.num, permstr)) return errno; if (domain_alloc_permrefs(&perms) < 0) @@ -2575,7 +2576,7 @@ static void destroy_fds(void) static void init_sockets(void) { struct sockaddr_un addr; - const char *soc_str = xs_daemon_socket(); + const char *soc_str = xenstore_daemon_path(); if (!soc_str) barf_perror("Failed to obtain xs domain socket"); @@ -2890,7 +2891,7 @@ int main(int argc, char *argv[]) /* Make sure xenstored directory exists. */ /* Errors ignored here, will be reported when we open files */ - mkdir(xs_daemon_rundir(), 0755); + mkdir(xenstore_daemon_rundir(), 0755); if (dofork) { openlog("xenstored", 0, LOG_DAEMON); diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c deleted file mode 100644 index 826fa7b5a8..0000000000 --- a/tools/xenstore/xs_lib.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - Common routines between Xen store user library and daemon. - Copyright (C) 2005 Rusty Russell IBM Corporation - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . -*/ - -#include -#include -#include -#include -#include -#include -#include "xs_lib.h" - -/* Common routines for the Xen store daemon and client library. */ - -const char *xs_daemon_rundir(void) -{ - char *s = getenv("XENSTORED_RUNDIR"); - return (s ? s : XEN_RUN_STORED); -} - -static const char *xs_daemon_path(void) -{ - static char buf[PATH_MAX]; - char *s = getenv("XENSTORED_PATH"); - if (s) - return s; - if (snprintf(buf, sizeof(buf), "%s/socket", - xs_daemon_rundir()) >= PATH_MAX) - return NULL; - return buf; -} - -const char *xs_daemon_socket(void) -{ - return xs_daemon_path(); -} - -/* Convert strings to permissions. False if a problem. */ -bool xs_strings_to_perms(struct xs_permissions *perms, unsigned int num, - const char *strings) -{ - const char *p; - char *end; - unsigned int i; - - for (p = strings, i = 0; i < num; i++) { - /* "r", "w", or "b" for both. */ - switch (*p) { - case 'r': - perms[i].perms = XS_PERM_READ; - break; - case 'w': - perms[i].perms = XS_PERM_WRITE; - break; - case 'b': - perms[i].perms = XS_PERM_READ|XS_PERM_WRITE; - break; - case 'n': - perms[i].perms = XS_PERM_NONE; - break; - default: - errno = EINVAL; - return false; - } - p++; - perms[i].id = strtol(p, &end, 0); - if (*end || !*p) { - errno = EINVAL; - return false; - } - p = end + 1; - } - return true; -} - -/* Convert permissions to a string (up to len MAX_STRLEN(unsigned int)+1). */ -bool xs_perm_to_string(const struct xs_permissions *perm, - char *buffer, size_t buf_len) -{ - switch ((int)perm->perms & ~XS_PERM_IGNORE) { - case XS_PERM_WRITE: - *buffer = 'w'; - break; - case XS_PERM_READ: - *buffer = 'r'; - break; - case XS_PERM_READ|XS_PERM_WRITE: - *buffer = 'b'; - break; - case XS_PERM_NONE: - *buffer = 'n'; - break; - default: - errno = EINVAL; - return false; - } - snprintf(buffer+1, buf_len-1, "%i", (int)perm->id); - return true; -} - -/* Given a string and a length, count how many strings (nul terms). */ -unsigned int xs_count_strings(const char *strings, unsigned int len) -{ - unsigned int num; - const char *p; - - for (p = strings, num = 0; p < strings + len; p++) - if (*p == '\0') - num++; - - return num; -} diff --git a/tools/xenstore/xs_lib.h b/tools/xenstore/xs_lib.h deleted file mode 100644 index 5b9874d741..0000000000 --- a/tools/xenstore/xs_lib.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Common routines between Xen store user library and daemon. - Copyright (C) 2005 Rusty Russell IBM Corporation - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; If not, see . -*/ - -#ifndef XS_LIB_H -#define XS_LIB_H - -#include "xenstore_lib.h" - -/* Convert permissions to a string (up to len MAX_STRLEN(unsigned int)+1). */ -bool xs_perm_to_string(const struct xs_permissions *perm, - char *buffer, size_t buf_len); - -/* Given a string and a length, count how many strings (nul terms). */ -unsigned int xs_count_strings(const char *strings, unsigned int len); - -#endif /* XS_LIB_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:24:54 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:24:54 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557536.870974 (Exim 4.92) (envelope-from ) id 1qFF3O-0008Lw-Nc; Fri, 30 Jun 2023 14:24:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557536.870974; Fri, 30 Jun 2023 14:24:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3O-0008Lp-Kr; Fri, 30 Jun 2023 14:24:54 +0000 Received: by outflank-mailman (input) for mailman id 557536; Fri, 30 Jun 2023 14:24:53 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3N-0008Le-Nl for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:53 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3N-0008Ez-Mv for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF3N-0006mq-ME for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:24:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=ZsOKbCKBrNPxUActnpT/5OQUZ22ehCfCuM+otpOXtO8=; b=MCSJlzTTr9xVHYSKUz1BRdtyB0 plp8P8N5oOxcoWRUo7FPnTGJaOY+MDsBy3x1gu4otDho3GRoD9GczMdQaA111/mE3L/ElZalOmTR7 gBIs6V7G/w0QRhyIz8aZpMLdvMjzQmDTEGUUzhIV/BKoKG6SkUWxedHMx9AL08+0tQ6k=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: split out environment specific live update code Message-Id: Date: Fri, 30 Jun 2023 14:24:53 +0000 commit 1a7fafdc744f4f725110f6411c4b4f182c77cfe8 Author: Juergen Gross AuthorDate: Tue Jun 27 14:27:48 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 29 22:38:22 2023 +0100 tools/xenstore: split out environment specific live update code Instead of using #ifdef in xenstored_control.c split out the code of environment specific functions (daemon or Mini-OS) to dedicated source files. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall --- tools/xenstore/Makefile.common | 8 +- tools/xenstore/xenstored_control.c | 247 +---------------------------------- tools/xenstore/xenstored_lu.h | 56 ++++++++ tools/xenstore/xenstored_lu_daemon.c | 130 ++++++++++++++++++ tools/xenstore/xenstored_lu_minios.c | 118 +++++++++++++++++ 5 files changed, 312 insertions(+), 247 deletions(-) diff --git a/tools/xenstore/Makefile.common b/tools/xenstore/Makefile.common index f71c9bfd55..c42796fe34 100644 --- a/tools/xenstore/Makefile.common +++ b/tools/xenstore/Makefile.common @@ -4,10 +4,10 @@ XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o XENSTORED_OBJS-y += talloc.o utils.o tdb.o hashtable.o -XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o +XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o xenstored_lu_daemon.o +XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o xenstored_lu_daemon.o +XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o xenstored_lu_daemon.o +XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o xenstored_lu_minios.o # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 0d131e2ebc..8f1f31fd6a 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -38,63 +38,21 @@ #include "xenstored_core.h" #include "xenstored_control.h" #include "xenstored_domain.h" +#include "xenstored_lu.h" #include "xenstored_watch.h" -/* Mini-OS only knows about MAP_ANON. */ -#ifndef MAP_ANONYMOUS -#define MAP_ANONYMOUS MAP_ANON -#endif - #ifndef NO_LIVE_UPDATE -struct live_update { - /* For verification the correct connection is acting. */ - struct connection *conn; - - /* Pointer to the command used to request LU */ - struct buffered_data *in; - -#ifdef __MINIOS__ - void *kernel; - unsigned int kernel_size; - unsigned int kernel_off; - - void *dump_state; - unsigned long dump_size; -#else - char *filename; -#endif - - char *cmdline; - - /* Start parameters. */ - bool force; - unsigned int timeout; - time_t started_at; -}; - -static struct live_update *lu_status; - -struct lu_dump_state { - void *buf; - unsigned int size; -#ifndef __MINIOS__ - int fd; - char *filename; -#endif -}; +struct live_update *lu_status; static int lu_destroy(void *data) { -#ifdef __MINIOS__ - if (lu_status->dump_state) - munmap(lu_status->dump_state, lu_status->dump_size); -#endif + lu_destroy_arch(data); lu_status = NULL; return 0; } -static const char *lu_begin(struct connection *conn) +const char *lu_begin(struct connection *conn) { if (lu_status) return "live-update session already active."; @@ -431,203 +389,6 @@ static const char *lu_cmdline(const void *ctx, struct connection *conn, return NULL; } -#ifdef __MINIOS__ -static const char *lu_binary_alloc(const void *ctx, struct connection *conn, - unsigned long size) -{ - const char *ret; - - syslog(LOG_INFO, "live-update: binary size %lu\n", size); - - ret = lu_begin(conn); - if (ret) - return ret; - - lu_status->kernel = talloc_size(lu_status, size); - if (!lu_status->kernel) - return "Allocation failure."; - - lu_status->kernel_size = size; - lu_status->kernel_off = 0; - - errno = 0; - return NULL; -} - -static const char *lu_binary_save(const void *ctx, struct connection *conn, - unsigned int size, const char *data) -{ - if (!lu_status || lu_status->conn != conn) - return "Not in live-update session."; - - if (lu_status->kernel_off + size > lu_status->kernel_size) - return "Too much kernel data."; - - memcpy(lu_status->kernel + lu_status->kernel_off, data, size); - lu_status->kernel_off += size; - - errno = 0; - return NULL; -} - -static const char *lu_arch(const void *ctx, struct connection *conn, - char **vec, int num) -{ - if (num == 2 && !strcmp(vec[0], "-b")) - return lu_binary_alloc(ctx, conn, atol(vec[1])); - if (num > 2 && !strcmp(vec[0], "-d")) - return lu_binary_save(ctx, conn, atoi(vec[1]), vec[2]); - - errno = EINVAL; - return NULL; -} - -static FILE *lu_dump_open(const void *ctx) -{ - lu_status->dump_size = ROUNDUP(talloc_total_size(NULL) * 2, - XC_PAGE_SHIFT); - lu_status->dump_state = mmap(NULL, lu_status->dump_size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (lu_status->dump_state == MAP_FAILED) - return NULL; - - return fmemopen(lu_status->dump_state, lu_status->dump_size, "w"); -} - -static void lu_dump_close(FILE *fp) -{ - size_t size; - - size = ftell(fp); - size = ROUNDUP(size, XC_PAGE_SHIFT); - munmap(lu_status->dump_state + size, lu_status->dump_size - size); - lu_status->dump_size = size; - - fclose(fp); -} - -static void lu_get_dump_state(struct lu_dump_state *state) -{ -} - -static void lu_close_dump_state(struct lu_dump_state *state) -{ -} - -static char *lu_exec(const void *ctx, int argc, char **argv) -{ - return "NYI"; -} -#else -static const char *lu_binary(const void *ctx, struct connection *conn, - const char *filename) -{ - const char *ret; - struct stat statbuf; - - syslog(LOG_INFO, "live-update: binary %s\n", filename); - - if (stat(filename, &statbuf)) - return "File not accessible."; - if (!(statbuf.st_mode & (S_IXOTH | S_IXGRP | S_IXUSR))) - return "File not executable."; - - ret = lu_begin(conn); - if (ret) - return ret; - - lu_status->filename = talloc_strdup(lu_status, filename); - if (!lu_status->filename) - return "Allocation failure."; - - errno = 0; - return NULL; -} - -static const char *lu_arch(const void *ctx, struct connection *conn, - char **vec, int num) -{ - if (num == 2 && !strcmp(vec[0], "-f")) - return lu_binary(ctx, conn, vec[1]); - - errno = EINVAL; - return NULL; -} - -static FILE *lu_dump_open(const void *ctx) -{ - char *filename; - int fd; - - filename = talloc_asprintf(ctx, "%s/state_dump", - xenstore_daemon_rundir()); - if (!filename) - return NULL; - - fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); - if (fd < 0) - return NULL; - - return fdopen(fd, "w"); -} - -static void lu_dump_close(FILE *fp) -{ - fclose(fp); -} - -static void lu_get_dump_state(struct lu_dump_state *state) -{ - struct stat statbuf; - - state->size = 0; - - state->filename = talloc_asprintf(NULL, "%s/state_dump", - xenstore_daemon_rundir()); - if (!state->filename) - barf("Allocation failure"); - - state->fd = open(state->filename, O_RDONLY); - if (state->fd < 0) - return; - if (fstat(state->fd, &statbuf) != 0) - goto out_close; - state->size = statbuf.st_size; - - state->buf = mmap(NULL, state->size, PROT_READ, MAP_PRIVATE, - state->fd, 0); - if (state->buf == MAP_FAILED) { - state->size = 0; - goto out_close; - } - - return; - - out_close: - close(state->fd); -} - -static void lu_close_dump_state(struct lu_dump_state *state) -{ - assert(state->filename != NULL); - - munmap(state->buf, state->size); - close(state->fd); - - unlink(state->filename); - talloc_free(state->filename); -} - -static char *lu_exec(const void *ctx, int argc, char **argv) -{ - argv[0] = lu_status->filename; - execvp(argv[0], argv); - - return "Error activating new binary."; -} -#endif - static bool lu_check_lu_allowed(void) { struct connection *conn; diff --git a/tools/xenstore/xenstored_lu.h b/tools/xenstore/xenstored_lu.h new file mode 100644 index 0000000000..1c09b9b639 --- /dev/null +++ b/tools/xenstore/xenstored_lu.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: MIT */ + +/* + * Live Update interfaces for Xen Store Daemon. + * Copyright (C) 2022 Juergen Gross, SUSE LLC + */ + +#ifndef NO_LIVE_UPDATE +struct live_update { + /* For verification the correct connection is acting. */ + struct connection *conn; + + /* Pointer to the command used to request LU */ + struct buffered_data *in; + +#ifdef __MINIOS__ + void *kernel; + unsigned int kernel_size; + unsigned int kernel_off; + + void *dump_state; + unsigned long dump_size; +#else + char *filename; +#endif + + char *cmdline; + + /* Start parameters. */ + bool force; + unsigned int timeout; + time_t started_at; +}; + +struct lu_dump_state { + void *buf; + unsigned int size; +#ifndef __MINIOS__ + int fd; + char *filename; +#endif +}; + +extern struct live_update *lu_status; + +/* Live update private interfaces. */ +void lu_get_dump_state(struct lu_dump_state *state); +void lu_close_dump_state(struct lu_dump_state *state); +FILE *lu_dump_open(const void *ctx); +void lu_dump_close(FILE *fp); +char *lu_exec(const void *ctx, int argc, char **argv); +const char *lu_arch(const void *ctx, struct connection *conn, char **vec, + int num); +const char *lu_begin(struct connection *conn); +void lu_destroy_arch(void *data); +#endif diff --git a/tools/xenstore/xenstored_lu_daemon.c b/tools/xenstore/xenstored_lu_daemon.c new file mode 100644 index 0000000000..310fb8c2e6 --- /dev/null +++ b/tools/xenstore/xenstored_lu_daemon.c @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * Live Update for Xen Store Daemon. + * Copyright (C) 2022 Juergen Gross, SUSE LLC + */ + +#include +#include +#include +#include +#include +#include + +#include "talloc.h" +#include "xenstored_core.h" +#include "xenstored_lu.h" + +#ifndef NO_LIVE_UPDATE +void lu_get_dump_state(struct lu_dump_state *state) +{ + struct stat statbuf; + + state->size = 0; + + state->filename = talloc_asprintf(NULL, "%s/state_dump", + xenstore_daemon_rundir()); + if (!state->filename) + barf("Allocation failure"); + + state->fd = open(state->filename, O_RDONLY); + if (state->fd < 0) + return; + if (fstat(state->fd, &statbuf) != 0) + goto out_close; + state->size = statbuf.st_size; + + state->buf = mmap(NULL, state->size, PROT_READ, MAP_PRIVATE, + state->fd, 0); + if (state->buf == MAP_FAILED) { + state->size = 0; + goto out_close; + } + + return; + + out_close: + close(state->fd); +} + +void lu_close_dump_state(struct lu_dump_state *state) +{ + assert(state->filename != NULL); + + munmap(state->buf, state->size); + close(state->fd); + + unlink(state->filename); + talloc_free(state->filename); +} + +FILE *lu_dump_open(const void *ctx) +{ + char *filename; + int fd; + + filename = talloc_asprintf(ctx, "%s/state_dump", + xenstore_daemon_rundir()); + if (!filename) + return NULL; + + fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); + if (fd < 0) + return NULL; + + return fdopen(fd, "w"); +} + +void lu_dump_close(FILE *fp) +{ + fclose(fp); +} + +char *lu_exec(const void *ctx, int argc, char **argv) +{ + argv[0] = lu_status->filename; + execvp(argv[0], argv); + + return "Error activating new binary."; +} + +void lu_destroy_arch(void *data) +{ +} + +static const char *lu_binary(const void *ctx, struct connection *conn, + const char *filename) +{ + const char *ret; + struct stat statbuf; + + syslog(LOG_INFO, "live-update: binary %s\n", filename); + + if (stat(filename, &statbuf)) + return "File not accessible."; + if (!(statbuf.st_mode & (S_IXOTH | S_IXGRP | S_IXUSR))) + return "File not executable."; + + ret = lu_begin(conn); + if (ret) + return ret; + + lu_status->filename = talloc_strdup(lu_status, filename); + if (!lu_status->filename) + return "Allocation failure."; + + errno = 0; + return NULL; +} + +const char *lu_arch(const void *ctx, struct connection *conn, char **vec, + int num) +{ + if (num == 2 && !strcmp(vec[0], "-f")) + return lu_binary(ctx, conn, vec[1]); + + errno = EINVAL; + return NULL; +} +#endif diff --git a/tools/xenstore/xenstored_lu_minios.c b/tools/xenstore/xenstored_lu_minios.c new file mode 100644 index 0000000000..88fb9e0f38 --- /dev/null +++ b/tools/xenstore/xenstored_lu_minios.c @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * Live Update for Xen Store Daemon. + * Copyright (C) 2022 Juergen Gross, SUSE LLC + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "talloc.h" +#include "xenstored_lu.h" + +/* Mini-OS only knows about MAP_ANON. */ +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif + +#ifndef NO_LIVE_UPDATE +void lu_get_dump_state(struct lu_dump_state *state) +{ +} + +void lu_close_dump_state(struct lu_dump_state *state) +{ +} + +FILE *lu_dump_open(const void *ctx) +{ + lu_status->dump_size = ROUNDUP(talloc_total_size(NULL) * 2, + XC_PAGE_SHIFT); + lu_status->dump_state = mmap(NULL, lu_status->dump_size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (lu_status->dump_state == MAP_FAILED) + return NULL; + + return fmemopen(lu_status->dump_state, lu_status->dump_size, "w"); +} + +void lu_dump_close(FILE *fp) +{ + size_t size; + + size = ftell(fp); + size = ROUNDUP(size, XC_PAGE_SHIFT); + munmap(lu_status->dump_state + size, lu_status->dump_size - size); + lu_status->dump_size = size; + + fclose(fp); +} + +char *lu_exec(const void *ctx, int argc, char **argv) +{ + return "NYI"; +} + +void lu_destroy_arch(void *data) +{ + if (lu_status->dump_state) + munmap(lu_status->dump_state, lu_status->dump_size); +} + +static const char *lu_binary_alloc(const void *ctx, struct connection *conn, + unsigned long size) +{ + const char *ret; + + syslog(LOG_INFO, "live-update: binary size %lu\n", size); + + ret = lu_begin(conn); + if (ret) + return ret; + + lu_status->kernel = talloc_size(lu_status, size); + if (!lu_status->kernel) + return "Allocation failure."; + + lu_status->kernel_size = size; + lu_status->kernel_off = 0; + + errno = 0; + return NULL; +} + +static const char *lu_binary_save(const void *ctx, struct connection *conn, + unsigned int size, const char *data) +{ + if (!lu_status || lu_status->conn != conn) + return "Not in live-update session."; + + if (lu_status->kernel_off + size > lu_status->kernel_size) + return "Too much kernel data."; + + memcpy(lu_status->kernel + lu_status->kernel_off, data, size); + lu_status->kernel_off += size; + + errno = 0; + return NULL; +} + +const char *lu_arch(const void *ctx, struct connection *conn, char **vec, + int num) +{ + if (num == 2 && !strcmp(vec[0], "-b")) + return lu_binary_alloc(ctx, conn, atol(vec[1])); + if (num > 2 && !strcmp(vec[0], "-d")) + return lu_binary_save(ctx, conn, atoi(vec[1]), vec[2]); + + errno = EINVAL; + return NULL; +} +#endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:25:04 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:25:04 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557537.870978 (Exim 4.92) (envelope-from ) id 1qFF3Y-0008PB-Pl; Fri, 30 Jun 2023 14:25:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557537.870978; Fri, 30 Jun 2023 14:25:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3Y-0008P4-Mf; Fri, 30 Jun 2023 14:25:04 +0000 Received: by outflank-mailman (input) for mailman id 557537; Fri, 30 Jun 2023 14:25:03 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3X-0008Oq-Qd for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:25:03 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3X-0008FN-Pv for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:25:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF3X-0006nl-PF for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:25:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=Q1CEPgF6A+wrXZ7ex/TDN7qkFt8xPc8i9Q+dDxR4QOY=; b=jbBKxaJSMPqhP/9IzVsaOJBiRG MBwf0WMM8XpVC0ej/avTlnVHf5t9wzwdHOI66nrt+rm5auTGtRKUyTWRac8Bdi5tb/FyL4Q1vLjkU 5ZKRKDhxOUcBZzrpFBDeuTgcTys3WJ0dn3gPrUmLlTOCFB1b2Ve1WgMvjZNgUalxqnVo=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: split out rest of live update control code Message-Id: Date: Fri, 30 Jun 2023 14:25:03 +0000 commit 63b6419d2a2d7a54bb2abdf77a0c73f368950df0 Author: Juergen Gross AuthorDate: Tue Jun 27 14:27:49 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 29 22:38:22 2023 +0100 tools/xenstore: split out rest of live update control code Move the rest of live update related code from xenstored_control.c to a dedicated new source file. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/Makefile.common | 2 +- tools/xenstore/xenstored_control.c | 417 ------------------------------------- tools/xenstore/xenstored_control.h | 8 - tools/xenstore/xenstored_core.c | 1 + tools/xenstore/xenstored_lu.c | 408 ++++++++++++++++++++++++++++++++++++ tools/xenstore/xenstored_lu.h | 25 +++ 6 files changed, 435 insertions(+), 426 deletions(-) diff --git a/tools/xenstore/Makefile.common b/tools/xenstore/Makefile.common index c42796fe34..657a16849e 100644 --- a/tools/xenstore/Makefile.common +++ b/tools/xenstore/Makefile.common @@ -1,7 +1,7 @@ # Makefile shared with stubdom XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o -XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o +XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o xenstored_lu.o XENSTORED_OBJS-y += talloc.o utils.o tdb.o hashtable.o XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o xenstored_lu_daemon.o diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c index 8f1f31fd6a..145a0e5aff 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -16,21 +16,13 @@ along with this program; If not, see . */ -#include -#include #include #include #include #include #include -#include -#include #include -#include -#include -#include #include -#include #include #include "utils.h" @@ -39,77 +31,6 @@ #include "xenstored_control.h" #include "xenstored_domain.h" #include "xenstored_lu.h" -#include "xenstored_watch.h" - -#ifndef NO_LIVE_UPDATE -struct live_update *lu_status; - -static int lu_destroy(void *data) -{ - lu_destroy_arch(data); - lu_status = NULL; - - return 0; -} - -const char *lu_begin(struct connection *conn) -{ - if (lu_status) - return "live-update session already active."; - - lu_status = talloc_zero(conn, struct live_update); - if (!lu_status) - return "Allocation failure."; - lu_status->conn = conn; - talloc_set_destructor(lu_status, lu_destroy); - - return NULL; -} - -struct connection *lu_get_connection(void) -{ - return lu_status ? lu_status->conn : NULL; -} - -unsigned int lu_write_response(FILE *fp) -{ - struct xsd_sockmsg msg; - - assert(lu_status); - - msg = lu_status->in->hdr.msg; - - msg.len = sizeof("OK"); - if (fp && fwrite(&msg, sizeof(msg), 1, fp) != 1) - return 0; - if (fp && fwrite("OK", msg.len, 1, fp) != 1) - return 0; - - return sizeof(msg) + msg.len; -} - -bool lu_is_pending(void) -{ - return lu_status != NULL; -} - -#else -struct connection *lu_get_connection(void) -{ - return NULL; -} - -unsigned int lu_write_response(FILE *fp) -{ - /* Unsupported */ - return 0; -} - -bool lu_is_pending(void) -{ - return false; -} -#endif struct cmd_s { char *cmd; @@ -360,344 +281,6 @@ static int do_control_print(const void *ctx, struct connection *conn, return 0; } -#ifndef NO_LIVE_UPDATE -static const char *lu_abort(const void *ctx, struct connection *conn) -{ - syslog(LOG_INFO, "live-update: abort\n"); - - if (!lu_status) - return "No live-update session active."; - - /* Destructor will do the real abort handling. */ - talloc_free(lu_status); - - return NULL; -} - -static const char *lu_cmdline(const void *ctx, struct connection *conn, - const char *cmdline) -{ - syslog(LOG_INFO, "live-update: cmdline %s\n", cmdline); - - if (!lu_status || lu_status->conn != conn) - return "Not in live-update session."; - - lu_status->cmdline = talloc_strdup(lu_status, cmdline); - if (!lu_status->cmdline) - return "Allocation failure."; - - return NULL; -} - -static bool lu_check_lu_allowed(void) -{ - struct connection *conn; - time_t now = time(NULL); - unsigned int ta_total = 0, ta_long = 0; - - list_for_each_entry(conn, &connections, list) { - if (conn->ta_start_time) { - ta_total++; - if (now - conn->ta_start_time >= lu_status->timeout) - ta_long++; - } - } - - /* - * Allow LiveUpdate if one of the following conditions is met: - * - There is no active transactions - * - All transactions are long running (e.g. they have been - * active for more than lu_status->timeout sec) and the admin as - * requested to force the operation. - */ - return ta_total ? (lu_status->force && ta_long == ta_total) : true; -} - -static const char *lu_reject_reason(const void *ctx) -{ - char *ret = NULL; - struct connection *conn; - time_t now = time(NULL); - - list_for_each_entry(conn, &connections, list) { - unsigned long tdiff = now - conn->ta_start_time; - - if (conn->ta_start_time && (tdiff >= lu_status->timeout)) { - ret = talloc_asprintf(ctx, "%s\nDomain %u: %ld s", - ret ? : "Domains with long running transactions:", - conn->id, tdiff); - } - } - - return ret ? (const char *)ret : "Overlapping transactions"; -} - -static const char *lu_dump_state(const void *ctx, struct connection *conn) -{ - FILE *fp; - const char *ret; - struct xs_state_record_header end; - struct xs_state_preamble pre; - - fp = lu_dump_open(ctx); - if (!fp) - return "Dump state open error"; - - memcpy(pre.ident, XS_STATE_IDENT, sizeof(pre.ident)); - pre.version = htobe32(XS_STATE_VERSION); - pre.flags = XS_STATE_FLAGS; - if (fwrite(&pre, sizeof(pre), 1, fp) != 1) { - ret = "Dump write error"; - goto out; - } - - ret = dump_state_global(fp); - if (ret) - goto out; - ret = dump_state_connections(fp); - if (ret) - goto out; - ret = dump_state_nodes(fp, ctx); - if (ret) - goto out; - - end.type = XS_STATE_TYPE_END; - end.length = 0; - if (fwrite(&end, sizeof(end), 1, fp) != 1) - ret = "Dump write error"; - - out: - lu_dump_close(fp); - - return ret; -} - -void lu_read_state(void) -{ - struct lu_dump_state state = {}; - struct xs_state_record_header *head; - void *ctx = talloc_new(NULL); /* Work context for subfunctions. */ - struct xs_state_preamble *pre; - - syslog(LOG_INFO, "live-update: read state\n"); - lu_get_dump_state(&state); - if (state.size == 0) - barf_perror("No state found after live-update"); - - pre = state.buf; - if (memcmp(pre->ident, XS_STATE_IDENT, sizeof(pre->ident)) || - pre->version != htobe32(XS_STATE_VERSION) || - pre->flags != XS_STATE_FLAGS) - barf("Unknown record identifier"); - for (head = state.buf + sizeof(*pre); - head->type != XS_STATE_TYPE_END && - (void *)head - state.buf < state.size; - head = (void *)head + sizeof(*head) + head->length) { - switch (head->type) { - case XS_STATE_TYPE_GLOBAL: - read_state_global(ctx, head + 1); - break; - case XS_STATE_TYPE_CONN: - read_state_connection(ctx, head + 1); - break; - case XS_STATE_TYPE_WATCH: - read_state_watch(ctx, head + 1); - break; - case XS_STATE_TYPE_TA: - xprintf("live-update: ignore transaction record\n"); - break; - case XS_STATE_TYPE_NODE: - read_state_node(ctx, head + 1); - break; - default: - xprintf("live-update: unknown state record %08x\n", - head->type); - break; - } - } - - lu_close_dump_state(&state); - - talloc_free(ctx); - - /* - * We may have missed the VIRQ_DOM_EXC notification and a domain may - * have died while we were live-updating. So check all the domains are - * still alive. - */ - check_domains(); -} - -static const char *lu_activate_binary(const void *ctx) -{ - int argc; - char **argv; - unsigned int i; - - if (lu_status->cmdline) { - argc = 4; /* At least one arg + progname + "-U" + NULL. */ - for (i = 0; lu_status->cmdline[i]; i++) - if (isspace(lu_status->cmdline[i])) - argc++; - argv = talloc_array(ctx, char *, argc); - if (!argv) - return "Allocation failure."; - - i = 0; - argc = 1; - argv[1] = strtok(lu_status->cmdline, " \t"); - while (argv[argc]) { - if (!strcmp(argv[argc], "-U")) - i = 1; - argc++; - argv[argc] = strtok(NULL, " \t"); - } - - if (!i) { - argv[argc++] = "-U"; - argv[argc] = NULL; - } - } else { - for (i = 0; i < orig_argc; i++) - if (!strcmp(orig_argv[i], "-U")) - break; - - argc = orig_argc; - argv = talloc_array(ctx, char *, orig_argc + 2); - if (!argv) - return "Allocation failure."; - - memcpy(argv, orig_argv, orig_argc * sizeof(*argv)); - if (i == orig_argc) - argv[argc++] = "-U"; - argv[argc] = NULL; - } - - domain_deinit(); - - return lu_exec(ctx, argc, argv); -} - -static bool do_lu_start(struct delayed_request *req) -{ - time_t now = time(NULL); - const char *ret; - struct buffered_data *saved_in; - struct connection *conn = req->data; - - /* - * Cancellation may have been requested asynchronously. In this - * case, lu_status will be NULL. - */ - if (!lu_status) { - ret = "Cancellation was requested"; - goto out; - } - - assert(lu_status->conn == conn); - - if (!lu_check_lu_allowed()) { - if (now < lu_status->started_at + lu_status->timeout) - return false; - if (!lu_status->force) { - ret = lu_reject_reason(req); - goto out; - } - } - - assert(req->in == lu_status->in); - /* Dump out internal state, including "OK" for live update. */ - ret = lu_dump_state(req->in, conn); - if (!ret) { - /* Perform the activation of new binary. */ - ret = lu_activate_binary(req->in); - } - - /* We will reach this point only in case of failure. */ - out: - /* - * send_reply() will send the response for conn->in. Save the current - * conn->in and restore it afterwards. - */ - saved_in = conn->in; - conn->in = req->in; - send_reply(conn, XS_CONTROL, ret, strlen(ret) + 1); - conn->in = saved_in; - talloc_free(lu_status); - - return true; -} - -static const char *lu_start(const void *ctx, struct connection *conn, - bool force, unsigned int to) -{ - syslog(LOG_INFO, "live-update: start, force=%d, to=%u\n", force, to); - - if (!lu_status || lu_status->conn != conn) - return "Not in live-update session."; - -#ifdef __MINIOS__ - if (lu_status->kernel_size != lu_status->kernel_off) - return "Kernel not complete."; -#endif - - lu_status->force = force; - lu_status->timeout = to; - lu_status->started_at = time(NULL); - lu_status->in = conn->in; - - errno = delay_request(conn, conn->in, do_lu_start, conn, false); - - return NULL; -} - -static int do_control_lu(const void *ctx, struct connection *conn, - char **vec, int num) -{ - const char *ret = NULL; - unsigned int i; - bool force = false; - unsigned int to = 0; - - if (num < 1) - return EINVAL; - - if (!strcmp(vec[0], "-a")) { - if (num == 1) - ret = lu_abort(ctx, conn); - else - return EINVAL; - } else if (!strcmp(vec[0], "-c")) { - if (num == 2) - ret = lu_cmdline(ctx, conn, vec[1]); - else - return EINVAL; - } else if (!strcmp(vec[0], "-s")) { - for (i = 1; i < num; i++) { - if (!strcmp(vec[i], "-F")) - force = true; - else if (!strcmp(vec[i], "-t") && i < num - 1) { - i++; - to = atoi(vec[i]); - } else - return EINVAL; - } - ret = lu_start(ctx, conn, force, to); - if (!ret) - return errno; - } else { - ret = lu_arch(ctx, conn, vec, num); - if (!ret && errno) - return errno; - } - - if (!ret) - ret = "OK"; - send_reply(conn, XS_CONTROL, ret, strlen(ret) + 1); - return 0; -} -#endif - static int do_control_help(const void *, struct connection *, char **, int); static struct cmd_s cmds[] = { diff --git a/tools/xenstore/xenstored_control.h b/tools/xenstore/xenstored_control.h index a8cb76559b..faa955968d 100644 --- a/tools/xenstore/xenstored_control.h +++ b/tools/xenstore/xenstored_control.h @@ -18,11 +18,3 @@ int do_control(const void *ctx, struct connection *conn, struct buffered_data *in); -void lu_read_state(void); - -struct connection *lu_get_connection(void); - -/* Write the "OK" response for the live-update command */ -unsigned int lu_write_response(FILE *fp); - -bool lu_is_pending(void); diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 62deee9cb9..31a862b715 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -52,6 +52,7 @@ #include "xenstored_transaction.h" #include "xenstored_domain.h" #include "xenstored_control.h" +#include "xenstored_lu.h" #include "tdb.h" #ifndef NO_SOCKETS diff --git a/tools/xenstore/xenstored_lu.c b/tools/xenstore/xenstored_lu.c new file mode 100644 index 0000000000..b20d0d37ea --- /dev/null +++ b/tools/xenstore/xenstored_lu.c @@ -0,0 +1,408 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* + * Live Update interfaces for Xen Store Daemon. + * Copyright (C) 2022 Juergen Gross, SUSE LLC + */ + +#include +#include +#include +#include +#include +#include + +#include "talloc.h" +#include "xenstored_core.h" +#include "xenstored_domain.h" +#include "xenstored_lu.h" +#include "xenstored_watch.h" + +#ifndef NO_LIVE_UPDATE +struct live_update *lu_status; + +static int lu_destroy(void *data) +{ + lu_destroy_arch(data); + lu_status = NULL; + + return 0; +} + +const char *lu_begin(struct connection *conn) +{ + if (lu_status) + return "live-update session already active."; + + lu_status = talloc_zero(conn, struct live_update); + if (!lu_status) + return "Allocation failure."; + lu_status->conn = conn; + talloc_set_destructor(lu_status, lu_destroy); + + return NULL; +} + +struct connection *lu_get_connection(void) +{ + return lu_status ? lu_status->conn : NULL; +} + +unsigned int lu_write_response(FILE *fp) +{ + struct xsd_sockmsg msg; + + assert(lu_status); + + msg = lu_status->in->hdr.msg; + + msg.len = sizeof("OK"); + if (fp && fwrite(&msg, sizeof(msg), 1, fp) != 1) + return 0; + if (fp && fwrite("OK", msg.len, 1, fp) != 1) + return 0; + + return sizeof(msg) + msg.len; +} + +bool lu_is_pending(void) +{ + return lu_status != NULL; +} + +void lu_read_state(void) +{ + struct lu_dump_state state = {}; + struct xs_state_record_header *head; + void *ctx = talloc_new(NULL); /* Work context for subfunctions. */ + struct xs_state_preamble *pre; + + syslog(LOG_INFO, "live-update: read state\n"); + lu_get_dump_state(&state); + if (state.size == 0) + barf_perror("No state found after live-update"); + + pre = state.buf; + if (memcmp(pre->ident, XS_STATE_IDENT, sizeof(pre->ident)) || + pre->version != htobe32(XS_STATE_VERSION) || + pre->flags != XS_STATE_FLAGS) + barf("Unknown record identifier"); + for (head = state.buf + sizeof(*pre); + head->type != XS_STATE_TYPE_END && + (void *)head - state.buf < state.size; + head = (void *)head + sizeof(*head) + head->length) { + switch (head->type) { + case XS_STATE_TYPE_GLOBAL: + read_state_global(ctx, head + 1); + break; + case XS_STATE_TYPE_CONN: + read_state_connection(ctx, head + 1); + break; + case XS_STATE_TYPE_WATCH: + read_state_watch(ctx, head + 1); + break; + case XS_STATE_TYPE_TA: + xprintf("live-update: ignore transaction record\n"); + break; + case XS_STATE_TYPE_NODE: + read_state_node(ctx, head + 1); + break; + default: + xprintf("live-update: unknown state record %08x\n", + head->type); + break; + } + } + + lu_close_dump_state(&state); + + talloc_free(ctx); + + /* + * We may have missed the VIRQ_DOM_EXC notification and a domain may + * have died while we were live-updating. So check all the domains are + * still alive. + */ + check_domains(); +} + +static const char *lu_abort(const void *ctx, struct connection *conn) +{ + syslog(LOG_INFO, "live-update: abort\n"); + + if (!lu_status) + return "No live-update session active."; + + /* Destructor will do the real abort handling. */ + talloc_free(lu_status); + + return NULL; +} + +static const char *lu_cmdline(const void *ctx, struct connection *conn, + const char *cmdline) +{ + syslog(LOG_INFO, "live-update: cmdline %s\n", cmdline); + + if (!lu_status || lu_status->conn != conn) + return "Not in live-update session."; + + lu_status->cmdline = talloc_strdup(lu_status, cmdline); + if (!lu_status->cmdline) + return "Allocation failure."; + + return NULL; +} + +static bool lu_check_lu_allowed(void) +{ + struct connection *conn; + time_t now = time(NULL); + unsigned int ta_total = 0, ta_long = 0; + + list_for_each_entry(conn, &connections, list) { + if (conn->ta_start_time) { + ta_total++; + if (now - conn->ta_start_time >= lu_status->timeout) + ta_long++; + } + } + + /* + * Allow LiveUpdate if one of the following conditions is met: + * - There is no active transactions + * - All transactions are long running (e.g. they have been + * active for more than lu_status->timeout sec) and the admin as + * requested to force the operation. + */ + return ta_total ? (lu_status->force && ta_long == ta_total) : true; +} + +static const char *lu_reject_reason(const void *ctx) +{ + char *ret = NULL; + struct connection *conn; + time_t now = time(NULL); + + list_for_each_entry(conn, &connections, list) { + unsigned long tdiff = now - conn->ta_start_time; + + if (conn->ta_start_time && (tdiff >= lu_status->timeout)) { + ret = talloc_asprintf(ctx, "%s\nDomain %u: %ld s", + ret ? : "Domains with long running transactions:", + conn->id, tdiff); + } + } + + return ret ? (const char *)ret : "Overlapping transactions"; +} + +static const char *lu_dump_state(const void *ctx, struct connection *conn) +{ + FILE *fp; + const char *ret; + struct xs_state_record_header end; + struct xs_state_preamble pre; + + fp = lu_dump_open(ctx); + if (!fp) + return "Dump state open error"; + + memcpy(pre.ident, XS_STATE_IDENT, sizeof(pre.ident)); + pre.version = htobe32(XS_STATE_VERSION); + pre.flags = XS_STATE_FLAGS; + if (fwrite(&pre, sizeof(pre), 1, fp) != 1) { + ret = "Dump write error"; + goto out; + } + + ret = dump_state_global(fp); + if (ret) + goto out; + ret = dump_state_connections(fp); + if (ret) + goto out; + ret = dump_state_nodes(fp, ctx); + if (ret) + goto out; + + end.type = XS_STATE_TYPE_END; + end.length = 0; + if (fwrite(&end, sizeof(end), 1, fp) != 1) + ret = "Dump write error"; + + out: + lu_dump_close(fp); + + return ret; +} + +static const char *lu_activate_binary(const void *ctx) +{ + int argc; + char **argv; + unsigned int i; + + if (lu_status->cmdline) { + argc = 4; /* At least one arg + progname + "-U" + NULL. */ + for (i = 0; lu_status->cmdline[i]; i++) + if (isspace(lu_status->cmdline[i])) + argc++; + argv = talloc_array(ctx, char *, argc); + if (!argv) + return "Allocation failure."; + + i = 0; + argc = 1; + argv[1] = strtok(lu_status->cmdline, " \t"); + while (argv[argc]) { + if (!strcmp(argv[argc], "-U")) + i = 1; + argc++; + argv[argc] = strtok(NULL, " \t"); + } + + if (!i) { + argv[argc++] = "-U"; + argv[argc] = NULL; + } + } else { + for (i = 0; i < orig_argc; i++) + if (!strcmp(orig_argv[i], "-U")) + break; + + argc = orig_argc; + argv = talloc_array(ctx, char *, orig_argc + 2); + if (!argv) + return "Allocation failure."; + + memcpy(argv, orig_argv, orig_argc * sizeof(*argv)); + if (i == orig_argc) + argv[argc++] = "-U"; + argv[argc] = NULL; + } + + domain_deinit(); + + return lu_exec(ctx, argc, argv); +} + +static bool do_lu_start(struct delayed_request *req) +{ + time_t now = time(NULL); + const char *ret; + struct buffered_data *saved_in; + struct connection *conn = req->data; + + /* + * Cancellation may have been requested asynchronously. In this + * case, lu_status will be NULL. + */ + if (!lu_status) { + ret = "Cancellation was requested"; + goto out; + } + + assert(lu_status->conn == conn); + + if (!lu_check_lu_allowed()) { + if (now < lu_status->started_at + lu_status->timeout) + return false; + if (!lu_status->force) { + ret = lu_reject_reason(req); + goto out; + } + } + + assert(req->in == lu_status->in); + /* Dump out internal state, including "OK" for live update. */ + ret = lu_dump_state(req->in, conn); + if (!ret) { + /* Perform the activation of new binary. */ + ret = lu_activate_binary(req->in); + } + + /* We will reach this point only in case of failure. */ + out: + /* + * send_reply() will send the response for conn->in. Save the current + * conn->in and restore it afterwards. + */ + saved_in = conn->in; + conn->in = req->in; + send_reply(conn, XS_CONTROL, ret, strlen(ret) + 1); + conn->in = saved_in; + talloc_free(lu_status); + + return true; +} + +static const char *lu_start(const void *ctx, struct connection *conn, + bool force, unsigned int to) +{ + syslog(LOG_INFO, "live-update: start, force=%d, to=%u\n", force, to); + + if (!lu_status || lu_status->conn != conn) + return "Not in live-update session."; + +#ifdef __MINIOS__ + if (lu_status->kernel_size != lu_status->kernel_off) + return "Kernel not complete."; +#endif + + lu_status->force = force; + lu_status->timeout = to; + lu_status->started_at = time(NULL); + lu_status->in = conn->in; + + errno = delay_request(conn, conn->in, do_lu_start, conn, false); + + return NULL; +} + +int do_control_lu(const void *ctx, struct connection *conn, char **vec, + int num) +{ + const char *ret = NULL; + unsigned int i; + bool force = false; + unsigned int to = 0; + + if (num < 1) + return EINVAL; + + if (!strcmp(vec[0], "-a")) { + if (num == 1) + ret = lu_abort(ctx, conn); + else + return EINVAL; + } else if (!strcmp(vec[0], "-c")) { + if (num == 2) + ret = lu_cmdline(ctx, conn, vec[1]); + else + return EINVAL; + } else if (!strcmp(vec[0], "-s")) { + for (i = 1; i < num; i++) { + if (!strcmp(vec[i], "-F")) + force = true; + else if (!strcmp(vec[i], "-t") && i < num - 1) { + i++; + to = atoi(vec[i]); + } else + return EINVAL; + } + ret = lu_start(ctx, conn, force, to); + if (!ret) + return errno; + } else { + ret = lu_arch(ctx, conn, vec, num); + if (!ret && errno) + return errno; + } + + if (!ret) + ret = "OK"; + send_reply(conn, XS_CONTROL, ret, strlen(ret) + 1); + return 0; +} +#endif diff --git a/tools/xenstore/xenstored_lu.h b/tools/xenstore/xenstored_lu.h index 1c09b9b639..d633a765a3 100644 --- a/tools/xenstore/xenstored_lu.h +++ b/tools/xenstore/xenstored_lu.h @@ -43,6 +43,16 @@ struct lu_dump_state { extern struct live_update *lu_status; +struct connection *lu_get_connection(void); +bool lu_is_pending(void); +void lu_read_state(void); + +/* Write the "OK" response for the live-update command */ +unsigned int lu_write_response(FILE *fp); + +int do_control_lu(const void *ctx, struct connection *conn, char **vec, + int num); + /* Live update private interfaces. */ void lu_get_dump_state(struct lu_dump_state *state); void lu_close_dump_state(struct lu_dump_state *state); @@ -53,4 +63,19 @@ const char *lu_arch(const void *ctx, struct connection *conn, char **vec, int num); const char *lu_begin(struct connection *conn); void lu_destroy_arch(void *data); +#else +static inline struct connection *lu_get_connection(void) +{ + return NULL; +} + +static inline unsigned int lu_write_response(FILE *fp) +{ + return 0; +} + +static inline bool lu_is_pending(void) +{ + return false; +} #endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri Jun 30 14:25:14 2023 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 30 Jun 2023 14:25:14 +0000 Received: from list by lists.xenproject.org with outflank-mailman.557538.870982 (Exim 4.92) (envelope-from ) id 1qFF3i-0008UI-TB; Fri, 30 Jun 2023 14:25:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 557538.870982; Fri, 30 Jun 2023 14:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3i-0008UB-QQ; Fri, 30 Jun 2023 14:25:14 +0000 Received: by outflank-mailman (input) for mailman id 557538; Fri, 30 Jun 2023 14:25:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3h-0008U1-Tb for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:25:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qFF3h-0008Fm-Su for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:25:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1qFF3h-0006oE-S1 for xen-changelog@lists.xenproject.org; Fri, 30 Jun 2023 14:25:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-changelog-bounces@lists.xenproject.org Precedence: list Sender: "Xen-changelog" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From; bh=lJ3q586Bp7n14CDf6LKIpjvKaKQlnmOQ+c2hUBRihqE=; b=ANZXkgcnjXFDUv304+KSEfPXqN 615SGvq2VZ0AAnZyaeFsDb9Zh0/F9RXMhUvTNrbowcmZEnIHpluSi0E/jMqyUMsVC4bMiutMrSJmX rZjhjhibLe6yVfSB4QgrxZc4B3KLGwyD9C+t7/zMNxei6iYUz9mEYBL2dkP44qHlbbgg=; From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Reply-To: xen-devel@lists.xenproject.org Subject: [xen master] tools/xenstore: remove unused stuff from list.h Message-Id: Date: Fri, 30 Jun 2023 14:25:13 +0000 commit 6aa0c18062609cb448d292668a81953a58ce1e95 Author: Juergen Gross AuthorDate: Tue Jun 27 14:27:50 2023 +0200 Commit: Julien Grall CommitDate: Thu Jun 29 22:38:22 2023 +0100 tools/xenstore: remove unused stuff from list.h Remove the hlist defines/functions and the rcu related functions from tools/xenstore/list.h, as they are not used. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- tools/xenstore/list.h | 227 -------------------------------------------------- 1 file changed, 227 deletions(-) diff --git a/tools/xenstore/list.h b/tools/xenstore/list.h index a464a38b61..d722a91220 100644 --- a/tools/xenstore/list.h +++ b/tools/xenstore/list.h @@ -88,48 +88,6 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head) __list_add(new, head->prev, head); } -/* - * Insert a new entry between two known consecutive entries. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static __inline__ void __list_add_rcu(struct list_head * new, - struct list_head * prev, - struct list_head * next) -{ - new->next = next; - new->prev = prev; - next->prev = new; - prev->next = new; -} - -/** - * list_add_rcu - add a new entry to rcu-protected list - * @new: new entry to be added - * @head: list head to add it after - * - * Insert a new entry after the specified head. - * This is good for implementing stacks. - */ -static __inline__ void list_add_rcu(struct list_head *new, struct list_head *head) -{ - __list_add_rcu(new, head, head->next); -} - -/** - * list_add_tail_rcu - add a new entry to rcu-protected list - * @new: new entry to be added - * @head: list head to add it before - * - * Insert a new entry before the specified head. - * This is useful for implementing queues. - */ -static __inline__ void list_add_tail_rcu(struct list_head *new, struct list_head *head) -{ - __list_add_rcu(new, head->prev, head); -} - /* * Delete a list entry by making the prev/next entries * point to each other. @@ -156,23 +114,6 @@ static inline void list_del(struct list_head *entry) entry->prev = LIST_POISON2; } -/** - * list_del_rcu - deletes entry from list without re-initialization - * @entry: the element to delete from the list. - * - * Note: list_empty on entry does not return true after this, - * the entry is in an undefined state. It is useful for RCU based - * lockfree traversal. - * - * In particular, it means that we can not poison the forward - * pointers that may still be used for walking the list. - */ -static inline void list_del_rcu(struct list_head *entry) -{ - __list_del(entry->prev, entry->next); - entry->prev = LIST_POISON2; -} - /** * list_del_init - deletes entry from list and reinitialize it. * @entry: the element to delete from the list. @@ -339,172 +280,4 @@ static inline void list_splice_init(struct list_head *list, &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) - -/* - * Double linked lists with a single pointer list head. - * Mostly useful for hash tables where the two pointer list head is - * too wasteful. - * You lose the ability to access the tail in O(1). - */ - -struct hlist_head { - struct hlist_node *first; -}; - -struct hlist_node { - struct hlist_node *next, **pprev; -}; - -#define HLIST_HEAD_INIT { .first = NULL } -#define HLIST_HEAD(name) struct hlist_head name = { .first = NULL } -#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL) -#define INIT_HLIST_NODE(ptr) ((ptr)->next = NULL, (ptr)->pprev = NULL) - -static __inline__ int hlist_unhashed(struct hlist_node *h) -{ - return !h->pprev; -} - -static __inline__ int hlist_empty(struct hlist_head *h) -{ - return !h->first; -} - -static __inline__ void __hlist_del(struct hlist_node *n) -{ - struct hlist_node *next = n->next; - struct hlist_node **pprev = n->pprev; - *pprev = next; - if (next) - next->pprev = pprev; -} - -static __inline__ void hlist_del(struct hlist_node *n) -{ - __hlist_del(n); - n->next = LIST_POISON1; - n->pprev = LIST_POISON2; -} - -/** - * hlist_del_rcu - deletes entry from hash list without re-initialization - * @entry: the element to delete from the hash list. - * - * Note: list_unhashed() on entry does not return true after this, - * the entry is in an undefined state. It is useful for RCU based - * lockfree traversal. - * - * In particular, it means that we can not poison the forward - * pointers that may still be used for walking the hash list. - */ -static inline void hlist_del_rcu(struct hlist_node *n) -{ - __hlist_del(n); - n->pprev = LIST_POISON2; -} - -static __inline__ void hlist_del_init(struct hlist_node *n) -{ - if (n->pprev) { - __hlist_del(n); - INIT_HLIST_NODE(n); - } -} - -#define hlist_del_rcu_init hlist_del_init - -static __inline__ void hlist_add_head(struct hlist_node *n, struct hlist_head *h) -{ - struct hlist_node *first = h->first; - n->next = first; - if (first) - first->pprev = &n->next; - h->first = n; - n->pprev = &h->first; -} - -static __inline__ void hlist_add_head_rcu(struct hlist_node *n, struct hlist_head *h) -{ - struct hlist_node *first = h->first; - n->next = first; - n->pprev = &h->first; - if (first) - first->pprev = &n->next; - h->first = n; -} - -/* next must be != NULL */ -static __inline__ void hlist_add_before(struct hlist_node *n, struct hlist_node *next) -{ - n->pprev = next->pprev; - n->next = next; - next->pprev = &n->next; - *(n->pprev) = n; -} - -static __inline__ void hlist_add_after(struct hlist_node *n, - struct hlist_node *next) -{ - next->next = n->next; - *(next->pprev) = n; - n->next = next; -} - -#define hlist_entry(ptr, type, member) container_of(ptr,type,member) - -/* Cannot easily do prefetch unfortunately */ -#define hlist_for_each(pos, head) \ - for (pos = (head)->first; pos; pos = pos->next) - -#define hlist_for_each_safe(pos, n, head) \ - for (pos = (head)->first; n = pos ? pos->next : 0, pos; \ - pos = n) - -/** - * hlist_for_each_entry - iterate over list of given type - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. - * @head: the head for your list. - * @member: the name of the hlist_node within the struct. - */ -#define hlist_for_each_entry(tpos, pos, head, member) \ - for (pos = (head)->first; \ - pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = pos->next) - -/** - * hlist_for_each_entry_continue - iterate over a hlist continuing after existing point - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. - * @member: the name of the hlist_node within the struct. - */ -#define hlist_for_each_entry_continue(tpos, pos, member) \ - for (pos = (pos)->next; \ - pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = pos->next) - -/** - * hlist_for_each_entry_from - iterate over a hlist continuing from existing point - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. - * @member: the name of the hlist_node within the struct. - */ -#define hlist_for_each_entry_from(tpos, pos, member) \ - for (; pos && ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = pos->next) - -/** - * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry - * @tpos: the type * to use as a loop counter. - * @pos: the &struct hlist_node to use as a loop counter. - * @n: another &struct hlist_node to use as temporary storage - * @head: the head for your list. - * @member: the name of the hlist_node within the struct. - */ -#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \ - for (pos = (head)->first; \ - pos && ({ n = pos->next; 1; }) && \ - ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ - pos = n) - #endif -- generated by git-patchbot for /home/xen/git/xen.git#master